int remote_protocol = 0;
+extern int verbose;
extern int am_server;
-
+extern int am_sender;
+extern int read_batch;
extern int checksum_seed;
-
extern int protocol_version;
-extern int verbose;
void setup_protocol(int f_out,int f_in)
{
if (remote_protocol == 0) {
- if (am_server) {
- remote_protocol = read_int(f_in);
+ if (!read_batch)
write_int(f_out, protocol_version);
- } else {
- write_int(f_out, protocol_version);
- remote_protocol = read_int(f_in);
- }
+ remote_protocol = read_int(f_in);
if (protocol_version > remote_protocol)
protocol_version = remote_protocol;
}
+ if (read_batch && remote_protocol > protocol_version) {
+ rprintf(FERROR, "The protocol version in the batch file is too new (%d > %d).\n",
+ remote_protocol, protocol_version);
+ exit_cleanup(RERR_PROTOCOL);
+ }
if (verbose > 3) {
rprintf(FINFO, "(%s) Protocol versions: remote=%d, negotiated=%d\n",
}
if (remote_protocol < MIN_PROTOCOL_VERSION
|| remote_protocol > MAX_PROTOCOL_VERSION) {
- rprintf(FERROR,"protocol version mismatch - is your shell clean?\n");
+ rprintf(FERROR,"protocol version mismatch -- is your shell clean?\n");
rprintf(FERROR,"(see the rsync man page for an explanation)\n");
exit_cleanup(RERR_PROTOCOL);
}