This adds Service Location Protocol support.
To use this patch, run these commands for a successful build:
patch -p1 <patches/slp.diff
./prepare-source
./configure --enable-slp
make
TODO: the configure changes should abort if the user requests --enable-slp
and we can't honor that request.
based-on: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
diff --git a/Makefile.in b/Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,6 +16,8 @@ CXX=@CXX@
CXXFLAGS=@CXXFLAGS@
EXEEXT=@EXEEXT@
LDFLAGS=@LDFLAGS@
+LIBSLP=@LIBSLP@
+SLPOBJ=@SLPOBJ@
LIBOBJDIR=lib/
INSTALLCMD=@INSTALL@
@@ -45,7 +47,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 \
usage.o fileio.o batch.o clientname.o chmod.o acls.o xattrs.o
OBJS3=progress.o pipe.o @ASM@
-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) @SIMD@ $(DAEMON_OBJ) $(LIBOBJ) @BUILD_ZLIB@ @BUILD_POPT@
@@ -94,7 +96,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)
diff --git a/clientserver.c b/clientserver.c
--- a/clientserver.c
+++ b/clientserver.c
@@ -1456,6 +1456,13 @@ int daemon_main(void)
* address too. In fact, why not just do getnameinfo on the
* local address??? */
+#ifdef HAVE_LIBSLP
+ if (lp_use_slp() && register_services()) {
+ rprintf(FINFO,
+ "Couldn't register with service discovery protocol, continuing anyway\n");
+ }
+#endif
+
start_accept_loop(rsync_port, start_daemon);
return -1;
}
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1018,6 +1018,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_ARG_ENABLE(slp, [ --disable-slp turn off SLP support, defaults to on])
+AC_ARG_WITH(openslp-libs, [ --with-openslp-libs set directory for OpenSLP library],
+ LDFLAGS="-L$withval $LDFLAGS"
+ DSOFLAGS="-L$withval $DSOFLAGS",)
+AC_ARG_WITH(openslp-includes, [ --with-openslp-includes set directory for OpenSLP includes],
+ CFLAGS="-I$withval $CFLAGS"
+ CXXFLAGS="-I$withval $CXXFLAGS"
+ CPPFLAGS="-I$withval $CPPFLAGS",)
+
+LIBSLP=""
+SLPOBJ=""
+
+if test x$enable_slp != xno; then
+ AC_CHECK_HEADER(slp.h,
+ AC_CHECK_LIB(slp, SLPOpen,
+ AC_DEFINE(HAVE_LIBSLP, 1, [Define to 1 for SLP support])
+ SLPOBJ="srvreg.o srvloc.o"
+ LIBSLP="-lslp"))
+fi
+
+AC_SUBST(LIBSLP)
+AC_SUBST(SLPOBJ)
+
AC_CACHE_CHECK([for working socketpair],rsync_cv_HAVE_SOCKETPAIR,[
AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <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
INTEGER listen_backlog 5
INTEGER rsync_port|port 0
+INTEGER slp_refresh 0
BOOL proxy_protocol False
+BOOL use_slp False
Locals: =================================================================
diff --git a/main.c b/main.c
--- a/main.c
+++ b/main.c
@@ -1405,6 +1405,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 */
+ 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);
+#endif
+ }
+
if (path) { /* source is remote */
char *dummy_host;
int dummy_port = 0;
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:
> 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:
+
+> 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
diff --git a/rsync.h b/rsync.h
--- a/rsync.h
+++ b/rsync.h
@@ -224,6 +224,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 */
+/* definitely don't set to less than about 30 seconds */
+#define SLP_MIN_TIMEOUT 120
+
#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/rsyncd.conf b/rsyncd.conf
new file mode 100644
--- /dev/null
+++ b/rsyncd.conf
@@ -0,0 +1 @@
+slp refresh = 300
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
After the global parameters you should define a number of modules, each module
@@ -1168,6 +1183,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
@@ -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_use_slp() ? lp_slp_refresh() : 0;
+ if (slp_timeout) {
+ if (slp_timeout < SLP_MIN_TIMEOUT)
+ slp_timeout = SLP_MIN_TIMEOUT;
+ /* re-register before slp times out */
+ slp_timeout -= 15;
+ }
+#endif
#ifdef HAVE_SIGACTION
sigact.sa_flags = SA_NOCLDSTOP;
@@ -561,14 +571,25 @@ void start_accept_loop(int port, int (*fn)(int, int))
maxfd = sp[i];
}
+#ifdef HAVE_LIBSLP
+ next_slp_refresh = time(NULL) + slp_timeout;
+#endif
+
/* now accept incoming connections - forking a new process
* for each incoming connection */
while (1) {
fd_set fds;
pid_t pid;
int fd;
+ int sel_ret;
struct sockaddr_storage addr;
socklen_t addrlen = sizeof addr;
+#ifdef HAVE_LIBSLP
+ struct timeval slp_tv;
+
+ slp_tv.tv_sec = 10;
+ slp_tv.tv_usec = 0;
+#endif
/* close log file before the potentially very long select so
* file can be trimmed by another process instead of growing
@@ -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)
+#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;
+ }
+#else
+ sel_ret = select(maxfd + 1, &fds, NULL, NULL, NULL);
+#endif
+ if (sel_ret < 1)
continue;
for (i = 0, fd = -1; sp[i] >= 0; i++) {
diff --git a/srvloc.c b/srvloc.c
new file mode 100644
--- /dev/null
+++ b/srvloc.c
@@ -0,0 +1,103 @@
+/* -*- c-file-style: "linux"; -*-
+
+ Copyright (C) 2002 by Brad Hards <bradh@frogmouth.net>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+/* This file implements the service location functionality */
+/* Basically, it uses normal Service Location Protocol API */
+
+/* It is really a cheap hack - just to show how it might work
+ in a real application.
+*/
+
+#include "rsync.h"
+
+#include <slp.h>
+#include <stdio.h>
+#include <string.h>
+
+/* This one just prints out the attributes */
+static SLPBoolean getAttrCallback(UNUSED(SLPHandle hslp), const char *attrlist,
+ SLPError errcode, UNUSED(void *cookie))
+{
+ char *cleanstr;
+
+ if (errcode == SLP_OK) {
+ if (!strcmp(attrlist, "(comment=)"))
+ rprintf(FINFO, "\t(No description)\n");
+ else {
+ cleanstr = strrchr(attrlist, ')') ;
+ *cleanstr = ' '; /* remove last ')' */
+ rprintf(FINFO, "\t%s\n", strchr(attrlist, '=') + 1);
+ }
+ }
+ return SLP_FALSE;
+}
+
+static SLPBoolean getSLPSrvURLCallback(UNUSED(SLPHandle hslp),
+ const char *srvurl, UNUSED(unsigned short lifetime),
+ SLPError errcode, void *cookie)
+{
+ SLPError result;
+ SLPHandle attrhslp;
+
+ if (errcode == SLP_OK) {
+ /* chop service: off the front */
+ rprintf(FINFO, " %s ", (strchr(srvurl, ':') + 1));
+ /* check for any attributes */
+ if (SLPOpen("en", SLP_FALSE,&attrhslp) == SLP_OK) {
+ result = SLPFindAttrs(attrhslp, srvurl,
+ "", /* return all attributes */
+ "", /* use configured scopes */
+ getAttrCallback, NULL);
+ if (result != SLP_OK) {
+ rprintf(FERROR, "errorcode: %i\n",result);
+ }
+ SLPClose(attrhslp);
+ }
+ *(SLPError*)cookie = SLP_OK;
+ } else
+ *(SLPError*)cookie = errcode;
+
+ /* Return SLP_TRUE because we want to be called again
+ * if more services were found. */
+
+ return SLP_TRUE;
+}
+
+int print_service_list(void)
+{
+ SLPError err;
+ SLPError callbackerr;
+ SLPHandle hslp;
+
+ err = SLPOpen("en",SLP_FALSE,&hslp);
+ if (err != SLP_OK) {
+ rprintf(FERROR, "Error opening slp handle %i\n", err);
+ return err;
+ }
+
+ SLPFindSrvs(hslp, "rsync",
+ 0, /* use configured scopes */
+ 0, /* no attr filter */
+ getSLPSrvURLCallback, &callbackerr);
+
+ /* Now that we're done using slp, close the slp handle */
+ SLPClose(hslp);
+
+ return 0;
+}
diff --git a/srvreg.c b/srvreg.c
new file mode 100644
--- /dev/null
+++ b/srvreg.c
@@ -0,0 +1,128 @@
+/* -*- c-file-style: "linux"; -*-
+
+ Copyright (C) 2002 by Brad Hards <bradh@frogmouth.net>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+/* This file implements the service registration functionality */
+
+/* Basically, it uses normal Service Location Protocol API */
+
+#include "rsync.h"
+#include "slp.h"
+#include "netdb.h"
+
+extern int rsync_port;
+
+static void slp_callback(UNUSED(SLPHandle hslp), SLPError errcode, void *cookie)
+{
+ /* return the error code in the cookie */
+ *(SLPError*)cookie = errcode;
+
+ /* You could do something else here like print out
+ * the errcode, etc. Remember, as a general rule,
+ * do not try to do too much in a callback because
+ * it is being executed by the same thread that is
+ * reading slp packets from the wire. */
+}
+
+int register_services(void)
+{
+ SLPError err, callbackerr;
+ SLPHandle hslp;
+ int n;
+ int i;
+ char srv[120];
+ char attr[120];
+ char localhost[256];
+ extern char *config_file;
+ short timeout;
+ struct addrinfo aih, *ai = 0;
+
+ if (!lp_load(config_file, 0)) {
+ exit_cleanup(RERR_SYNTAX);
+ }
+
+ n = lp_num_modules();
+
+ if (0 == lp_slp_refresh())
+ timeout = SLP_LIFETIME_MAXIMUM; /* don't expire, ever */
+ else if (SLP_MIN_TIMEOUT > lp_slp_refresh())
+ timeout = SLP_MIN_TIMEOUT; /* use a reasonable minimum */
+ else if (SLP_LIFETIME_MAXIMUM <= lp_slp_refresh())
+ timeout = (SLP_LIFETIME_MAXIMUM - 1); /* as long as possible */
+ else
+ timeout = lp_slp_refresh();
+
+ rprintf(FINFO, "rsyncd registering %d service%s with slpd for %d seconds:\n", n, ((n==1)? "":"s"), timeout);
+ err = SLPOpen("en",SLP_FALSE,&hslp);
+ if (err != SLP_OK) {
+ rprintf(FINFO, "Error opening slp handle %i\n",err);
+ return err;
+ }
+ if (gethostname(localhost, sizeof localhost)) {
+ rprintf(FINFO, "Could not get hostname: %s\n", strerror(errno));
+ return err;
+ }
+ memset(&aih, 0, sizeof aih);
+ aih.ai_family = PF_UNSPEC;
+ aih.ai_flags = AI_CANONNAME;
+ if (0 != (err = getaddrinfo(localhost, 0, &aih, &ai)) || !ai) {
+ rprintf(FINFO, "Could not resolve hostname: %s\n", gai_strerror(err));
+ return err;
+ }
+ /* Register each service with SLP */
+ for (i = 0; i < n; i++) {
+ if (!lp_list(i))
+ continue;
+
+ snprintf(srv, sizeof srv, "service:rsync://%s:%d/%s",
+ ai->ai_canonname,
+ rsync_port,
+ lp_name(i));
+ rprintf(FINFO, " %s\n", srv);
+ if (lp_comment(i)) {
+ snprintf(attr, sizeof attr, "(comment=%s)",
+ lp_comment(i));
+ }
+ err = SLPReg(hslp,
+ srv, /* service to register */
+ timeout,
+ 0, /* this is ignored */
+ attr, /* attributes */
+ SLP_TRUE, /* new registration - don't change this */
+ slp_callback, /* callback */
+ &callbackerr);
+
+ /* err may contain an error code that occurred as the slp library
+ * _prepared_ to make the call. */
+ if (err != SLP_OK || callbackerr != SLP_OK)
+ rprintf(FINFO, "Error registering service with slp %i\n", err);
+
+ /* callbackerr may contain an error code (that was assigned through
+ * the callback cookie) that occurred as slp packets were sent on
+ * the wire. */
+ if (callbackerr != SLP_OK)
+ rprintf(FINFO, "Error registering service with slp %i\n",callbackerr);
+ }
+
+ /* Now that we're done using slp, close the slp handle */
+ freeaddrinfo(ai);
+ SLPClose(hslp);
+
+ /* refresh is done in main select loop */
+ return 0;
+}
diff --git a/usage.c b/usage.c
--- a/usage.c
+++ b/usage.c
@@ -131,6 +131,11 @@ static void print_info_flags(enum logcode f)
#endif
"crtimes",
+#ifndef HAVE_LIBSLP
+ "no "
+#endif
+ "SLP",
+
"*Optimizations",
#ifndef HAVE_SIMD
diff -Nurp a/config.h.in b/config.h.in
--- a/config.h.in
+++ b/config.h.in
@@ -243,6 +243,9 @@
/* Define to 1 if you have the `sec' library (-lsec). */
#undef HAVE_LIBSEC
+/* Define to 1 for SLP support */
+#undef HAVE_LIBSLP
+
/* Define to 1 if you have the `socket' library (-lsocket). */
#undef HAVE_LIBSOCKET
diff -Nurp a/configure.sh b/configure.sh
--- a/configure.sh
+++ b/configure.sh
@@ -631,6 +631,8 @@ BUILD_POPT
CC_SHOBJ_FLAG
OBJ_RESTORE
OBJ_SAVE
+SLPOBJ
+LIBSLP
ALLOCA
LIBOBJS
ASM
@@ -731,6 +733,9 @@ enable_zstd
enable_lz4
enable_iconv_open
enable_iconv
+enable_slp
+with_openslp_libs
+with_openslp_includes
enable_acl_support
enable_xattr_support
'
@@ -1386,6 +1391,7 @@ Optional Features:
--disable-lz4 disable LZ4 compression
--disable-iconv-open disable all use of iconv_open() function
--disable-iconv disable rsync's --iconv option
+ --disable-slp turn off SLP support, defaults to on
--disable-acl-support disable ACL support
--disable-xattr-support disable extended attributes
@@ -1402,6 +1408,8 @@ Optional Packages:
--with-nobody-group=GROUP
set the default unprivileged group (default nobody
or nogroup)
+ --with-openslp-libs set directory for OpenSLP library
+ --with-openslp-includes set directory for OpenSLP includes
Some influential environment variables:
CC C compiler command
@@ -9146,6 +9154,85 @@ $as_echo "#define CAN_HARDLINK_SPECIAL 1
fi
+# Check whether --enable-slp was given.
+if test "${enable_slp+set}" = set; then :
+ enableval=$enable_slp;
+fi
+
+
+# Check whether --with-openslp-libs was given.
+if test "${with_openslp_libs+set}" = set; then :
+ withval=$with_openslp_libs; LDFLAGS="-L$withval $LDFLAGS"
+ DSOFLAGS="-L$withval $DSOFLAGS"
+fi
+
+
+# Check whether --with-openslp-includes was given.
+if test "${with_openslp_includes+set}" = set; then :
+ withval=$with_openslp_includes; CFLAGS="-I$withval $CFLAGS"
+ CXXFLAGS="-I$withval $CXXFLAGS"
+ CPPFLAGS="-I$withval $CPPFLAGS"
+fi
+
+
+LIBSLP=""
+SLPOBJ=""
+
+if test x$enable_slp != xno; then
+ ac_fn_c_check_header_mongrel "$LINENO" "slp.h" "ac_cv_header_slp_h" "$ac_includes_default"
+if test "x$ac_cv_header_slp_h" = xyes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SLPOpen in -lslp" >&5
+$as_echo_n "checking for SLPOpen in -lslp... " >&6; }
+if ${ac_cv_lib_slp_SLPOpen+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lslp $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char SLPOpen ();
+int
+main ()
+{
+return SLPOpen ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_slp_SLPOpen=yes
+else
+ ac_cv_lib_slp_SLPOpen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_slp_SLPOpen" >&5
+$as_echo "$ac_cv_lib_slp_SLPOpen" >&6; }
+if test "x$ac_cv_lib_slp_SLPOpen" = xyes; then :
+
+$as_echo "#define HAVE_LIBSLP 1" >>confdefs.h
+
+ SLPOBJ="srvreg.o srvloc.o"
+ LIBSLP="-lslp"
+fi
+
+fi
+
+
+fi
+
+
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working socketpair" >&5
$as_echo_n "checking for working socketpair... " >&6; }
if ${rsync_cv_HAVE_SOCKETPAIR+:} false; then :
diff -Nurp a/rsync.1 b/rsync.1
--- a/rsync.1
+++ b/rsync.1
@@ -182,7 +182,27 @@ rsync somehost.mydomain.com::
.fi
.RE
.P
-See the following section for more details.
+And, if Service Location Protocol is available, the following will list the
+available rsync servers:
+.RS 4
+.P
+.nf
+rsync rsync://
+.fi
+.RE
+.P
+See the following section for even more usage details.
+.P
+One more thing, if Service Location Protocol is available, the following will
+list the available rsync servers:
+.RS 4
+.P
+.nf
+rsync rsync://
+.fi
+.RE
+.P
+See the following section for even more usage details.
.P
.SH "ADVANCED USAGE"
.P
diff -Nurp a/rsync.1.html b/rsync.1.html
--- a/rsync.1.html
+++ b/rsync.1.html
@@ -160,7 +160,20 @@ rsync daemon by leaving off the module n
<pre><code>rsync somehost.mydomain.com::
</code></pre>
</blockquote>
-<p>See the following section for more details.</p>
+<p>And, if Service Location Protocol is available, the following will list the
+available rsync servers:</p>
+<blockquote>
+<pre><code>rsync rsync://
+</code></pre>
+</blockquote>
+<p>See the following section for even more usage details.</p>
+<p>One more thing, if Service Location Protocol is available, the following will
+list the available rsync servers:</p>
+<blockquote>
+<pre><code>rsync rsync://
+</code></pre>
+</blockquote>
+<p>See the following section for even more usage details.</p>
<h1>ADVANCED USAGE</h1>
<p>The syntax for requesting multiple files from a remote host is done by
specifying additional remote-host args in the same style as the first, or with
diff -Nurp a/rsyncd.conf.5 b/rsyncd.conf.5
--- a/rsyncd.conf.5
+++ b/rsyncd.conf.5
@@ -132,6 +132,17 @@ can also be specified via the \fB\-\-soc
.IP "\fBlisten\ backlog\fP"
You can override the default backlog value when the daemon listens for
connections. It defaults to 5.
+.IP "\fBuse\ slp\fP"
+You can enable Service Location Protocol support by enabling this global
+parameter. The default is "false".
+.IP "\fBslp\ refresh\fP"
+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.
.P
.SH "MODULE PARAMETERS"
.P
@@ -1198,6 +1209,7 @@ use chroot = yes
max connections = 4
syslog facility = local5
pid file = /var/run/rsyncd.pid
+slp refresh = 3600
[ftp]
path = /var/ftp/./pub
diff -Nurp a/rsyncd.conf.5.html b/rsyncd.conf.5.html
--- a/rsyncd.conf.5.html
+++ b/rsyncd.conf.5.html
@@ -140,6 +140,21 @@ can also be specified via the <code>--so
<p>You can override the default backlog value when the daemon listens for
connections. It defaults to 5.</p>
</dd>
+
+<dt><code>use slp</code></dt><dd>
+<p>You can enable Service Location Protocol support by enabling this global
+parameter. The default is "false".</p>
+</dd>
+
+<dt><code>slp refresh</code></dt><dd>
+<p>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.</p>
+</dd>
</dl>
<h1>MODULE PARAMETERS</h1>
<p>After the global parameters you should define a number of modules, each module
@@ -1113,6 +1128,7 @@ use chroot = yes
max connections = 4
syslog facility = local5
pid file = /var/run/rsyncd.pid
+slp refresh = 3600
[ftp]
path = /var/ftp/./pub
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>
![[BACK]](/icons/cvsweb/back.gif){kind=icon}
Return to slp.diff CVS log ![[TXT]](/icons/cvsweb/text.gif){kind=icon}
![[DIR]](/icons/cvsweb/dir.gif){kind=icon}
Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / rsync / patches