# # patch "ChangeLog" # from [adc66ae3d08a555a7c42f431e3c4d56e602176c0] # to [935b6b18ae73c892ace4c8fd4471d1db0d3d8e12] # # patch "contrib/usher.cc" # from [454acd6ae3513b0f2925177c0a72f5a14e99fc30] # to [f772b459368204c6ae5095edc8531377bf7d28da] # ======================================================================== --- ChangeLog adc66ae3d08a555a7c42f431e3c4d56e602176c0 +++ ChangeLog 935b6b18ae73c892ace4c8fd4471d1db0d3d8e12 @@ -1,5 +1,9 @@ 2005-10-18 Timothy Brownawell + * contrib/usher.cc: Update comment about client versions + +2005-10-18 Timothy Brownawell + * netsync.cc netcmd.{cc,hh}: usher_reply_cmd now has both who we connected to *and* what pattern we asked for * contrib/usher.cc: new file format, allow to key servers on either ======================================================================== --- contrib/usher.cc 454acd6ae3513b0f2925177c0a72f5a14e99fc30 +++ contrib/usher.cc f772b459368204c6ae5095edc8531377bf7d28da @@ -1,14 +1,16 @@ // Timothy Brownawell // GPL v2 // // This is an "usher" to allow multiple monotone servers to work from -// the same port. It asks the client for the pattern it wants to sync, +// the same port. It asks the client what it wants to sync, // and then looks up the matching server in a table. It then forwards // the connection to that server. All servers using the same usher need // to have the same server key. // // This requires cooperation from the client, which means it only works -// for recent (post-0.22) clients. +// for recent (0.23 or later) clients. In order to match against hostnames +// a post-0.23 client is needed (0.23 clients can only be matched against +// their include pattern). // // Usage: usher [-a ] [-p ] //