X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/6abd193fe3f8e7b986c388e7642adc08516e8279..51106bafc6916a3054bc2b8c21f414acb8f46f35:/rsync.h diff --git a/rsync.h b/rsync.h index d030d4b9..a7f1f792 100644 --- a/rsync.h +++ b/rsync.h @@ -26,7 +26,8 @@ #define RSYNC_RSH_ENV "RSYNC_RSH" #define RSYNC_NAME "rsync" -#define RSYNCD_CONF "/etc/rsyncd.conf" +#define RSYNCD_SYSCONF "/etc/rsyncd.conf" +#define RSYNCD_USERCONF "rsyncd.conf" #define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock" #define URL_PREFIX "rsync://" @@ -56,13 +57,19 @@ * people writing them to make sure that they don't send us anything * we won't understand. * + * Interoperation with old but supported protocol versions + * should cause a warning to be printed. At a future date + * the old protocol will become the minimum and + * compatibility code removed. + * * There are two possible explanations for the limit at thirty: either * to allow new major-rev versions that do not interoperate with us, * and (more likely) so that we can detect an attempt to connect rsync * to a non-rsync server, which is unlikely to begin by sending a byte * between 15 and 30. */ #define MIN_PROTOCOL_VERSION 15 -#define MAX_PROTOCOL_VERSION 30 +#define OLD_PROTOCOL_VERSION 20 +#define MAX_PROTOCOL_VERSION 40 #define RSYNC_PORT 873 @@ -85,11 +92,9 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 }; #include "config.h" -#if HAVE_REMSH -#define RSYNC_RSH "remsh" -#else -#define RSYNC_RSH "rsh" -#endif +/* The default RSYNC_RSH is always set in config.h, either to "remsh", + * "rsh", or otherwise something specified by the user. HAVE_REMSH + * controls parameter munging for HP/UX, etc. */ #include @@ -219,6 +224,8 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 }; #include #endif +#include + #define BOOL int @@ -258,19 +265,24 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 }; #define STRUCT_STAT struct stat #endif -#if HAVE_OFF64_T -#define int64 off64_t -#elif (SIZEOF_LONG == 8) +#if (SIZEOF_LONG == 8) #define int64 long +#define uint64 unigned long #elif (SIZEOF_INT == 8) #define int64 int +#define uint64 unsigned int #elif HAVE_LONGLONG #define int64 long long +#define uint64 unsigned long long #else /* As long as it gets... */ #define int64 off_t +#define uint64 unsigned off_t #define NO_INT64 #endif +#if HAVE_OFF64_T +#define int64 off64_t +#endif /* Starting from protocol version 26, we always use 64-bit * ino_t and dev_t internally, even if this platform does not @@ -293,9 +305,18 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 }; * Solaris) to a 32-bit-devt machine (say, Linux-2.2/x86) then the * device numbers will be truncated. But it's a kind of silly thing * to do anyhow. + * + * FIXME: In future, we should probable split the device number into + * major/minor, and transfer the two parts as 32-bit ints. That gives + * you somewhat more of a chance that they'll come from a big machine + * to a little one in a useful way. + * + * FIXME: Really we need an unsigned type, and we perhaps ought to + * cope with platforms on which this is an unsigned int or even a + * struct. Later. */ -#define INO64_T int64 -#define DEV64_T int64 +#define INO64_T uint64 +#define DEV64_T uint64 #ifndef MIN #define MIN(a,b) ((a)<(b)?(a):(b)) @@ -321,6 +342,10 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 }; #define INADDR_NONE 0xffffffff #endif +#ifndef IN_LOOPBACKNET +#define IN_LOOPBACKNET 127 +#endif + struct file_struct { unsigned flags; time_t modtime; @@ -360,19 +385,19 @@ struct file_list { }; struct sum_buf { - OFF_T offset; /* offset in file of this chunk */ - int len; /* length of chunk of file */ - int i; /* index of this chunk */ - uint32 sum1; /* simple checksum */ - char sum2[SUM_LENGTH]; /* checksum */ + OFF_T offset; /**< offset in file of this chunk */ + int len; /**< length of chunk of file */ + int i; /**< index of this chunk */ + uint32 sum1; /**< simple checksum */ + char sum2[SUM_LENGTH]; /**< checksum */ }; struct sum_struct { - OFF_T flength; /* total file length */ - int count; /* how many chunks */ - int remainder; /* flength % block_length */ - int n; /* block_length */ - struct sum_buf *sums; /* points to info for each chunk */ + OFF_T flength; /**< total file length */ + size_t count; /**< how many chunks */ + size_t remainder; /**< flength % block_length */ + size_t n; /**< block_length */ + struct sum_buf *sums; /**< points to info for each chunk */ }; struct map_struct { @@ -413,11 +438,12 @@ static inline int flist_up(struct file_list *flist, int i) } #include "byteorder.h" -#include "proto.h" #include "lib/mdfour.h" #include "lib/permstring.h" #include "lib/addrinfo.h" +#include "proto.h" + /* We have replacement versions of these if they're missing. */ #ifndef HAVE_ASPRINTF int asprintf(char **ptr, const char *format, ...); @@ -453,6 +479,9 @@ extern int errno; #define SUPPORT_LINKS HAVE_READLINK #define SUPPORT_HARD_LINKS HAVE_LINK +/* This could be bad on systems which have no lchown and where chown + * follows symbollic links. On such systems it might be better not to + * try to chown symlinks at all. */ #ifndef HAVE_LCHOWN #define lchown chown #endif @@ -479,6 +508,16 @@ extern int errno; #define S_IWUSR 0200 #endif +#ifndef ACCESSPERMS +#define ACCESSPERMS 0777 +#endif + +#ifndef S_ISVTX +#define S_ISVTX 0 +#endif + +#define CHMOD_BITS (S_ISUID | S_ISGID | S_ISVTX | ACCESSPERMS) + #ifndef _S_IFMT #define _S_IFMT 0170000 #endif @@ -542,9 +581,6 @@ extern int errno; #define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode) || S_ISSOCK(mode) || S_ISFIFO(mode)) -#ifndef ACCESSPERMS -#define ACCESSPERMS 0777 -#endif /* Initial mask on permissions given to temporary files. Mask off setuid bits and group access because of potential race-condition security holes, and mask other access because mode 707 is bizarre */ @@ -553,19 +589,24 @@ extern int errno; /* handler for null strings in printf format */ #define NS(s) ((s)?(s):"") +#if !defined(__GNUC__) || defined(APPLE) +/* Apparently the OS X port of gcc gags on __attribute__. + * + * */ +#define __attribute__(x) + +#endif + + /* use magic gcc attributes to catch format errors */ void rprintf(enum logcode , const char *, ...) -#ifdef __GNUC__ - __attribute__ ((format (printf, 2, 3))) -#endif + __attribute__((format (printf, 2, 3))) ; /* This is just like rprintf, but it also tries to print some * representation of the error code. Normally errcode = errno. */ void rsyserr(enum logcode, int, const char *, ...) -#ifdef __GNUC__ - __attribute__ ((format (printf, 3, 4))) -#endif + __attribute__((format (printf, 3, 4))) ; #ifdef REPLACE_INET_NTOA @@ -596,5 +637,13 @@ inet_ntop(int af, const void *src, char *dst, size_t size); #endif /* !HAVE_INET_NTOP */ #ifndef HAVE_INET_PTON -int isc_net_pton(int af, const char *src, void *dst); +int inet_pton(int af, const char *src, void *dst); #endif + +#ifdef MAINTAINER_MODE +const char *get_panic_action(void); +#endif + +#define UNUSED(x) x __attribute__((__unused__)) + +extern const char *io_write_phase, *io_read_phase;