search for: recv_token

...ut that's not significant I believe: rsync -v -c -a -l -H -p -o -g -D -t -S -x -z \ --progress \ --bwlimit 5000 \ -e ssh root@hermes.afaa.asso.fr:/ /fireball/hermes ) I think the problem is in receive_data (receiver.c): sum_init(); for (i=recv_token(f_in,&data); i != 0; i=recv_token(f_in,&data)) { show_progress(offset, total_size); A call to show_progress should be included before the for loop, that is, before waiting for the first and often only packet in recv_token: sum_init(); show_progress(0, t...

Dear List, I'm trying to get diff/removed data and it's offset out. So I write a functions in receive_data. When I run backup, I found there is a weird behavior which I don't understand. i = recv_token(f_in, &data) will receive (i = -1, offset2 = 0) some where in the middle of the transfer procedure. That's to say, it's going to transfer the first data block from sender, but I have been transferring almost half of the file. I noticed it was 92nd block (sum.blength = 700) . Hope I hav...

...30088 in daemon_main () #12 0x0001a52c in main () server child process: #0 0xff19db44 in _poll () from /usr/lib/libc.so.1 #1 0xff15236c in _select () from /usr/lib/libc.so.1 #2 0x000251e0 in read_timeout () #3 0x00025cc4 in readfd_unbuffered () #4 0x0002651c in read_buf () #5 0x00028058 in recv_token () #6 0x0001418c in receive_data () #7 0x00014c08 in recv_files () #8 0x0001948c in do_recv () #9 0x000197f4 in start_server () #10 0x0002fec4 in start_daemon () #11 0x00030088 in daemon_main () #12 0x0001a52c in main () [sorry about lack of full debugging data on the latter two, that can be...

...56c05 in read_unbuffered (fd=5, buf=0x8186018 "\213E??@\030\002", len=4128) at io.c:279 #3 0x8056d4a in readfd (fd=5, buffer=0x817f038 "MZ\220", N=32768) at io.c:329 #4 0x8056dfb in read_buf (f=5, buf=0x817f038 "MZ\220", len=32768) at io.c:374 #5 0x8057d6f in simple_recv_token (f=5, data=0xbfffc73c) at token.c:84 #6 0x805888f in recv_token (f=5, data=0xbfffc73c) at token.c:504 #7 0x804bd6b in receive_data (f_in=5, buf=0x0, fd=4, fname=0x8078360 "WINNT/$NtUninstallQ287687$/icaapi.dll", total_size=121616) at receiver.c:224 #8 0x804c486 in recv_files (f_in=...

...ags, int fd, OFF_T offset); char *d_name(struct dirent *di); int main (int argc, char *argv[]); void set_compression(char *fname); -void send_token(int f,int token,struct map_struct *buf,OFF_T offset, +int send_token(int f,int token,struct map_struct *buf,OFF_T offset, int n,int toklen); int recv_token(int f,char **data); void see_token(char *data, int toklen); int main(int argc, char **argv); diff -r -u4 rsync-2.5.5/receiver.c rsync-patched/receiver.c --- rsync-2.5.5/receiver.c Wed Feb 13 21:42:20 2002 +++ rsync-patched/receiver.c Mon Aug 5 10:05:15 2002 @@ -35,8 +35,9 @@ extern char *tmpdir...

...s=0x807b040, z=0x80777c0, r=0) at zlib/infcodes.c:200 #1 0x806104c in inflate_blocks (s=0x807b040, z=0x80777c0, r=-5) at zlib/infblock.c:340 #2 0x806243b in inflate (z=0x80777c0, f=0) at zlib/inflate.c:221 #3 0x805852f in recv_deflated_token (f=0, data=0xbfbfe8dc) at token.c:412 #4 0x805872e in recv_token (f=0, data=0xbfbfe8dc) at token.c:506 #5 0x804bd38 in receive_data (f_in=0, buf=0x0, fd=1, fname=0x8074a80 "master-bin.095", total_size=203874289) at receiver.c:224 #6 0x804c254 in recv_files (f_in=0, flist=0x807a090, local_name=0x0, f_gen=4) at receiver.c:456 #7 0x804fe23 in do_recv (...

...offset, int32 n, int32 toklen) { - if (!do_compression) + if (do_compression_zstd) + send_zstd_token(f, token, buf, offset, n); + else if (!do_compression) simple_send_token(f, token, buf, offset, n); else send_deflated_token(f, token, buf, offset, n, toklen); @@ -648,7 +890,9 @@ int32 recv_token(int f, char **data) { int tok; - if (!do_compression) { + if (do_compression_zstd) { + tok = recv_zstd_token(f, data); + } else if (!do_compression) { tok = simple_recv_token(f,data); } else { tok = recv_deflated_token(f, data); -- 2.25.0

...oid *start, int len, int prot, int flags, int fd, OFF_T offset); char *d_name(struct dirent *di); -int main(int argc, char **argv); int main (int argc, char *argv[]); void set_compression(char *fname); void send_token(int f,int token,struct map_struct *buf,OFF_T offset, @@ -232,6 +232,7 @@ int recv_token(int f,char **data); void see_token(char *data, int toklen); int main(int argc, char **argv); +int main(int argc, char **argv); void add_uid(uid_t uid); void add_gid(gid_t gid); void send_uid_list(int f); diff -aur rsync-2.5.6/receiver.c rsync-arh/receiver.c --- rsync-2.5.6/receiver.c Mon Jan 2...

...total_size,char *md4) { int i; struct sum_struct sum; + struct mdfour mdfour_data; unsigned int len; OFF_T offset = 0; OFF_T offset2; @@ -199,7 +200,9 @@ char *map=NULL; read_sum_head(f_in, &sum); - + if (md4) + mdfour_begin(&mdfour_data); + sum_init(); while ((i = recv_token(f_in, &data)) != 0) { @@ -216,6 +219,8 @@ cleanup_got_literal = 1; sum_update(data,i); + if (md4) + mdfour_update(&mdfour_data,data,i); if (fd != -1 && write_file(fd,data,i) != i) { rprintf(FERROR, "write failed on %s: %s\n", @@ -243,6 +248,8 @@...

...total_size,char *md4) { int i; struct sum_struct sum; + struct mdfour mdfour_data; unsigned int len; OFF_T offset = 0; OFF_T offset2; @@ -199,7 +200,9 @@ char *map=NULL; read_sum_head(f_in, &sum); - + if (md4) + mdfour_begin(&mdfour_data); + sum_init(); while ((i = recv_token(f_in, &data)) != 0) { @@ -216,6 +219,8 @@ cleanup_got_literal = 1; sum_update(data,i); + if (md4) + mdfour_update(&mdfour_data,data,i); if (fd != -1 && write_file(fd,data,i) != i) { rprintf(FERROR, "write failed on %s: %s\n", @@ -243,6 +248,8 @@...

...total_size,char *md4) { int i; struct sum_struct sum; + struct mdfour mdfour_data; unsigned int len; OFF_T offset = 0; OFF_T offset2; @@ -199,7 +200,9 @@ char *map=NULL; read_sum_head(f_in, &sum); - + if (md4) + mdfour_begin(&mdfour_data); + sum_init(); while ((i = recv_token(f_in, &data)) != 0) { @@ -216,6 +219,8 @@ cleanup_got_literal = 1; sum_update(data,i); + if (md4) + mdfour_update(&mdfour_data,data,i); if (fd != -1 && write_file(fd,data,i) != i) { rprintf(FERROR, "write failed on %s: %s\n", @@ -243,6 +248,8 @@...

...total_size,char *md4) { int i; struct sum_struct sum; + struct mdfour mdfour_data; unsigned int len; OFF_T offset = 0; OFF_T offset2; @@ -199,7 +200,9 @@ char *map=NULL; read_sum_head(f_in, &sum); - + if (md4) + mdfour_begin(&mdfour_data); + sum_init(); while ((i = recv_token(f_in, &data)) != 0) { @@ -216,6 +219,8 @@ cleanup_got_literal = 1; sum_update(data,i); + if (md4) + mdfour_update(&mdfour_data,data,i); if (fd != -1 && write_file(fd,data,i) != i) { rprintf(FERROR, "write failed on %s: %s\n", @@ -243,6 +248,8 @@...