X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/afcb578c53a1c5579d48336e2197e476cead7057..998e0bab068d64092214e4e923e518c599faff61:/slp.diff diff --git a/slp.diff b/slp.diff index 3a9e5ee..5105682 100644 --- a/slp.diff +++ b/slp.diff @@ -1,14 +1,18 @@ 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 +@@ -107,6 +107,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; +@@ -292,6 +295,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}, +@@ -383,6 +389,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) + FN_LOCAL_STRING(lp_comment, comment) --- old/main.c +++ new/main.c -@@ -962,6 +962,18 @@ static int start_client(int argc, char * +@@ -1076,6 +1076,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); + + if (shell_machine && !shell_machine[0]) { @@ -132,40 +142,38 @@ After applying this patch, run these commands for a successful build: int dummy2; --- old/options.c +++ new/options.c -@@ -196,6 +196,7 @@ static void print_rsync_version(enum log - char const *hardlinks = "no "; +@@ -212,6 +212,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 -@@ -218,6 +219,10 @@ static void print_rsync_version(enum log - ipv6 = ""; + #if SUBPROTOCOL_VERSION != 0 +@@ -241,6 +242,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"); -@@ -230,9 +235,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); +@@ -254,8 +258,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 + rprintf(f, "Panic Action: \"%s\"\n", get_panic_action()); --- old/rsync.h +++ new/rsync.h -@@ -154,6 +154,9 @@ +@@ -179,6 +179,9 @@ #define SIGNIFICANT_ITEM_FLAGS (~(\ ITEM_BASIS_TYPE_FOLLOWS | ITEM_XNAME_FOLLOWS | ITEM_LOCAL_CHANGE)) @@ -173,11 +181,11 @@ After applying this patch, run these commands for a successful build: +/* 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, + /* 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 -@@ -137,7 +137,12 @@ particular rsync daemon by leaving off t +@@ -139,7 +139,12 @@ particular rsync daemon by leaving off t quote(tt(rsync somehost.mydomain.com::)) @@ -199,7 +207,7 @@ After applying this patch, run these commands for a successful build: + --- old/rsyncd.conf.yo +++ new/rsyncd.conf.yo -@@ -119,6 +119,15 @@ details on some of the options you may b +@@ -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. @@ -215,7 +223,7 @@ After applying this patch, run these commands for a successful build: enddit() -@@ -544,6 +553,7 @@ use chroot = no +@@ -561,6 +570,7 @@ use chroot = no max connections = 4 syslog facility = local5 pid file = /var/run/rsyncd.pid @@ -225,10 +233,11 @@ After applying this patch, run these commands for a successful build: path = /var/ftp/pub --- old/socket.c +++ new/socket.c -@@ -447,6 +447,14 @@ void start_accept_loop(int port, int (*f +@@ -465,6 +465,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) { @@ -237,14 +246,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 +@@ -493,14 +503,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 */ @@ -253,33 +265,41 @@ 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 +@@ -512,8 +533,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++) { --- old/srvloc.c +++ new/srvloc.c -@@ -0,0 +1,105 @@ +@@ -0,0 +1,103 @@ +/* -*- c-file-style: "linux"; -*- + + Copyright (C) 2002 by Brad Hards @@ -319,9 +339,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 +350,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 +372,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. */