X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/8b48bf11549e2cc63c9380ac32885338b10f3c88..89d26123ff63a788e9cb7d07df3538f9e5d536d1:/sender.c

diff --git a/sender.c b/sender.c
index be9e56fd..f54542b5 100644
--- a/sender.c
+++ b/sender.c
@@ -146,7 +146,6 @@ int read_item_attrs(int f_in, int f_out, int ndx, uchar *type_ptr,
 	uchar fnamecmp_type = FNAMECMP_FNAME;
 	int iflags = protocol_version >= 29 ? read_shortint(f_in)
 		   : ITEM_TRANSFER | ITEM_MISSING_DATA;
-	int isave = iflags; /* XXX remove soon */
 
 	/* Handle the new keep-alive (no-op) packet. */
 	if (ndx == the_file_list->count && iflags == ITEM_IS_NEW)
@@ -174,12 +173,9 @@ int read_item_attrs(int f_in, int f_out, int ndx, uchar *type_ptr,
 	}
 	*len_ptr = len;
 
-	/* XXX Temporary backward compatibility when talking to 2.6.4pre[12] */
-	if (protocol_version >= 29 && iflags & ITEM_TRANSFER
-	    && !S_ISREG(the_file_list->files[ndx]->mode)) {
-		iflags &= ~ITEM_TRANSFER;
-		iflags |= ITEM_LOCAL_CHANGE;
-	}
+	/* Temporary handling of 2.6.4pre3 */
+	if (iflags & ITEM_DUMMY_BIT && iflags & (ITEM_LOCAL_CHANGE|ITEM_TRANSFER))
+		iflags &= ~ITEM_DUMMY_BIT;
 
 	if (iflags & ITEM_TRANSFER) {
 		if (!S_ISREG(the_file_list->files[ndx]->mode)) {
@@ -189,7 +185,7 @@ int read_item_attrs(int f_in, int f_out, int ndx, uchar *type_ptr,
 			exit_cleanup(RERR_PROTOCOL);
 		}
 	} else if (f_out >= 0) {
-		write_ndx_and_attrs(f_out, ndx, isave /*XXX iflags */,
+		write_ndx_and_attrs(f_out, ndx, iflags,
 				    fnamecmp_type, buf, len);
 	}
 
@@ -207,7 +203,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 	uchar fnamecmp_type;
 	int iflags, xlen;
 	struct file_struct *file;
-	int phase = 0;
+	int phase = 0, max_phase = protocol_version >= 29 ? 2 : 1;
 	struct stats initial_stats;
 	int save_make_backups = make_backups;
 	int itemizing = am_daemon ? daemon_log_format_has_i
@@ -222,9 +218,8 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 
 		i = read_int(f_in);
 		if (i == -1) {
-			if (phase)
+			if (++phase > max_phase)
 				break;
-			phase = 1;
 			csum_length = SUM_LENGTH;
 			if (verbose > 2)
 				rprintf(FINFO, "send_files phase=%d\n", phase);
@@ -257,6 +252,12 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 			maybe_log_item(file, iflags, itemizing, xname);
 			continue;
 		}
+		if (phase == 2) {
+			rprintf(FERROR,
+				"got transfer request in phase 2 [%s]\n",
+				who_am_i());
+			exit_cleanup(RERR_PROTOCOL);
+		}
 
 		updating_basis_file = inplace && (protocol_version >= 29
 			? fnamecmp_type == FNAMECMP_FNAME : !make_backups);