X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/9a7eef964a2e3389ffd3537302f80ca42cfe9239..c1ff70aa47e11c5b37634479a0facee775a7b6d9:/slp.diff diff --git a/slp.diff b/slp.diff index 06c2ee2..e81fb8b 100644 --- a/slp.diff +++ b/slp.diff @@ -1,14 +1,20 @@ 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 ---- old/loadparm.c -+++ new/loadparm.c -@@ -105,6 +105,7 @@ 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; - int syslog_facility; - } global; ++#endif + } global_vars; -@@ -286,6 +287,7 @@ 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}, - {"socket options", P_STRING, P_GLOBAL,&Globals.socket_options, NULL,0}, - {"syslog facility", P_ENUM, P_GLOBAL,&Globals.syslog_facility,enum_facilities,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,&Vars.g.slp_refresh, NULL,0}, ++#endif + {"socket options", P_STRING, P_GLOBAL,&Vars.g.socket_options, NULL,0}, -@@ -379,6 +381,7 @@ 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_slp_refresh, &Globals.slp_refresh) - FN_GLOBAL_INTEGER(lp_syslog_facility, &Globals.syslog_facility) + FN_GLOBAL_INTEGER(lp_rsync_port, &Vars.g.rsync_port) ++#ifdef HAVE_LIBSLP ++FN_GLOBAL_INTEGER(lp_slp_refresh, &Vars.g.slp_refresh) ++#endif FN_LOCAL_STRING(lp_auth_users, auth_users) ---- old/main.c -+++ new/main.c -@@ -962,6 +962,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 +@@ -1238,6 +1238,18 @@ static int start_client(int argc, char *argv[]) + 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 @@ -127,57 +143,59 @@ After applying this patch, run these commands for a successful build: +#endif + } + - if (shell_path) { /* source is remote */ - char *dummy1; - int dummy2; ---- old/options.c -+++ new/options.c -@@ -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; +diff --git a/options.c b/options.c +--- a/options.c ++++ b/options.c +@@ -567,6 +567,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 -@@ -217,6 +218,10 @@ static void print_rsync_version(enum log - ipv6 = ""; + #if SUBPROTOCOL_VERSION != 0 +@@ -600,6 +601,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"); -@@ -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); +@@ -613,8 +617,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 -@@ -154,6 +154,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. - * FLOG and FCLIENT are only used on the daemon side for custom logging, ---- old/rsync.yo -+++ new/rsync.yo -@@ -137,7 +137,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::)) @@ -191,21 +209,24 @@ After applying this patch, run these commands for a successful build: 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). @@ -214,21 +235,23 @@ After applying this patch, run these commands for a successful build: + enddit() - -@@ -541,6 +550,7 @@ use chroot = no + manpagesection(MODULE PARAMETERS) +@@ -766,6 +775,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 -@@ -447,6 +447,14 @@ 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_LIBSLP + time_t next_slp_refresh; + short slp_timeout = lp_slp_refresh(); + if (slp_timeout) { @@ -237,14 +260,17 @@ After applying this patch, run these commands for a successful build: + /* re-register before slp times out */ + slp_timeout -= 15; + } ++#endif #ifdef HAVE_SIGACTION sigact.sa_flags = SA_NOCLDSTOP; -@@ -475,14 +483,20 @@ 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]; } ++#ifdef HAVE_LIBSLP + next_slp_refresh = time(NULL) + slp_timeout; ++#endif + /* now accept incoming connections - forking a new process * for each incoming connection */ @@ -253,33 +279,42 @@ After applying this patch, run these commands for a successful build: 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 - #else +@@ -578,7 +599,18 @@ void start_accept_loop(int port, int (*fn)(int, int)) 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); + +- 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; + } -+ if (sel_ret != 1) ++#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++) { ---- old/srvloc.c -+++ new/srvloc.c -@@ -0,0 +1,105 @@ +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 @@ -319,9 +354,9 @@ After applying this patch, run these commands for a successful build: + 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); @@ -330,9 +365,9 @@ After applying this patch, run these commands for a successful build: + 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; @@ -352,10 +387,8 @@ After applying this patch, run these commands for a successful build: + 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. */ @@ -385,8 +418,10 @@ After applying this patch, run these commands for a successful build: + + 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"; -*- +