X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a5f9cff25633e7839f173b889a4782297054cbd7..2b284ee33d97c4414c49c45720a3566a58a93a18:/rsync.h

diff --git a/rsync.h b/rsync.h
index d46fbb74..ef8e3b4d 100644
--- a/rsync.h
+++ b/rsync.h
@@ -27,7 +27,7 @@
 #define RSYNC_RSH_IO_ENV "RSYNC_RSH_IO"
 
 #define RSYNC_NAME "rsync"
-#define RSYNCD_SYSCONF "/etc/rsyncd.conf"
+/* RSYNCD_SYSCONF is now set in config.h */
 #define RSYNCD_USERCONF "rsyncd.conf"
 
 #define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
@@ -58,6 +58,7 @@
 
 #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
@@ -79,8 +80,8 @@
  * 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
@@ -111,6 +112,7 @@
 #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 };
@@ -250,6 +252,7 @@ enum msgcode {
 
 #include <assert.h>
 
+#include "lib/pool_alloc.h"
 
 #define BOOL int
 
@@ -404,40 +407,54 @@ struct idev {
 #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;
-	uchar 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 {
@@ -576,6 +593,10 @@ extern int errno;
 #define STDERR_FILENO 2
 #endif
 
+#ifndef S_IRUSR
+#define S_IRUSR 0400
+#endif
+
 #ifndef S_IWUSR
 #define S_IWUSR 0200
 #endif
@@ -708,6 +729,17 @@ size_t strlcat(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;