Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change the msg pipe to use a real multiplexed IO mode
[rsync/rsync.git]
/
clientserver.c
diff --git
a/clientserver.c
b/clientserver.c
index
a74cff2
..
f2751a4
100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-55,7
+55,7
@@
extern char *logfile_format;
extern char *files_from;
extern char *tmpdir;
extern struct chmod_mode_struct *chmod_modes;
extern char *files_from;
extern char *tmpdir;
extern struct chmod_mode_struct *chmod_modes;
-extern
struct filter_list_struc
t daemon_filter_list;
+extern
filter_rule_lis
t daemon_filter_list;
extern char curr_dir[MAXPATHLEN];
#ifdef ICONV_OPTION
extern char *iconv_opt;
extern char curr_dir[MAXPATHLEN];
#ifdef ICONV_OPTION
extern char *iconv_opt;
@@
-339,7
+339,7
@@
int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char
if (protocol_version < 23) {
if (protocol_version == 22 || !am_sender)
if (protocol_version < 23) {
if (protocol_version == 22 || !am_sender)
- io_start_multiplex_in();
+ io_start_multiplex_in(
f_in
);
}
free(modname);
}
free(modname);
@@
-620,24
+620,24
@@
static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
set_filter_dir(module_dir, module_dirlen);
p = lp_filter(i);
set_filter_dir(module_dir, module_dirlen);
p = lp_filter(i);
- parse_
rule(&daemon_filter_list, p, MATCHFLG_WORD_SPLIT
,
+ parse_
filter_str(&daemon_filter_list, p, rule_template(FILTRULE_WORD_SPLIT)
,
XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3);
p = lp_include_from(i);
XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3);
p = lp_include_from(i);
- parse_filter_file(&daemon_filter_list, p,
MATCHFLG_INCLUDE
,
+ parse_filter_file(&daemon_filter_list, p,
rule_template(FILTRULE_INCLUDE)
,
XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
p = lp_include(i);
XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
p = lp_include(i);
- parse_
rule
(&daemon_filter_list, p,
-
MATCHFLG_INCLUDE | MATCHFLG_WORD_SPLIT
,
+ parse_
filter_str
(&daemon_filter_list, p,
+
rule_template(FILTRULE_INCLUDE | FILTRULE_WORD_SPLIT)
,
XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES);
p = lp_exclude_from(i);
XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES);
p = lp_exclude_from(i);
- parse_filter_file(&daemon_filter_list, p,
0
,
+ parse_filter_file(&daemon_filter_list, p,
rule_template(0)
,
XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
p = lp_exclude(i);
XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
p = lp_exclude(i);
- parse_
rule(&daemon_filter_list, p, MATCHFLG_WORD_SPLIT
,
+ parse_
filter_str(&daemon_filter_list, p, rule_template(FILTRULE_WORD_SPLIT)
,
XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES);
log_init(1);
XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES);
log_init(1);
@@
-885,7
+885,7
@@
static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
if (protocol_version < 23
&& (protocol_version == 22 || am_sender))
if (protocol_version < 23
&& (protocol_version == 22 || am_sender))
- io_start_multiplex_out();
+ io_start_multiplex_out(
f_out
);
else if (!ret || err_msg) {
/* We have to get I/O multiplexing started so that we can
* get the error back to the client. This means getting
else if (!ret || err_msg) {
/* We have to get I/O multiplexing started so that we can
* get the error back to the client. This means getting
@@
-909,7
+909,7
@@
static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
if (files_from)
write_byte(f_out, 0);
}
if (files_from)
write_byte(f_out, 0);
}
- io_start_multiplex_out();
+ io_start_multiplex_out(
f_out
);
}
if (!ret || err_msg) {
}
if (!ret || err_msg) {