TODO: the configure changes should abort if the user requests --enable-slp
and we can't honor that request.
---- old/Makefile.in
-+++ new/Makefile.in
+diff --git a/Makefile.in b/Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
@@ -13,6 +13,8 @@ CFLAGS=@CFLAGS@
CPPFLAGS=@CPPFLAGS@
EXEEXT=@EXEEXT@
INSTALLCMD=@INSTALL@
INSTALLMAN=@INSTALL@
-@@ -36,7 +38,7 @@ OBJS1=flist.o rsync.o generator.o receiv
+@@ -37,7 +39,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
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@
-@@ -72,7 +74,7 @@ install-strip:
+@@ -73,7 +75,7 @@ install-strip:
$(MAKE) INSTALL_STRIP='-s' install
rsync$(EXEEXT): $(OBJS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(LIBSLP)
$(OBJS): $(HEADERS)
-
---- old/clientserver.c
-+++ new/clientserver.c
-@@ -927,6 +927,13 @@ int daemon_main(void)
+ $(CHECK_OBJS): $(HEADERS)
+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
* local address??? */
start_accept_loop(rsync_port, start_daemon);
return -1;
}
---- old/configure.in
-+++ new/configure.in
-@@ -641,6 +641,29 @@ if test $rsync_cv_can_hardlink_special =
+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
AC_DEFINE(CAN_HARDLINK_SPECIAL, 1, [Define to 1 if link() can hard-link special files.])
fi
AC_CACHE_CHECK([for working socketpair],rsync_cv_HAVE_SOCKETPAIR,[
AC_TRY_RUN([
#include <sys/types.h>
---- old/loadparm.c
-+++ new/loadparm.c
+diff --git a/loadparm.c b/loadparm.c
+--- a/loadparm.c
++++ b/loadparm.c
@@ -111,6 +111,9 @@ typedef struct
char *socket_options;
} global;
static global Globals;
-@@ -296,6 +299,9 @@ static struct parm_struct parm_table[] =
+@@ -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},
{"socket options", P_STRING, P_GLOBAL,&Globals.socket_options, NULL,0},
{"auth users", P_STRING, P_LOCAL, &sDefault.auth_users, NULL,0},
-@@ -387,6 +393,9 @@ FN_GLOBAL_STRING(lp_pid_file, &Globals.p
+@@ -396,6 +402,9 @@ 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)
+#endif
FN_LOCAL_STRING(lp_auth_users, auth_users)
- FN_LOCAL_STRING(lp_comment, comment)
---- old/main.c
-+++ new/main.c
-@@ -1125,6 +1125,18 @@ static int start_client(int argc, char *
+ FN_LOCAL_STRING(lp_charset, charset)
+diff --git a/main.c b/main.c
+--- a/main.c
++++ b/main.c
+@@ -1120,6 +1120,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);
if (path) { /* source is remote */
char *dummy_host;
int dummy_port = 0;
---- old/options.c
-+++ new/options.c
-@@ -221,6 +221,7 @@ static void print_rsync_version(enum log
+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)
char const *links = "no ";
char const *iconv = "no ";
char const *ipv6 = "no ";
STRUCT_STAT *dumstat;
#if SUBPROTOCOL_VERSION != 0
-@@ -250,6 +251,9 @@ static void print_rsync_version(enum log
- #ifdef ICONV_OPTION
- iconv = "";
+@@ -257,6 +258,9 @@ static void print_rsync_version(enum logcode f)
+ #if defined HAVE_LUTIMES && defined HAVE_UTIMES
+ symtimes = "";
#endif
+#if HAVE_LIBSLP
+ slp = "";
rprintf(f, "%s version %s protocol version %d%s\n",
RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol);
-@@ -263,8 +267,8 @@ static void print_rsync_version(enum log
+@@ -270,8 +274,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());
---- old/rsync.h
-+++ new/rsync.h
-@@ -182,6 +182,9 @@
+diff --git a/rsync.h b/rsync.h
+--- a/rsync.h
++++ b/rsync.h
+@@ -191,6 +191,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 */
+#define SLP_MIN_TIMEOUT 120
-
- /* Log-message categories. Only FERROR and FINFO get sent over the socket,
- * but FLOG and FSOCKERR can be sent over the receiver -> generator pipe.
---- old/rsync.yo
-+++ new/rsync.yo
-@@ -145,7 +145,12 @@ particular rsync daemon by leaving off t
++
+ #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::))
manpagesection(ADVANCED USAGE)
---- old/rsyncd.conf
-+++ new/rsyncd.conf
+diff --git a/rsyncd.conf b/rsyncd.conf
+new file mode 100644
+--- /dev/null
++++ b/rsyncd.conf
@@ -0,0 +1,3 @@
+
+slp refresh = 300
+
---- old/rsyncd.conf.yo
-+++ new/rsyncd.conf.yo
-@@ -103,6 +103,15 @@ details on some of the options you may b
+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
++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).
enddit()
-@@ -565,6 +574,7 @@ use chroot = no
+@@ -652,6 +661,7 @@ use chroot = yes
max connections = 4
syslog facility = local5
pid file = /var/run/rsyncd.pid
+slp refresh = 3600
[ftp]
- path = /var/ftp/pub
---- old/socket.c
-+++ new/socket.c
-@@ -502,6 +502,16 @@ void start_accept_loop(int port, int (*f
+ path = /var/ftp/./pub
+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))
{
fd_set deffds;
int *sp, maxfd, i;
#ifdef HAVE_SIGACTION
sigact.sa_flags = SA_NOCLDSTOP;
-@@ -530,14 +540,25 @@ void start_accept_loop(int port, int (*f
+@@ -558,14 +568,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
-@@ -549,8 +570,18 @@ void start_accept_loop(int port, int (*f
+@@ -577,8 +598,18 @@ void start_accept_loop(int port, int (*fn)(int, int))
#else
fds = deffds;
#endif
continue;
for (i = 0, fd = -1; sp[i] >= 0; i++) {
---- old/srvloc.c
-+++ new/srvloc.c
+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"; -*-
+
+
+ return 0;
+}
---- old/srvreg.c
-+++ new/srvreg.c
+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"; -*-
+