X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/1eca49c6edbdf24593e6bcefbd11822bb7a21af0..6a7cc46cb279b9dbf12977177330aeebb912aa34:/rsync.h diff --git a/rsync.h b/rsync.h index 2bfe2506..21a19884 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 @@ -76,6 +85,16 @@ #define MPLEX_BASE 7 +#define NO_EXCLUDES 0 +#define SERVER_EXCLUDES 1 +#define ALL_EXCLUDES 2 + +#define MISSING_OK 0 +#define MISSING_FATAL 1 + +#define ADD_INCLUDE 1 +#define ADD_EXCLUDE 0 + /* Log values. I *think* what these mean is: FLOG goes to the server * logfile; FERROR and FINFO try to end up on the client, with * different levels of filtering. */ @@ -105,6 +124,10 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 }; #include #endif +#if defined(HAVE_MALLOC_H) && (defined(HAVE_MALLINFO) || !defined(HAVE_STDLIB_H)) +#include +#endif + #ifdef HAVE_SYS_SOCKET_H #include #endif @@ -113,10 +136,6 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 }; #include #endif -#ifdef HAVE_MALLOC_H -#include -#endif - #ifdef TIME_WITH_SYS_TIME #include #include @@ -173,20 +192,10 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 }; #endif #endif -#ifdef HAVE_FNMATCH -#include -#else -#include "lib/fnmatch.h" -#endif - #ifdef HAVE_GLOB_H #include #endif -#ifdef HAVE_MALLOC_H -# include -#endif - /* these are needed for the uid/gid mapping code */ #include #include @@ -217,6 +226,8 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 }; #include #endif +#include + #define BOOL int @@ -270,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 @@ -301,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)) @@ -319,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; @@ -367,34 +399,46 @@ 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 { - char *p; - int fd,p_size,p_len; - OFF_T file_size, p_offset, p_fd_offset; + char *p; /* Window pointer */ + int fd; /* File Descriptor */ + int p_size; /* Window size at allocation */ + int p_len; /* Window size after fill */ + /* p_size and p_len could be + * consolodated by using a local + * variable in map_ptr() */ + int status; /* first errno from read errors */ + OFF_T file_size; /* File size (from stat) */ + OFF_T p_offset; /* Window start */ + OFF_T p_fd_offset; /* offset of cursor in fd ala lseek */ }; +#define MATCHFLG_WILD 0x0001 /* pattern has '*', '[', and/or '?' */ +#define MATCHFLG_WILD2 0x0002 /* pattern has '**' */ +#define MATCHFLG_WILD2_PREFIX 0x0004 /* pattern starts with '**' */ +#define MATCHFLG_ABS_PATH 0x0008 /* path-match on absolute path */ 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 { @@ -421,6 +465,7 @@ static inline int flist_up(struct file_list *flist, int i) #include "byteorder.h" #include "lib/mdfour.h" +#include "lib/wildmatch.h" #include "lib/permstring.h" #include "lib/addrinfo.h" @@ -435,11 +480,13 @@ int asprintf(char **ptr, const char *format, ...); int vasprintf(char **ptr, const char *format, va_list ap); #endif -#if !defined(HAVE_VSNPRINTF) && !defined(HAVE_C99_VSNPRINTF) -int vsnprintf (char *str, size_t count, const char *fmt, va_list args); +#if !defined(HAVE_VSNPRINTF) || !defined(HAVE_C99_VSNPRINTF) +#define vsnprintf rsync_vsnprintf +int vsnprintf(char *str, size_t count, const char *fmt, va_list args); #endif -#if !defined(HAVE_SNPRINTF) && !defined(HAVE_C99_VSNPRINTF) +#if !defined(HAVE_SNPRINTF) || !defined(HAVE_C99_VSNPRINTF) +#define snprintf rsync_snprintf int snprintf(char *str,size_t count,const char *fmt,...); #endif @@ -490,6 +537,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 @@ -553,9 +610,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 */ @@ -564,25 +618,34 @@ 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 #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); @@ -607,5 +670,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;