This adds Service Location Protocol support.
-After applying this patch, run these commands for a successful build:
+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.
---- old/Makefile.in
-+++ new/Makefile.in
-@@ -12,6 +12,8 @@ CFLAGS=@CFLAGS@
+based-on: d64bda1c1e79dc385f194d74f7957ce7cd118654
+diff --git a/Makefile.in b/Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -13,6 +13,8 @@ CFLAGS=@CFLAGS@
CPPFLAGS=@CPPFLAGS@
EXEEXT=@EXEEXT@
LDFLAGS=@LDFLAGS@
INSTALLCMD=@INSTALL@
INSTALLMAN=@INSTALL@
-@@ -35,7 +37,7 @@ OBJS1=rsync.o generator.o receiver.o cle
- OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
- fileio.o batch.o clientname.o chmod.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
-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@
-@@ -69,7 +71,7 @@ install-strip:
+@@ -74,7 +76,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
-@@ -846,6 +846,13 @@ int daemon_main(void)
+ $(CHECK_OBJS): $(HEADERS)
+diff --git a/clientserver.c b/clientserver.c
+--- a/clientserver.c
++++ b/clientserver.c
+@@ -1164,6 +1164,13 @@ int daemon_main(void)
* address too. In fact, why not just do inet_ntop on the
* local address??? */
+ }
+#endif
+
- if (((pid_file = lp_pid_file()) != NULL) && (*pid_file != '\0')) {
- char pidbuf[16];
- int fd;
---- old/configure.in
-+++ new/configure.in
-@@ -559,6 +559,29 @@ if test $rsync_cv_can_hardlink_special =
+ start_accept_loop(rsync_port, start_daemon);
+ return -1;
+ }
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -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
AC_CACHE_CHECK([for working socketpair],rsync_cv_HAVE_SOCKETPAIR,[
AC_TRY_RUN([
#include <sys/types.h>
---- old/loadparm.c
-+++ new/loadparm.c
-@@ -105,6 +105,9 @@ typedef struct
+diff --git a/loadparm.c b/loadparm.c
+--- a/loadparm.c
++++ b/loadparm.c
+@@ -98,6 +98,9 @@ typedef struct {
char *socket_options;
int rsync_port;
+#ifdef HAVE_LIBSLP
+ int slp_refresh;
+#endif
- int syslog_facility;
- } global;
+ } global_vars;
-@@ -286,6 +289,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},
- {"syslog facility", P_ENUM, P_GLOBAL,&Globals.syslog_facility,enum_facilities,0},
+ {"socket options", P_STRING, P_GLOBAL,&Vars.g.socket_options, NULL,0},
-@@ -379,6 +385,9 @@ FN_GLOBAL_STRING(lp_pid_file, &Globals.p
- 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_GLOBAL_INTEGER(lp_syslog_facility, &Globals.syslog_facility)
FN_LOCAL_STRING(lp_auth_users, auth_users)
---- old/main.c
-+++ new/main.c
-@@ -1022,6 +1022,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
+@@ -1237,6 +1237,18 @@ static int start_client(int argc, char *argv[])
if (!read_batch) { /* for read_batch, NO source is specified */
- shell_path = check_for_hostspec(argv[0], &shell_machine, &rsync_port);
+ char *path = check_for_hostspec(argv[0], &shell_machine, &rsync_port);
+
+ if (shell_machine && !shell_machine[0]) {
+#ifdef HAVE_LIBSLP
+#endif
+ }
+
- if (shell_path) { /* source is remote */
- char *dummy1;
- int dummy2;
---- old/options.c
-+++ new/options.c
-@@ -200,6 +200,7 @@ static void print_rsync_version(enum log
- char const *hardlinks = "no ";
+ 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
+@@ -568,6 +568,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;
- #ifdef HAVE_SOCKETPAIR
-@@ -222,6 +223,10 @@ static void print_rsync_version(enum log
- ipv6 = "";
+ #if SUBPROTOCOL_VERSION != 0
+@@ -601,6 +602,9 @@ static void print_rsync_version(enum logcode f)
+ #ifdef CAN_SET_SYMLINK_TIMES
+ symtimes = "";
#endif
-
+#if HAVE_LIBSLP
+ slp = "";
+#endif
-+
- rprintf(f, "%s version %s protocol version %d\n",
- RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION);
- rprintf(f, "Copyright (C) 1996-2006 by Andrew Tridgell, Wayne Davison, and others.\n");
-@@ -234,9 +239,9 @@ static void print_rsync_version(enum log
- /* Note that this field may not have type ino_t. It depends
- * on the complicated interaction between largefile feature
- * macros. */
-- rprintf(f, " %sinplace, %sIPv6, "
-+ rprintf(f, " %sinplace, %sIPv6, %sSLP, "
- "%d-bit system inums, %d-bit internal inums\n",
-- have_inplace, ipv6,
-+ have_inplace, ipv6, slp,
- (int) (sizeof dumstat->st_ino * 8),
- (int) (sizeof (int64) * 8));
+
+ rprintf(f, "%s version %s protocol version %d%s\n",
+ RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol);
+@@ -614,8 +618,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);
+
#ifdef MAINTAINER_MODE
---- old/rsync.h
-+++ new/rsync.h
-@@ -156,6 +156,9 @@
+ rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
+diff --git a/rsync.h b/rsync.h
+--- a/rsync.h
++++ b/rsync.h
+@@ -199,6 +199,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
-@@ -139,7 +139,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
+@@ -148,7 +148,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
-@@ -119,6 +119,15 @@ details on some of the options you may b
- special socket options are set. These settings are superseded by the
- bf(--sockopts) command-line option.
+diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
+--- a/rsyncd.conf.yo
++++ b/rsyncd.conf.yo
+@@ -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).
+
enddit()
-
-@@ -543,6 +552,7 @@ use chroot = no
+ manpagesection(MODULE PARAMETERS)
+@@ -768,6 +777,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
-@@ -465,6 +465,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
+@@ -515,6 +515,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;
-@@ -493,14 +503,25 @@ void start_accept_loop(int port, int (*f
+@@ -543,14 +553,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
-@@ -512,8 +533,18 @@ void start_accept_loop(int port, int (*f
- #else
+@@ -563,7 +584,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++) {
---- 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"; -*-
+
git.samba.org / rsync-patches.git / blobdiff