TODO: the configure changes should abort if the user requests --enable-slp
and we can't honor that request.
+based-on: 40afd365cc8ca968fd16e161d24df5b8a8a520cc
diff --git a/Makefile.in b/Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
diff --git a/clientserver.c b/clientserver.c
--- a/clientserver.c
+++ b/clientserver.c
-@@ -1062,6 +1062,13 @@ int daemon_main(void)
- * address too. In fact, why not just do inet_ntop on the
+@@ -1074,6 +1074,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() != 0) {
+ 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
-@@ -639,6 +639,29 @@ if test $rsync_cv_can_hardlink_special = yes; then
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -668,6 +668,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
diff --git a/loadparm.c b/loadparm.c
--- a/loadparm.c
+++ b/loadparm.c
-@@ -111,6 +111,9 @@ typedef struct
+@@ -109,6 +109,13 @@ typedef struct
char *socket_options;
int rsync_port;
+#ifdef HAVE_LIBSLP
+ int slp_refresh;
++#endif
++
++#ifdef HAVE_LIBSLP
++ BOOL use_slp;
+#endif
} global;
static global Globals;
-@@ -302,6 +305,9 @@ static struct parm_struct parm_table[] =
+@@ -300,7 +307,13 @@ 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},
+ {"slp refresh", P_INTEGER,P_GLOBAL,&Globals.slp_refresh, NULL,0},
+#endif
{"socket options", P_STRING, P_GLOBAL,&Globals.socket_options, NULL,0},
++#ifdef HAVE_LIBSLP
++ {"use slp", P_BOOL, P_GLOBAL,&Globals.use_slp, NULL,0},
++#endif
{"auth users", P_STRING, P_LOCAL, &sDefault.auth_users, NULL,0},
-@@ -396,6 +402,9 @@ FN_GLOBAL_STRING(lp_pid_file, &Globals.pid_file)
+ {"charset", P_STRING, P_LOCAL, &sDefault.charset, NULL,0},
+@@ -354,6 +367,9 @@ static struct parm_struct parm_table[] =
+ static void init_globals(void)
+ {
+ memset(&Globals, 0, sizeof Globals);
++#ifdef HAVE_LIBSLP
++ Globals.use_slp = True;
++#endif
+ }
+
+ /***************************************************************************
+@@ -394,6 +410,13 @@ FN_GLOBAL_STRING(lp_pid_file, &Globals.pid_file)
FN_GLOBAL_STRING(lp_socket_options, &Globals.socket_options)
FN_GLOBAL_INTEGER(lp_rsync_port, &Globals.rsync_port)
+#ifdef HAVE_LIBSLP
+FN_GLOBAL_INTEGER(lp_slp_refresh, &Globals.slp_refresh)
++#endif
++
++#ifdef HAVE_LIBSLP
++FN_GLOBAL_BOOL(lp_use_slp, &Globals.use_slp)
+#endif
FN_LOCAL_STRING(lp_auth_users, auth_users)
diff --git a/main.c b/main.c
--- a/main.c
+++ b/main.c
-@@ -1121,6 +1121,18 @@ static int start_client(int argc, char *argv[])
+@@ -1133,6 +1133,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);
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
-@@ -225,6 +225,7 @@ static void print_rsync_version(enum logcode f)
+@@ -223,6 +223,7 @@ static void print_rsync_version(enum logcode f)
char const *links = "no ";
char const *iconv = "no ";
char const *ipv6 = "no ";
STRUCT_STAT *dumstat;
#if SUBPROTOCOL_VERSION != 0
-@@ -257,6 +258,9 @@ static void print_rsync_version(enum logcode f)
- #if defined HAVE_LUTIMES && defined HAVE_UTIMES
+@@ -256,6 +257,9 @@ static void print_rsync_version(enum logcode f)
+ #ifdef CAN_SET_SYMLINK_TIMES
symtimes = "";
#endif
+#if HAVE_LIBSLP
rprintf(f, "%s version %s protocol version %d%s\n",
RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol);
-@@ -270,8 +274,8 @@ static void print_rsync_version(enum logcode f)
+@@ -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);
diff --git a/rsync.h b/rsync.h
--- a/rsync.h
+++ b/rsync.h
-@@ -190,6 +190,10 @@
+@@ -199,6 +199,10 @@
#define SIGNIFICANT_ITEM_FLAGS (~(\
ITEM_BASIS_TYPE_FOLLOWS | ITEM_XNAME_FOLLOWS | ITEM_LOCAL_CHANGE))
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::))
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.
+@@ -104,6 +104,19 @@ 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(use slp)) This parameter is used to determine if the module names are
++advertised via slp. The default is for this to be enabled, which will
++advertise your public modules.
++
+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 is
-+not set or is set to zero, then service advertisements never time out. If
++not set or is set to zero, then service advertisements never timeout. 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
+
enddit()
-
-@@ -652,6 +661,7 @@ use chroot = yes
+ manpagesection(MODULE PARAMETERS)
+@@ -658,6 +671,7 @@ use chroot = yes
max connections = 4
syslog facility = local5
pid file = /var/run/rsyncd.pid
diff --git a/socket.c b/socket.c
--- a/socket.c
+++ b/socket.c
-@@ -530,6 +530,16 @@ void start_accept_loop(int port, int (*fn)(int, int))
+@@ -544,6 +544,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;
-@@ -558,14 +568,25 @@ void start_accept_loop(int port, int (*fn)(int, int))
+@@ -572,14 +582,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
-@@ -577,8 +598,18 @@ void start_accept_loop(int port, int (*fn)(int, int))
- #else
+@@ -592,7 +613,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);
+#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++) {
git.samba.org / rsync.git / patches.git / blobdiff