# 
# 
# patch "ChangeLog"
#  from [4c410ee835aec64dbe7265059bce9c9f6ba24bd5]
#    to [88bd5d01dec8b5cbc3ef7f8a014abe4f6bf93f28]
# 
# patch "constants.cc"
#  from [c153a952d2426d8faa02b2953bc632852405d93e]
#    to [518c6c9fc84e40bc47324d16501aa465f3985070]
# 
# patch "constants.hh"
#  from [9397b4c694811c99edf4579c0738effe49719666]
#    to [ccc8b70979ed263300c8ef5bf423ecea106f9bc1]
# 
============================================================
--- ChangeLog	4c410ee835aec64dbe7265059bce9c9f6ba24bd5
+++ ChangeLog	88bd5d01dec8b5cbc3ef7f8a014abe4f6bf93f28
@@ -1,3 +1,8 @@
+2005-12-13  Timothy Brownawell  <address@hidden>
+
+	* constants.cc: New netsync is incompatible, bump protocol version.
+	* constants.hh: Change default port to the one IANA assigned us.
+
 2005-12-10  Timothy Brownawell  <address@hidden>
 
 	* roster.cc (make_roster_for_merge): unshadow the node_id_source
============================================================
--- constants.cc	c153a952d2426d8faa02b2953bc632852405d93e
+++ constants.cc	518c6c9fc84e40bc47324d16501aa465f3985070
@@ -145,7 +145,7 @@
   BOOST_STATIC_ASSERT(merkle_bitmap_length_in_bits > 0);
   BOOST_STATIC_ASSERT((merkle_bitmap_length_in_bits % 8) == 0);
 
-  u8 const netcmd_current_protocol_version = 5;
+  u8 const netcmd_current_protocol_version = 6;
   
   // allow payloads up to 256 megs (this sets the in-practice maximum size of
   // a compressed file/manifest).
============================================================
--- constants.hh	9397b4c694811c99edf4579c0738effe49719666
+++ constants.hh	ccc8b70979ed263300c8ef5bf423ecea106f9bc1
@@ -132,7 +132,7 @@
   extern size_t const netcmd_minimum_bytes_to_bother_with_gzip;
 
   // TCP port to listen on / connect to when doing netsync
-  static size_t const netsync_default_port = 5253;
+  static size_t const netsync_default_port = 4691;
 
   // maximum number of simultaneous clients on a server
   static size_t const netsync_connection_limit = 1024;