TODO: the configure changes should abort if the user requests --enable-slp
and we can't honor that request.
+based-on: 3e44bbd3132c22f7ce1ae48c0ce262f237473038
diff --git a/Makefile.in b/Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
-@@ -13,6 +13,8 @@ CFLAGS=@CFLAGS@
- CPPFLAGS=@CPPFLAGS@
+@@ -17,6 +17,8 @@ CXX=@CXX@
+ CXXFLAGS=@CXXFLAGS@
EXEEXT=@EXEEXT@
LDFLAGS=@LDFLAGS@
+LIBSLP=@LIBSLP@
+SLPOBJ=@SLPOBJ@
+ LIBOBJDIR=lib/
INSTALLCMD=@INSTALL@
- INSTALLMAN=@INSTALL@
-@@ -37,7 +39,7 @@ OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \
+@@ -46,7 +48,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
+ usage.o fileio.o batch.o clientname.o chmod.o acls.o xattrs.o
+ OBJS3=progress.o pipe.o @ASM@ @SIMD@
-DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
+DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o $(SLPOBJ)
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:
+ OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) @BUILD_ZLIB@ @BUILD_POPT@
+@@ -99,7 +101,7 @@ install-strip:
$(MAKE) INSTALL_STRIP='-s' install
rsync$(EXEEXT): $(OBJS)
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(LIBSLP)
- $(OBJS): $(HEADERS)
- $(CHECK_OBJS): $(HEADERS)
+ rrsync: support/rrsync
+ cp -p $(srcdir)/support/rrsync rrsync
diff --git a/clientserver.c b/clientserver.c
--- a/clientserver.c
+++ b/clientserver.c
-@@ -1032,6 +1032,13 @@ int daemon_main(void)
- * address too. In fact, why not just do inet_ntop on the
+@@ -1490,6 +1490,13 @@ int daemon_main(void)
+ * address too. In fact, why not just do getnameinfo on the
* local address??? */
+#ifdef HAVE_LIBSLP
-+ if (register_services()) {
++ if (lp_use_slp() && register_services()) {
+ rprintf(FINFO,
+ "Couldn't register with service discovery protocol, continuing anyway\n");
+ }
start_accept_loop(rsync_port, start_daemon);
return -1;
}
-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
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -1008,6 +1008,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
+AC_SUBST(SLPOBJ)
+
AC_CACHE_CHECK([for working socketpair],rsync_cv_HAVE_SOCKETPAIR,[
- AC_TRY_RUN([
- #include <sys/types.h>
-diff --git a/loadparm.c b/loadparm.c
---- a/loadparm.c
-+++ b/loadparm.c
-@@ -111,6 +111,9 @@ typedef struct
- char *socket_options;
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #ifdef HAVE_SYS_TYPES_H
+diff --git a/daemon-parm.txt b/daemon-parm.txt
+--- a/daemon-parm.txt
++++ b/daemon-parm.txt
+@@ -10,8 +10,10 @@ STRING socket_options NULL
- int rsync_port;
-+#ifdef HAVE_LIBSLP
-+ int slp_refresh;
-+#endif
- } global;
-
- static global Globals;
-@@ -302,6 +305,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},
-+#ifdef HAVE_LIBSLP
-+ {"slp refresh", P_INTEGER,P_GLOBAL,&Globals.slp_refresh, NULL,0},
-+#endif
- {"socket options", P_STRING, P_GLOBAL,&Globals.socket_options, NULL,0},
+ INTEGER listen_backlog 5
+ INTEGER rsync_port|port 0
++INTEGER slp_refresh 0
- {"auth users", P_STRING, P_LOCAL, &sDefault.auth_users, NULL,0},
-@@ -396,6 +402,9 @@ FN_GLOBAL_STRING(lp_pid_file, &Globals.pid_file)
- FN_GLOBAL_STRING(lp_socket_options, &Globals.socket_options)
+ BOOL proxy_protocol False
++BOOL use_slp False
- FN_GLOBAL_INTEGER(lp_rsync_port, &Globals.rsync_port)
-+#ifdef HAVE_LIBSLP
-+FN_GLOBAL_INTEGER(lp_slp_refresh, &Globals.slp_refresh)
-+#endif
+ Locals: =================================================================
- FN_LOCAL_STRING(lp_auth_users, auth_users)
- FN_LOCAL_STRING(lp_charset, charset)
diff --git a/main.c b/main.c
--- a/main.c
+++ b/main.c
-@@ -1146,6 +1146,18 @@ static int start_client(int argc, char *argv[])
+@@ -1404,6 +1404,22 @@ 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);
+ if (shell_machine && !shell_machine[0]) {
+#ifdef HAVE_LIBSLP
+ /* User entered just rsync:// URI */
-+ print_service_list();
-+ exit_cleanup(0);
++ if (lp_use_slp()) {
++ print_service_list();
++ exit_cleanup(0);
++ }
++ rprintf(FINFO, "SLP is disabled, cannot browse\n");
++ exit_cleanup(RERR_SYNTAX);
+#else /* No SLP, die here */
+ rprintf(FINFO, "No SLP support, cannot browse\n");
+ exit_cleanup(RERR_SYNTAX);
if (path) { /* source is remote */
char *dummy_host;
int dummy_port = 0;
-diff --git a/options.c b/options.c
---- a/options.c
-+++ b/options.c
-@@ -224,6 +224,7 @@ static void print_rsync_version(enum logcode f)
- char const *links = "no ";
- char const *iconv = "no ";
- char const *ipv6 = "no ";
-+ char const *slp = "no ";
- STRUCT_STAT *dumstat;
+diff --git a/rsync.1.md b/rsync.1.md
+--- a/rsync.1.md
++++ b/rsync.1.md
+@@ -149,7 +149,19 @@ rsync daemon by leaving off the module name:
- #if SUBPROTOCOL_VERSION != 0
-@@ -256,6 +257,9 @@ static void print_rsync_version(enum logcode f)
- #if defined HAVE_LUTIMES && defined HAVE_UTIMES
- symtimes = "";
- #endif
-+#if HAVE_LIBSLP
-+ slp = "";
-+#endif
+ > rsync somehost.mydomain.com::
- rprintf(f, "%s version %s protocol version %d%s\n",
- RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol);
-@@ -269,8 +273,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, %ssymtimes\n",
-- have_inplace, acls, xattrs, iconv, symtimes);
-+ rprintf(f, " %sappend, %sACLs, %sxattrs, %siconv, %ssymtimes, %sSLP\n",
-+ have_inplace, acls, xattrs, iconv, symtimes, slp);
+-See the following section for more details.
++And, if Service Location Protocol is available, the following will list the
++available rsync servers:
++
++> rsync rsync://
++
++See the following section for even more usage details.
++
++One more thing, if Service Location Protocol is available, the following will
++list the available rsync servers:
++
++> rsync rsync://
++
++See the following section for even more usage details.
+
+ # ADVANCED USAGE
- #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
-@@ -187,6 +187,10 @@
+@@ -236,6 +236,10 @@
#define SIGNIFICANT_ITEM_FLAGS (~(\
ITEM_BASIS_TYPE_FOLLOWS | ITEM_XNAME_FOLLOWS | ITEM_LOCAL_CHANGE))
+/* this is the minimum we'll use, irrespective of config setting */
-+/* definately don't set to less than about 30 seconds */
++/* definitely 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:
-
- quote(tt(rsync somehost.mydomain.com::))
-
--See the following section for more details.
-+And, if Service Location Protocol is available, the following will list the
-+available rsync servers:
-+
-+quote(tt(rsync rsync://))
-+
-+See the following section for even more usage details.
-
- manpagesection(ADVANCED USAGE)
-
diff --git a/rsyncd.conf b/rsyncd.conf
new file mode 100644
--- /dev/null
+++ b/rsyncd.conf
-@@ -0,0 +1,3 @@
-+
+@@ -0,0 +1 @@
+slp refresh = 300
-+
-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.
-
-+dit(bf(slp refresh)) This option 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
-+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).
-+Using 3600 (one hour) is a good number if you tend to change your
-+configuration.
-+
- enddit()
+diff --git a/rsyncd.conf.5.md b/rsyncd.conf.5.md
+--- a/rsyncd.conf.5.md
++++ b/rsyncd.conf.5.md
+@@ -136,6 +136,21 @@ a literal % into a value is to use %%.
+ You can override the default backlog value when the daemon listens for
+ connections. It defaults to 5.
++0. `use slp`
++
++ You can enable Service Location Protocol support by enabling this global
++ parameter. The default is "false".
++
++0. `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 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). Using 3600
++ (one hour) is a good number if you tend to change your configuration.
++
+ # MODULE PARAMETERS
-@@ -654,6 +663,7 @@ use chroot = yes
- max connections = 4
- syslog facility = local5
- pid file = /var/run/rsyncd.pid
-+slp refresh = 3600
-
- [ftp]
- path = /var/ftp/./pub
+ After the global parameters you should define a number of modules, each module
+@@ -1173,6 +1188,7 @@ A more sophisticated example would be:
+ > max connections = 4
+ > syslog facility = local5
+ > pid file = /var/run/rsyncd.pid
++> slp refresh = 3600
+ >
+ > [ftp]
+ > 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))
+@@ -534,6 +534,16 @@ void start_accept_loop(int port, int (*fn)(int, int))
{
fd_set deffds;
int *sp, maxfd, i;
+#ifdef HAVE_LIBSLP
+ time_t next_slp_refresh;
-+ short slp_timeout = lp_slp_refresh();
++ short slp_timeout = lp_use_slp() ? lp_slp_refresh() : 0;
+ if (slp_timeout) {
+ if (slp_timeout < SLP_MIN_TIMEOUT)
+ slp_timeout = SLP_MIN_TIMEOUT;
#ifdef HAVE_SIGACTION
sigact.sa_flags = SA_NOCLDSTOP;
-@@ -552,14 +562,25 @@ void start_accept_loop(int port, int (*fn)(int, int))
+@@ -561,14 +571,25 @@ void start_accept_loop(int port, int (*fn)(int, int))
maxfd = sp[i];
}
/* 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
+@@ -581,7 +602,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++) {
+ exit_cleanup(RERR_SYNTAX);
+ }
+
-+ n = lp_numservices();
++ n = lp_num_modules();
+
+ if (0 == lp_slp_refresh())
+ timeout = SLP_LIFETIME_MAXIMUM; /* don't expire, ever */
+ /* refresh is done in main select loop */
+ return 0;
+}
+diff --git a/usage.c b/usage.c
+--- a/usage.c
++++ b/usage.c
+@@ -137,6 +137,11 @@ static void print_info_flags(enum logcode f)
+ #endif
+ "crtimes",
+
++#ifndef HAVE_LIBSLP
++ "no "
++#endif
++ "SLP",
++
+ "*Optimizations",
+
+ #ifndef HAVE_SIMD
git.samba.org / rsync.git / patches.git / blobdiff