incompatible with older versions :-( */
#define CHAR_OFFSET 0
-/* These flags are used during the flist transfer. */
-
-#define FLAG_DELETE (1<<0)
-#define SAME_MODE (1<<1)
-#define EXTENDED_FLAGS (1<<2)
-#define SAME_RDEV_pre28 EXTENDED_FLAGS /* Only use in protocols < 28 */
-#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 SAME_HIGH_RDEV (1<<8)
-#define HAS_INODE_DATA (1<<9)
-#define SAME_DEV (1<<10)
-
-/* What flags above are relevant after the transfer of the flist? */
-#define LIVE_FLAGS FLAG_DELETE
-
-/* These flist flags can be set after the flist is transferred. */
-
-/*#define FLAG_DELETE (1<<0) -- from the above list */
-#define FLAG_HLINK_EOL (1<<1)
+/* These flags are only used during the flist transfer. */
+
+#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 28
* 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 MIN_PROTOCOL_VERSION 20
+#define OLD_PROTOCOL_VERSION 25
#define MAX_PROTOCOL_VERSION 40
#define RSYNC_PORT 873
#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 };
#include <assert.h>
+#include "lib/pool_alloc.h"
#define BOOL int
#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;
+ OFF_T length;
+ char *basename;
+ char *dirname;
+ char *basedir;
union {
struct idev *idev;
struct hlink *links;
} link_u;
- char *basename;
- char *dirname;
- char *basedir;
+ time_t modtime;
uid_t uid;
gid_t gid;
- unsigned short flags;
+ mode_t mode;
+ uchar flags; /* this item MUST remain last */
};
-#define ARENA_SIZE (32 * 1024)
+/*
+ * 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 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 {
#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;