X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a9766ef1472d04df22178f69ea7bfde36f2b7242..6a46226b3a4ee1c7ab1a4929c8dddeb70c6c5473:/rsync.h diff --git a/rsync.h b/rsync.h index 5ea5301d..b26073ee 100644 --- a/rsync.h +++ b/rsync.h @@ -1,6 +1,7 @@ /* - Copyright (C) Andrew Tridgell 1996 + Copyright (C) by Andrew Tridgell 1996, 2000 Copyright (C) Paul Mackerras 1996 + Copyright (C) 2001 by Martin Pool This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,18 +18,22 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#define False 0 +#define True 1 + #define BLOCK_SIZE 700 #define RSYNC_RSH_ENV "RSYNC_RSH" #define RSYNC_NAME "rsync" #define RSYNCD_CONF "/etc/rsyncd.conf" +#define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock" #define URL_PREFIX "rsync://" #define BACKUP_SUFFIX "~" /* a non-zero CHAR_OFFSET makes the rolling sum stronger, but is - imcompatible with older versions :-( */ + incompatible with older versions :-( */ #define CHAR_OFFSET 0 @@ -43,8 +48,19 @@ #define SAME_TIME (1<<7) /* update this if you make incompatible changes */ -#define PROTOCOL_VERSION 19 -#define MIN_PROTOCOL_VERSION 11 +#define PROTOCOL_VERSION 25 + +/* 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 #define RSYNC_PORT 873 @@ -52,16 +68,17 @@ #define SPARSE_WRITE_SIZE (1024) #define WRITE_SIZE (32*1024) #define CHUNK_SIZE (32*1024) -#define MAX_MAP_SIZE (1*1024*1024) +#define MAX_MAP_SIZE (256*1024) #define IO_BUFFER_SIZE (4092) -#define MAX_READ_BUFFER (1024*1024) #define MAX_ARGS 1000 #define MPLEX_BASE 7 -#define FERROR 1 -#define FINFO 2 -#define FLOG 3 + +/* 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. */ +enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 }; #include "errcode.h" @@ -75,12 +92,6 @@ #include -#ifdef HAVE_GETOPT_LONG -#include -#else -#include "lib/getopt.h" -#endif - #ifdef HAVE_UNISTD_H #include #endif @@ -148,11 +159,6 @@ #endif #include -#if defined(HAVE_MMAP) && defined(HAVE_MUNMAP) -#include -#define USE_MMAP 1 -#endif - #ifdef HAVE_UTIME_H #include #endif @@ -261,9 +267,11 @@ #endif #if HAVE_SHORT_INO_T -#define INO_T uint32 +# define INO_T uint32 +#elif HAVE_INO_T +# define INO_T ino_t #else -#define INO_T ino_t +# define INO_T unsigned #endif #ifndef MIN @@ -274,6 +282,10 @@ #define MAX(a,b) ((a)>(b)?(a):(b)) #endif +#ifndef MAXHOSTNAMELEN +#define MAXHOSTNAMELEN 256 +#endif + /* the length of the md4 checksum */ #define MD4_SUM_LENGTH 16 #define SUM_LENGTH 16 @@ -303,10 +315,21 @@ struct file_struct { char *sum; }; + +#define ARENA_SIZE (32 * 1024) + +struct string_area { + char *base; + char *end; + char *current; + struct string_area *next; +}; + struct file_list { int count; int malloced; struct file_struct **files; + struct string_area *string_area; }; struct sum_buf { @@ -326,15 +349,15 @@ struct sum_struct { }; struct map_struct { - char *map,*p; + char *p; int fd,p_size,p_len; - OFF_T size, p_offset; + OFF_T file_size, p_offset, p_fd_offset; }; struct exclude_struct { - char *orig; char *pattern; int regular_exp; + int fnmatch_flags; int include; int directory; int local; @@ -454,23 +477,44 @@ extern int errno; #define S_ISREG(mode) (((mode) & (_S_IFMT)) == (_S_IFREG)) #endif +/* work out what fcntl flag to use for non-blocking */ +#ifdef O_NONBLOCK +# define NONBLOCK_FLAG O_NONBLOCK +#elif defined(SYSV) +# define NONBLOCK_FLAG O_NDELAY +#else +# define NONBLOCK_FLAG FNDELAY +#endif + #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 */ +#define INITACCESSPERMS 0700 /* handler for null strings in printf format */ #define NS(s) ((s)?(s):"") /* use magic gcc attributes to catch format errors */ - void rprintf(int , const char *, ...) + void rprintf(enum logcode , const char *, ...) #ifdef __GNUC__ __attribute__ ((format (printf, 2, 3))) #endif ; +/* 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 + ; + #ifdef REPLACE_INET_NTOA #define inet_ntoa rep_inet_ntoa #endif @@ -484,4 +528,8 @@ size_t strlcpy(char *d, const char *s, size_t bufsize); size_t strlcat(char *d, const char *s, size_t bufsize); #endif +#ifndef WEXITSTATUS +#define WEXITSTATUS(stat) ((int)(((stat)>>8)&0xFF)) +#endif + #define exit_cleanup(code) _exit_cleanup(code, __FILE__, __LINE__)