# # patch "ChangeLog" # from [761dabbd4c8dd35b2910a18ca311488514961a04] # to [44f992b708acdf2ef940290bd0b72b7efaf01f3e] # # patch "netsync.cc" # from [d3b17d5f347bc85bba79e1db4b77268e7983f8b7] # to [6685182ef8fcb219ede0c8678af1fc8a49d5208a] # ======================================================================== --- ChangeLog 761dabbd4c8dd35b2910a18ca311488514961a04 +++ ChangeLog 44f992b708acdf2ef940290bd0b72b7efaf01f3e @@ -1,3 +1,8 @@ +2005-09-25 Matt Johnston + + * netsync.cc: use lexical_cast on port numbers to avoid + strange-looking "port 5,253" + 2005-09-25 Matthew Gregan * sqlite/*: Update in-tree SQLite from 3.2.6 to 3.2.7. ======================================================================== --- netsync.cc d3b17d5f347bc85bba79e1db4b77268e7983f8b7 +++ netsync.cc 6685182ef8fcb219ede0c8678af1fc8a49d5208a @@ -3438,8 +3438,8 @@ map > & sessions, app_state & app) { - L(F("accepting new connection on %s : %d\n") - % addr.get_name() % addr.get_port()); + L(F("accepting new connection on %s : %s\n") + % addr.get_name() % lexical_cast(addr.get_port())); Netxx::Peer client = server.accept_connection(); if (!client) @@ -3582,8 +3582,8 @@ Netxx::Address addr(address().c_str(), default_port, true); - P(F("beginning service on %s : %d\n") - % addr.get_name() % addr.get_port()); + P(F("beginning service on %s : %s\n") + % addr.get_name() % lexical_cast(addr.get_port())); Netxx::StreamServer server(addr, timeout); @@ -3612,8 +3612,8 @@ if (fd == -1) { if (armed_sessions.empty()) - L(F("timed out waiting for I/O (listening on %s : %d)\n") - % addr.get_name() % addr.get_port()); + L(F("timed out waiting for I/O (listening on %s : %s)\n") + % addr.get_name() % lexical_cast(addr.get_port())); } // we either got a new connection