#define BLOCK_SIZE 700
#define RSYNC_RSH_ENV "RSYNC_RSH"
+#define RSYNC_RSH_IO_ENV "RSYNC_RSH_IO"
#define RSYNC_NAME "rsync"
#define RSYNCD_SYSCONF "/etc/rsyncd.conf"
incompatible with older versions :-( */
#define CHAR_OFFSET 0
+/* These flags are only used during the flist transfer. */
-#define FLAG_DELETE (1<<0)
-#define SAME_MODE (1<<1)
-#define SAME_RDEV (1<<2)
-#define SAME_UID (1<<3)
-#define SAME_GID (1<<4)
-#define SAME_DIR (1<<5)
-#define SAME_NAME SAME_DIR
-#define LONG_NAME (1<<6)
-#define SAME_TIME (1<<7)
+#define XMIT_TOP_DIR (1<<0)
+#define XMIT_SAME_MODE (1<<1)
+#define XMIT_EXTENDED_FLAGS (1<<2)
+#define XMIT_SAME_RDEV_pre28 XMIT_EXTENDED_FLAGS /* Only in protocols < 28 */
+#define XMIT_SAME_UID (1<<3)
+#define XMIT_SAME_GID (1<<4)
+#define XMIT_SAME_NAME (1<<5)
+#define XMIT_LONG_NAME (1<<6)
+#define XMIT_SAME_TIME (1<<7)
+#define XMIT_SAME_HIGH_RDEV (1<<8)
+#define XMIT_HAS_IDEV_DATA (1<<9)
+#define XMIT_SAME_DEV (1<<10)
+
+/* These flags are used in the live flist data. */
+
+#define FLAG_TOP_DIR (1<<0)
+#define FLAG_HLINK_EOL (1<<1) /* generator only */
+#define FLAG_MOUNT_POINT (1<<2) /* sender only */
/* update this if you make incompatible changes */
-#define PROTOCOL_VERSION 26
+#define PROTOCOL_VERSION 28
/* 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
* 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
+ * 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 19
#define OLD_PROTOCOL_VERSION 20
#define MAX_PROTOCOL_VERSION 40
#define MAX_MAP_SIZE (256*1024)
#define IO_BUFFER_SIZE (4092)
+#define IOERR_GENERAL (1<<0) /* For backward compatibility, this must == 1 */
+#define IOERR_VANISHED (1<<1)
+
#define MAX_ARGS 1000
#define MPLEX_BASE 7
-/* 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 };
+#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
+
+#define FULL_FLUSH 1
+#define NORMAL_FLUSH 0
+
+
+/* Log-message categories. FLOG is only used on the daemon side to
+ * output messages to the log file. */
+enum logcode { FERROR=1, FINFO=2, FLOG=3 };
+
+/* Messages types that are sent over the message channel. The logcode
+ * values must all be present here with identical numbers. */
+enum msgcode {
+ MSG_DATA=0, /* raw data on the multiplexed stream */
+ MSG_ERROR=FERROR, MSG_INFO=FINFO, MSG_LOG=FLOG, /* remote logging */
+ MSG_REDO=4, /* reprocess indicated flist index */
+ MSG_DONE=5, /* current phase is done */
+};
#include "errcode.h"
#include "config.h"
-/* 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. */
+/* The default RSYNC_RSH is always set in config.h. */
#include <sys/types.h>
#include <stdlib.h>
#endif
+#if defined(HAVE_MALLOC_H) && (defined(HAVE_MALLINFO) || !defined(HAVE_STDLIB_H))
+#include <malloc.h>
+#endif
+
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
#include <string.h>
#endif
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
#ifdef TIME_WITH_SYS_TIME
#include <sys/time.h>
#include <time.h>
#endif
#endif
-#ifdef HAVE_FNMATCH
-#include <fnmatch.h>
-#else
-#include "lib/fnmatch.h"
-#endif
-
#ifdef HAVE_GLOB_H
#include <glob.h>
#endif
-#ifdef HAVE_MALLOC_H
-# include <malloc.h>
-#endif
-
/* these are needed for the uid/gid mapping code */
#include <pwd.h>
#include <grp.h>
#include <assert.h>
+#include "lib/pool_alloc.h"
#define BOOL int
#if HAVE_OFF64_T
#define int64 off64_t
-#define int64 unsigned off64_t
-#endif
#elif (SIZEOF_LONG == 8)
#define int64 long
-#define uint64 unsigned 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 (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
/* 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
#define IN_LOOPBACKNET 127
#endif
-struct file_struct {
- unsigned flags;
- time_t modtime;
- OFF_T length;
- mode_t mode;
+#define GID_NONE (gid_t) -1
+
+#define HL_CHECK_MASTER 0
+#define HL_SKIP 1
+
+struct hlink {
+ int hlindex;
+ struct file_struct *next;
+};
+struct idev {
INO64_T inode;
- /** Device this file lives upon */
DEV64_T dev;
+};
- /** If this is a device node, the device number. */
- DEV64_T rdev;
- uid_t uid;
- gid_t gid;
+#define F_DEV link_u.idev->dev
+#define F_INODE link_u.idev->inode
+
+#define F_HLINDEX link_u.links->hlindex
+#define F_NEXT link_u.links->next
+
+struct file_struct {
+ time_t modtime;
+ OFF_T length;
+ mode_t mode;
+ union {
+ DEV64_T rdev; /* The device number, if this is a device */
+ char *sum; /* Only a normal file can have a checksum */
+ char *link; /* Holds symlink string, if a symlink */
+ } u;
+ union {
+ struct idev *idev;
+ struct hlink *links;
+ } link_u;
char *basename;
char *dirname;
char *basedir;
- char *link;
- char *sum;
+ uid_t uid;
+ gid_t gid;
+ uchar flags; /* this item MUST remain last */
};
+/*
+ * Start the flist array at FLIST_START entries and grow it
+ * by doubling until FLIST_LINEAR then grow by FLIST_LINEAR
+ */
+#define FLIST_START (32 * 1024)
+#define FLIST_LINEAR (FLIST_START * 512)
+/*
+ * Extent size for allocation pools A minimum size of 128KB
+ * is needed to mmap them so that freeing will release the
+ * space to the OS.
+ *
+ * Larger sizes reduce leftover fragments and speed free calls
+ * (when they happen) Smaller sizes increase the chance of
+ * freed allocations freeing whole extents.
+ */
-#define ARENA_SIZE (32 * 1024)
+#define FILE_EXTENT (256 * 1024)
+#define HLINK_EXTENT (128 * 1024)
-struct string_area {
- char *base;
- char *end;
- char *current;
- struct string_area *next;
-};
+#define WITH_HLINK 1
+#define WITHOUT_HLINK 0
struct file_list {
int count;
int malloced;
+ alloc_pool_t file_pool;
+ alloc_pool_t hlink_pool;
struct file_struct **files;
- struct string_area *string_area;
};
struct sum_buf {
OFF_T offset; /**< offset in file of this chunk */
- int len; /**< length of chunk of file */
+ unsigned 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 */
+ unsigned int blength; /**< block_length */
+ unsigned int remainder; /**< flength % block_length */
+ int 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 (1<<0) /* pattern has '*', '[', and/or '?' */
+#define MATCHFLG_WILD2 (1<<1) /* pattern has '**' */
+#define MATCHFLG_WILD2_PREFIX (1<<2) /* pattern starts with '**' */
+#define MATCHFLG_ABS_PATH (1<<3) /* 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 {
int flist_size;
int num_files;
int num_transferred_files;
+ int current_file_index;
};
#include "byteorder.h"
#include "lib/mdfour.h"
+#include "lib/wildmatch.h"
#include "lib/permstring.h"
#include "lib/addrinfo.h"
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
#endif
+/* Convenient wrappers for malloc and realloc. Use them. */
+#define new(type) ((type *)malloc(sizeof(type)))
+#define new_array(type, num) ((type *)_new_array(sizeof(type), (num)))
+#define realloc_array(ptr, type, num) ((type *)_realloc_array((ptr), sizeof(type), (num)))
/* use magic gcc attributes to catch format errors */
void rprintf(enum logcode , 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);
#define exit_cleanup(code) _exit_cleanup(code, __FILE__, __LINE__)
+#ifdef HAVE_GETEUID
+#define MY_UID() geteuid()
+#else
+#define MY_UID() getuid()
+#endif
+
+#ifdef HAVE_GETEGID
+#define MY_GID() getegid()
+#else
+#define MY_GID() getgid()
+#endif
extern int verbose;
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff