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:
- autoconf
- autoheader
+ patch -p1 <patches/slp.diff
+ ./prepare-source
./configure --enable-slp
- make proto
make
---- orig/Makefile.in 2006-01-14 08:14:29
-+++ Makefile.in 2006-02-02 00:00:00
-@@ -12,6 +12,8 @@ CFLAGS=@CFLAGS@
+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
+@@ -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
+@@ -36,7 +38,7 @@ OBJS1=flist.o rsync.o generator.o receiv
+ 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:
+@@ -72,7 +74,7 @@ install-strip:
$(MAKE) INSTALL_STRIP='-s' install
rsync$(EXEEXT): $(OBJS)
$(OBJS): $(HEADERS)
---- orig/clientserver.c 2006-02-01 19:37:05
-+++ clientserver.c 2006-02-02 11:32:24
-@@ -832,6 +832,13 @@ int daemon_main(void)
+--- old/clientserver.c
++++ new/clientserver.c
+@@ -927,6 +927,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;
---- orig/configure.in 2006-02-02 02:41:09
-+++ configure.in 2006-02-02 11:30:00
-@@ -535,6 +535,29 @@ if test $rsync_cv_chown_follows_symlink
- AC_DEFINE(CHOWN_MODIFIES_SYMLINK, 1, [Define to 1 if chown modifies symlinks.])
+ 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 =
+ 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_CACHE_CHECK([for working socketpair],rsync_cv_HAVE_SOCKETPAIR,[
AC_TRY_RUN([
#include <sys/types.h>
---- orig/loadparm.c 2006-01-30 21:47:45
-+++ loadparm.c 2006-02-02 10:38:12
-@@ -105,6 +105,7 @@ typedef struct
+--- old/loadparm.c
++++ new/loadparm.c
+@@ -111,6 +111,9 @@ typedef struct
char *socket_options;
int rsync_port;
++#ifdef HAVE_LIBSLP
+ int slp_refresh;
- int syslog_facility;
++#endif
} global;
-@@ -286,6 +287,7 @@ static struct parm_struct parm_table[] =
+ static global Globals;
+@@ -296,6 +299,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},
- {"syslog facility", P_ENUM, P_GLOBAL,&Globals.syslog_facility,enum_facilities,0},
-@@ -379,6 +381,7 @@ FN_GLOBAL_STRING(lp_pid_file, &Globals.p
+ {"auth users", P_STRING, P_LOCAL, &sDefault.auth_users, NULL,0},
+@@ -387,6 +393,9 @@ FN_GLOBAL_STRING(lp_pid_file, &Globals.p
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)
- FN_GLOBAL_INTEGER(lp_syslog_facility, &Globals.syslog_facility)
++#endif
FN_LOCAL_STRING(lp_auth_users, auth_users)
---- orig/main.c 2006-02-02 02:41:09
-+++ main.c 2006-02-02 11:33:24
-@@ -952,6 +952,18 @@ static int start_client(int argc, char *
+ FN_LOCAL_STRING(lp_comment, comment)
+--- old/main.c
++++ new/main.c
+@@ -1125,6 +1125,18 @@ static int start_client(int argc, char *
+
if (!read_batch) { /* for read_batch, NO source is specified */
- argc--;
- 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;
---- orig/options.c 2006-02-02 11:40:45
-+++ options.c 2006-02-02 11:41:16
-@@ -195,6 +195,7 @@ static void print_rsync_version(enum log
- char const *hardlinks = "no ";
+ 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
char const *links = "no ";
+ char const *iconv = "no ";
char const *ipv6 = "no ";
+ char const *slp = "no ";
STRUCT_STAT *dumstat;
- #ifdef HAVE_SOCKETPAIR
-@@ -217,6 +218,10 @@ static void print_rsync_version(enum log
- ipv6 = "";
+ #if SUBPROTOCOL_VERSION != 0
+@@ -250,6 +251,9 @@ static void print_rsync_version(enum log
+ #ifdef ICONV_OPTION
+ iconv = "";
#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");
-@@ -229,9 +234,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);
+@@ -263,8 +267,8 @@ static void print_rsync_version(enum log
+ (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);
+
#ifdef MAINTAINER_MODE
---- orig/rsync.h 2006-02-02 02:41:09
-+++ rsync.h 2006-02-02 00:00:00
-@@ -154,6 +154,9 @@
+ rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
+--- old/rsync.h
++++ new/rsync.h
+@@ -182,6 +182,9 @@
#define SIGNIFICANT_ITEM_FLAGS (~(\
ITEM_BASIS_TYPE_FOLLOWS | ITEM_XNAME_FOLLOWS | ITEM_LOCAL_CHANGE))
+/* 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.
- * FLOG and FCLIENT are only used on the daemon side for custom logging,
---- orig/rsync.yo 2006-01-31 03:05:44
-+++ rsync.yo 2006-02-02 10:44:29
-@@ -137,7 +137,12 @@ particular rsync daemon by leaving off t
+ /* 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
quote(tt(rsync somehost.mydomain.com::))
manpagesection(ADVANCED USAGE)
---- orig/rsyncd.conf 2006-02-02 00:00:00
-+++ rsyncd.conf 2006-02-02 00:00:00
+--- old/rsyncd.conf
++++ new/rsyncd.conf
@@ -0,0 +1,3 @@
+
+slp refresh = 300
+
---- orig/rsyncd.conf.yo 2006-01-31 02:30:18
-+++ rsyncd.conf.yo 2006-02-02 10:40:24
-@@ -119,6 +119,15 @@ details on some of the options you may b
+--- old/rsyncd.conf.yo
++++ new/rsyncd.conf.yo
+@@ -103,6 +103,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.
enddit()
-@@ -540,6 +549,7 @@ use chroot = no
+@@ -565,6 +574,7 @@ use chroot = no
max connections = 4
syslog facility = local5
pid file = /var/run/rsyncd.pid
[ftp]
path = /var/ftp/pub
---- orig/socket.c 2006-02-02 02:41:09
-+++ socket.c 2006-02-02 10:28:15
-@@ -447,6 +447,14 @@ void start_accept_loop(int port, int (*f
+--- old/socket.c
++++ new/socket.c
+@@ -502,6 +502,16 @@ void start_accept_loop(int port, int (*f
{
fd_set deffds;
int *sp, maxfd, i;
++#ifdef HAVE_LIBSLP
+ time_t next_slp_refresh;
+ short slp_timeout = lp_slp_refresh();
+ if (slp_timeout) {
+ /* re-register before slp times out */
+ slp_timeout -= 15;
+ }
++#endif
- #if defined HAVE_SIGACTION && defined HAVE_SIGPROCMASK
+ #ifdef HAVE_SIGACTION
sigact.sa_flags = SA_NOCLDSTOP;
-@@ -475,14 +483,20 @@ void start_accept_loop(int port, int (*f
+@@ -530,14 +540,25 @@ void start_accept_loop(int port, int (*f
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 */
pid_t pid;
int fd;
+ int sel_ret;
-+ struct timeval slp_tv;
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
-@@ -494,8 +508,13 @@ void start_accept_loop(int port, int (*f
+@@ -549,8 +570,18 @@ void start_accept_loop(int port, int (*f
#else
fds = deffds;
#endif
-
- if (select(maxfd + 1, &fds, NULL, NULL, NULL) != 1)
-+ sel_ret = select(maxfd + 1, &fds, NULL, NULL, slp_timeout ? &slp_tv: NULL);
++#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++) {
---- orig/srvloc.c 2006-02-02 11:19:54
-+++ srvloc.c 2006-02-02 11:19:54
-@@ -0,0 +1,105 @@
+--- old/srvloc.c
++++ new/srvloc.c
+@@ -0,0 +1,103 @@
+/* -*- c-file-style: "linux"; -*-
+
+ Copyright (C) 2002 by Brad Hards <bradh@frogmouth.net>
+ char *cleanstr;
+
+ if (errcode == SLP_OK) {
-+ if (!strcmp(attrlist, "(comment=)")) {
++ if (!strcmp(attrlist, "(comment=)"))
+ rprintf(FINFO, "\t(No description)\n");
-+ } else {
++ else {
+ cleanstr = strrchr(attrlist, ')') ;
+ *cleanstr = ' '; /* remove last ')' */
+ rprintf(FINFO, "\t%s\n", strchr(attrlist, '=') + 1);
+ return SLP_FALSE;
+}
+
-+SLPBoolean getSLPSrvURLCallback(UNUSED(SLPHandle hslp), const char *srvurl,
-+ UNUSED(unsigned short lifetime), SLPError errcode,
-+ void *cookie)
++static SLPBoolean getSLPSrvURLCallback(UNUSED(SLPHandle hslp),
++ const char *srvurl, UNUSED(unsigned short lifetime),
++ SLPError errcode, void *cookie)
+{
+ SLPError result;
+ SLPHandle attrhslp;
+ SLPClose(attrhslp);
+ }
+ *(SLPError*)cookie = SLP_OK;
-+ } else {
++ } else
+ *(SLPError*)cookie = errcode;
-+ }
-+
+
+ /* Return SLP_TRUE because we want to be called again
+ * if more services were found. */
+
+ return 0;
+}
---- orig/srvreg.c 2006-02-02 11:20:37
-+++ srvreg.c 2006-02-02 11:20:37
+--- old/srvreg.c
++++ new/srvreg.c
@@ -0,0 +1,128 @@
+/* -*- c-file-style: "linux"; -*-
+
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff