X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/4c15e80040f6ac2fc79d599d1722cf209cc30536..c1ff70aa47e11c5b37634479a0facee775a7b6d9:/slp.diff diff --git a/slp.diff b/slp.diff index 12dd4b6..e81fb8b 100644 --- a/slp.diff +++ b/slp.diff @@ -10,6 +10,7 @@ To use this patch, run these commands for a successful build: TODO: the configure changes should abort if the user requests --enable-slp and we can't honor that request. +based-on: a01e3b490eb36ccf9e704840e1b6683dab867550 diff --git a/Makefile.in b/Makefile.in --- a/Makefile.in +++ b/Makefile.in @@ -22,7 +23,7 @@ diff --git a/Makefile.in b/Makefile.in INSTALLCMD=@INSTALL@ INSTALLMAN=@INSTALL@ -@@ -37,7 +39,7 @@ OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \ +@@ -38,7 +40,7 @@ OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \ OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o hashtable.o \ fileio.o batch.o clientname.o chmod.o acls.o xattrs.o OBJS3=progress.o pipe.o @@ -31,7 +32,7 @@ diff --git a/Makefile.in b/Makefile.in popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \ popt/popthelp.o popt/poptparse.o OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) $(ZLIBOBJ) @BUILD_POPT@ -@@ -73,7 +75,7 @@ install-strip: +@@ -74,7 +76,7 @@ install-strip: $(MAKE) INSTALL_STRIP='-s' install rsync$(EXEEXT): $(OBJS) @@ -43,7 +44,7 @@ diff --git a/Makefile.in b/Makefile.in diff --git a/clientserver.c b/clientserver.c --- a/clientserver.c +++ b/clientserver.c -@@ -973,6 +973,13 @@ int daemon_main(void) +@@ -1159,6 +1159,13 @@ int daemon_main(void) * address too. In fact, why not just do inet_ntop on the * local address??? */ @@ -60,7 +61,7 @@ diff --git a/clientserver.c b/clientserver.c diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -637,6 +637,29 @@ if test $rsync_cv_can_hardlink_special = yes; then +@@ -683,6 +683,29 @@ if test $rsync_cv_can_hardlink_special = yes; then AC_DEFINE(CAN_HARDLINK_SPECIAL, 1, [Define to 1 if link() can hard-link special files.]) fi @@ -93,40 +94,40 @@ diff --git a/configure.in b/configure.in diff --git a/loadparm.c b/loadparm.c --- a/loadparm.c +++ b/loadparm.c -@@ -111,6 +111,9 @@ typedef struct +@@ -98,6 +98,9 @@ typedef struct { char *socket_options; int rsync_port; +#ifdef HAVE_LIBSLP + int slp_refresh; +#endif - } global; + } global_vars; - static global Globals; -@@ -298,6 +301,9 @@ static struct parm_struct parm_table[] = - {"motd file", P_STRING, P_GLOBAL,&Globals.motd_file, NULL,0}, - {"pid file", P_STRING, P_GLOBAL,&Globals.pid_file, NULL,0}, - {"port", P_INTEGER,P_GLOBAL,&Globals.rsync_port, NULL,0}, + /* This structure describes a single section. Their order must match the +@@ -312,6 +315,9 @@ static struct parm_struct parm_table[] = + {"motd file", P_STRING, P_GLOBAL,&Vars.g.motd_file, NULL,0}, + {"pid file", P_STRING, P_GLOBAL,&Vars.g.pid_file, NULL,0}, + {"port", P_INTEGER,P_GLOBAL,&Vars.g.rsync_port, NULL,0}, +#ifdef HAVE_LIBSLP -+ {"slp refresh", P_INTEGER,P_GLOBAL,&Globals.slp_refresh, NULL,0}, ++ {"slp refresh", P_INTEGER,P_GLOBAL,&Vars.g.slp_refresh, NULL,0}, +#endif - {"socket options", P_STRING, P_GLOBAL,&Globals.socket_options, NULL,0}, + {"socket options", P_STRING, P_GLOBAL,&Vars.g.socket_options, NULL,0}, - {"auth users", P_STRING, P_LOCAL, &sDefault.auth_users, NULL,0}, -@@ -390,6 +396,9 @@ FN_GLOBAL_STRING(lp_pid_file, &Globals.pid_file) - FN_GLOBAL_STRING(lp_socket_options, &Globals.socket_options) + {"auth users", P_STRING, P_LOCAL, &Vars.l.auth_users, NULL,0}, +@@ -443,6 +449,9 @@ FN_GLOBAL_STRING(lp_pid_file, &Vars.g.pid_file) + FN_GLOBAL_STRING(lp_socket_options, &Vars.g.socket_options) - FN_GLOBAL_INTEGER(lp_rsync_port, &Globals.rsync_port) + FN_GLOBAL_INTEGER(lp_rsync_port, &Vars.g.rsync_port) +#ifdef HAVE_LIBSLP -+FN_GLOBAL_INTEGER(lp_slp_refresh, &Globals.slp_refresh) ++FN_GLOBAL_INTEGER(lp_slp_refresh, &Vars.g.slp_refresh) +#endif FN_LOCAL_STRING(lp_auth_users, auth_users) - FN_LOCAL_STRING(lp_comment, comment) + FN_LOCAL_STRING(lp_charset, charset) diff --git a/main.c b/main.c --- a/main.c +++ b/main.c -@@ -1144,6 +1144,18 @@ static int start_client(int argc, char *argv[]) +@@ -1238,6 +1238,18 @@ static int start_client(int argc, char *argv[]) if (!read_batch) { /* for read_batch, NO source is specified */ char *path = check_for_hostspec(argv[0], &shell_machine, &rsync_port); @@ -148,7 +149,7 @@ diff --git a/main.c b/main.c diff --git a/options.c b/options.c --- a/options.c +++ b/options.c -@@ -223,6 +223,7 @@ static void print_rsync_version(enum logcode f) +@@ -567,6 +567,7 @@ static void print_rsync_version(enum logcode f) char const *links = "no "; char const *iconv = "no "; char const *ipv6 = "no "; @@ -156,9 +157,9 @@ diff --git a/options.c b/options.c STRUCT_STAT *dumstat; #if SUBPROTOCOL_VERSION != 0 -@@ -252,6 +253,9 @@ static void print_rsync_version(enum logcode f) - #ifdef ICONV_OPTION - iconv = ""; +@@ -600,6 +601,9 @@ static void print_rsync_version(enum logcode f) + #ifdef CAN_SET_SYMLINK_TIMES + symtimes = ""; #endif +#if HAVE_LIBSLP + slp = ""; @@ -166,21 +167,21 @@ diff --git a/options.c b/options.c rprintf(f, "%s version %s protocol version %d%s\n", RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol); -@@ -265,8 +269,8 @@ static void print_rsync_version(enum logcode f) +@@ -613,8 +617,8 @@ static void print_rsync_version(enum logcode f) (int)(sizeof (int64) * 8)); rprintf(f, " %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n", got_socketpair, hardlinks, links, ipv6, have_inplace); -- rprintf(f, " %sappend, %sACLs, %sxattrs, %siconv\n", -- have_inplace, acls, xattrs, iconv); -+ rprintf(f, " %sappend, %sACLs, %sxattrs, %siconv, %sSLP\n", -+ have_inplace, acls, xattrs, iconv, slp); +- rprintf(f, " %sappend, %sACLs, %sxattrs, %siconv, %ssymtimes\n", +- have_inplace, acls, xattrs, iconv, symtimes); ++ rprintf(f, " %sappend, %sACLs, %sxattrs, %siconv, %ssymtimes, %sSLP\n", ++ have_inplace, acls, xattrs, iconv, symtimes, slp); #ifdef MAINTAINER_MODE rprintf(f, "Panic Action: \"%s\"\n", get_panic_action()); diff --git a/rsync.h b/rsync.h --- a/rsync.h +++ b/rsync.h -@@ -186,6 +186,10 @@ +@@ -199,6 +199,10 @@ #define SIGNIFICANT_ITEM_FLAGS (~(\ ITEM_BASIS_TYPE_FOLLOWS | ITEM_XNAME_FOLLOWS | ITEM_LOCAL_CHANGE)) @@ -188,13 +189,13 @@ diff --git a/rsync.h b/rsync.h +/* definately don't set to less than about 30 seconds */ +#define SLP_MIN_TIMEOUT 120 + - #define CFN_KEEP_LEADING_DOT_DIR (1<<0) + #define CFN_KEEP_DOT_DIRS (1<<0) #define CFN_KEEP_TRAILING_SLASH (1<<1) #define CFN_DROP_TRAILING_DOT_DIR (1<<2) diff --git a/rsync.yo b/rsync.yo --- a/rsync.yo +++ b/rsync.yo -@@ -144,7 +144,12 @@ particular rsync daemon by leaving off the module name: +@@ -148,7 +148,12 @@ particular rsync daemon by leaving off the module name: quote(tt(rsync somehost.mydomain.com::)) @@ -219,13 +220,13 @@ new file mode 100644 diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo --- a/rsyncd.conf.yo +++ b/rsyncd.conf.yo -@@ -104,6 +104,15 @@ details on some of the options you may be able to set. By default no - special socket options are set. These settings are superseded by the - bf(--sockopts) command-line option. +@@ -120,6 +120,15 @@ details on some of the options you may be able to set. By default no + special socket options are set. These settings can also be specified + via the bf(--sockopts) command-line option. -+dit(bf(slp refresh)) This option is used to determine how long service ++dit(bf(slp refresh)) This parameter is used to determine how long service +advertisements are valid (measured in seconds), and is only applicable if -+you have Service Location Protocol support compiled in. If this option is ++you have Service Location Protocol support compiled in. If this is +not set or is set to zero, then service advertisements never time out. If +this is set to less than 120 seconds, then 120 seconds is used. If it is +set to more than 65535, then 65535 is used (which is a limitation of SLP). @@ -234,19 +235,19 @@ diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo + enddit() - -@@ -607,6 +616,7 @@ use chroot = no + manpagesection(MODULE PARAMETERS) +@@ -766,6 +775,7 @@ use chroot = yes max connections = 4 syslog facility = local5 pid file = /var/run/rsyncd.pid +slp refresh = 3600 [ftp] - path = /var/ftp/pub + path = /var/ftp/./pub diff --git a/socket.c b/socket.c --- a/socket.c +++ b/socket.c -@@ -524,6 +524,16 @@ void start_accept_loop(int port, int (*fn)(int, int)) +@@ -530,6 +530,16 @@ void start_accept_loop(int port, int (*fn)(int, int)) { fd_set deffds; int *sp, maxfd, i; @@ -263,7 +264,7 @@ diff --git a/socket.c b/socket.c #ifdef HAVE_SIGACTION sigact.sa_flags = SA_NOCLDSTOP; -@@ -552,14 +562,25 @@ void start_accept_loop(int port, int (*fn)(int, int)) +@@ -558,14 +568,25 @@ void start_accept_loop(int port, int (*fn)(int, int)) maxfd = sp[i]; } @@ -289,24 +290,23 @@ diff --git a/socket.c b/socket.c /* close log file before the potentially very long select so * file can be trimmed by another process instead of growing -@@ -571,8 +592,18 @@ void start_accept_loop(int port, int (*fn)(int, int)) - #else +@@ -578,7 +599,18 @@ void start_accept_loop(int port, int (*fn)(int, int)) fds = deffds; #endif -- -- if (select(maxfd + 1, &fds, NULL, NULL, NULL) != 1) + +- if (select(maxfd + 1, &fds, NULL, NULL, NULL) < 1) +#ifdef HAVE_LIBSLP + sel_ret = select(maxfd + 1, &fds, NULL, NULL, + slp_timeout ? &slp_tv : NULL); + if (sel_ret == 0 && slp_timeout && time(NULL) > next_slp_refresh) { -+ rprintf(FINFO, "Service registration expired, refreshing it\n"); -+ register_services(); -+ next_slp_refresh = time(NULL) + slp_timeout; ++ rprintf(FINFO, "Service registration expired, refreshing it\n"); ++ register_services(); ++ next_slp_refresh = time(NULL) + slp_timeout; + } +#else + sel_ret = select(maxfd + 1, &fds, NULL, NULL, NULL); +#endif -+ if (sel_ret != 1) ++ if (sel_ret < 1) continue; for (i = 0, fd = -1; sp[i] >= 0; i++) {