# 
# patch "ChangeLog"
#  from [5b2431e5d6c1515b9c46cbb61dcddc6f6ac7d540]
#    to [b114fd6f8312e2dd86e4cbdd337c67092870ab5f]
# 
# patch "netcmd.cc"
#  from [5ee6262d8ddead8fe0c14e4c32c0d0d6781ee5fe]
#    to [39d3dc2c3d06cdf82c332b1d4c7abe34f93b4e1d]
# 
# patch "netsync.cc"
#  from [4e9c31748b5a75e9535937786862574606fab923]
#    to [e6da39e8b875004c1b0290a4fb274394d6bd1c6b]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,12 @@
 2005-06-22  Nathaniel Smith  <address@hidden>
 
+	* netcmd.cc (read): Remove unused variable.
+	* netsync.cc (call_server, process)
+	(arm_sessions_and_calculate_probe, handle_read_available): Give
+	better error message on bad_decode exceptions.
+
+2005-06-22  Nathaniel Smith  <address@hidden>
+
 	* netcmd.cc, netsync.cc: Revert backwards compatibility code; 0.19
 	and 0.20 can't be usefully compatible, and the code as it existed
 	would cause real version mismatch error reporting to not work
--- netcmd.cc
+++ netcmd.cc
@@ -103,7 +103,6 @@
     return false;
 
   u8 extracted_ver = extract_datum_lsb<u8>(inbuf, pos, "netcmd protocol number");
-  int v = version;
   if (extracted_ver != version)
     throw bad_decode(F("protocol version mismatch: wanted '%d' got '%d'") 
                      % widen<u32,u8>(version)
--- netsync.cc
+++ netsync.cc
@@ -3211,7 +3211,7 @@
     }
   catch (bad_decode & bd)
     {
-      W(F("caught bad_decode exception processing peer %s: '%s'\n") % peer_id % bd.what);
+      W(F("protocol error while processing peer %s: '%s'\n") % peer_id % bd.what);
       return false;
     }
 }
@@ -3244,7 +3244,7 @@
         }
       catch (bad_decode & bd)
         {
-          W(F("caught bad_decode exception decoding input from peer %s: '%s'\n") 
+          W(F("protocol error while processing peer %s: '%s'\n") 
             % sess.peer_id % bd.what);
           return;         
         }
@@ -3271,7 +3271,7 @@
                 }
               catch (bad_decode & bd)
                 {
-                  W(F("caught bad_decode exception decoding input from peer %s: '%s'\n") 
+                  W(F("protocol error while processing peer %s: '%s'\n") 
                     % sess.peer_id % bd.what);
                   return;         
                 }
@@ -3345,7 +3345,7 @@
         }
       catch (bad_decode & bd)
         {
-          W(F("caught bad_decode exception decoding input from peer %s: '%s', marking as bad\n") 
+          W(F("protocol error while processing peer %s: '%s', marking as bad\n") 
             % i->second->peer_id % bd.what);
           arm_failed.insert(i->first);
         }         
@@ -3402,7 +3402,7 @@
         }
       catch (bad_decode & bd)
         {
-          W(F("caught bad_decode exception decoding input from peer %s: '%s', disconnecting\n") 
+          W(F("protocol error while processing peer %s: '%s', disconnecting\n") 
             % sess->peer_id % bd.what);
           sessions.erase(fd);
           live_p = false;