X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/eca2adb4b3a4ca095116f54e9e0a6df19f0bd149..fd73b94d312491fd3d9d3e38b820f8cb1c53f453:/rsync.h diff --git a/rsync.h b/rsync.h index 2e92e2f4..41e65f9c 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://" @@ -49,20 +50,28 @@ #define SAME_TIME (1<<7) /* update this if you make incompatible changes */ -#define PROTOCOL_VERSION 26 +#define PROTOCOL_VERSION 27 /* We refuse to interoperate with versions that are not in this range. * Note that we assume we'll work with later versions: the onus is on * people writing them to make sure that they don't send us anything * we won't understand. * - * 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 + * 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 + * MAX_PROTOCOL_VERSION: 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 MIN_PROTOCL_VERSION and + * MAX_PROTOCOL_VERSION. */ + +#define MIN_PROTOCOL_VERSION 17 +#define OLD_PROTOCOL_VERSION 20 +#define MAX_PROTOCOL_VERSION 40 #define RSYNC_PORT 873 @@ -272,6 +281,17 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 }; #define NO_INT64 #endif +#if (SIZEOF_LONG == 8) +#define uint64 unsigned long +#elif (SIZEOF_INT == 8) +#define uint64 unsigned int +#elif HAVE_LONGLONG +#define uint64 unsigned long long +#else +/* As long as it gets... */ +#define uint64 unsigned off_t +#endif + /* Starting from protocol version 26, we always use 64-bit * ino_t and dev_t internally, even if this platform does not * allow files to have 64-bit inums. That's because the @@ -303,8 +323,8 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 }; * 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,15 +341,25 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 }; /* the length of the md4 checksum */ #define MD4_SUM_LENGTH 16 #define SUM_LENGTH 16 +#define SHORT_SUM_LENGTH 2 +#define BLOCKSUM_BIAS 10 #ifndef MAXPATHLEN #define MAXPATHLEN 1024 #endif +#ifndef NAME_MAX +#define NAME_MAX 255 +#endif + #ifndef INADDR_NONE #define INADDR_NONE 0xffffffff #endif +#ifndef IN_LOOPBACKNET +#define IN_LOOPBACKNET 127 +#endif + struct file_struct { unsigned flags; time_t modtime; @@ -369,19 +399,20 @@ 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 */ - 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 */ + OFF_T flength; /**< total file length */ + size_t count; /**< how many chunks */ + size_t remainder; /**< flength % block_length */ + size_t blength; /**< block_length */ + size_t s2length; /**< sum2_length */ + struct sum_buf *sums; /**< points to info for each chunk */ }; struct map_struct { @@ -390,13 +421,15 @@ struct map_struct { OFF_T file_size, p_offset, p_fd_offset; }; +#define MATCHFLG_WILD 0x0001 /* pattern has '*', '[', and/or '?' */ +#define MATCHFLG_WILD2 0x0002 /* pattern has '**' */ +#define MATCHFLG_WILD2_PREFIX 0x0004 /* pattern starts with '**' */ struct exclude_struct { char *pattern; - int regular_exp; - int fnmatch_flags; + int match_flags; int include; int directory; - int local; + int slash_cnt; }; struct stats { @@ -492,6 +525,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 @@ -555,9 +598,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 */ @@ -590,6 +630,10 @@ void rsyserr(enum logcode, int, const char *, ...) #define inet_ntoa rep_inet_ntoa #endif +/* Make sure that the O_BINARY flag is defined. */ +#ifndef O_BINARY +#define O_BINARY 0 +#endif #ifndef HAVE_STRLCPY size_t strlcpy(char *d, const char *s, size_t bufsize); @@ -614,7 +658,7 @@ 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 @@ -623,4 +667,4 @@ const char *get_panic_action(void); #define UNUSED(x) x __attribute__((__unused__)) -const char *io_write_phase, *io_read_phase; +extern const char *io_write_phase, *io_read_phase;