rsync - Nov 2004 - Problems with --bwlimit && --daemon

Hi list,

I couldn't find anything related to this, on mailing lists or even bugzilla,
so here it is.
A problem with this combination exists in the new 2.6.3 where the bwlimit
code got rewritten and is not present at <= 2.6.2.

The problem is that on io.c:882 bwlimit_writemax is also used to control the
bandwidth, but it is not initialized for the daemon mode.

At options.c:772 you can see the function returning and a bit bellow, line
810, bwlimit_writemax gets initialized.

A quick fix I did, without many checkings, but working:

--- rsync-2.6.3/options.c.mrl	2004-09-23 14:39:05.000000000 -0300
+++ rsync-2.6.3/options.c	2004-11-04 12:16:27.408947256 -0200
@@ -769,6 +769,12 @@
 		}
 	}
 
+	if (bwlimit) {
+		bwlimit_writemax = (size_t)bwlimit * 128;
+		if (bwlimit_writemax < 512)
+			bwlimit_writemax = 512;
+	}
+
 	if (daemon_opt) {
 		daemon_opt = 0;
 		am_daemon = 1;
@@ -807,12 +813,6 @@
 	if (do_progress && !verbose)
 		verbose = 1;
 
-	if (bwlimit) {
-		bwlimit_writemax = (size_t)bwlimit * 128;
-		if (bwlimit_writemax < 512)
-			bwlimit_writemax = 512;
-	}
-
 	if (inplace) {
 #if HAVE_FTRUNCATE
 		if (partial_dir) {

Thanks for your time,
-- 
Marcelo Ricardo Leitner <mrl@conectiva.com.br>

On Thu, Nov 04, 2004 at 12:26:06PM -0200, Marcelo Ricardo Leitner
wrote:
> The problem is that on io.c:882 bwlimit_writemax is also used to
> control the bandwidth, but it is not initialized for the daemon mode.
That's because --bwlimit is a client option.  The current code in CVS,
which now prevents the the user from mixing daemon options with client
options, doesn't even let you specify --bwlimit in combination with
--daemon.  I am considering making --bwlimit a daemon option, but the
older rsync code would always override the server's value with a value
specified by the client, so this was just a default bwlimit for each
transfer, and not an enforced limit.

Thoughts?  Were you expecting the daemon-specified bwlimit to be just a
default or a maximum limit?

..wayne..