X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/1c3344a105f656a45f6b46e1710c3fc4ab862a9a..16edf86595a5a990a942fa045dfb523dae1fe6cb:/rsync.h

diff --git a/rsync.h b/rsync.h
index 1d2441a8..6b25e6c2 100644
--- a/rsync.h
+++ b/rsync.h
@@ -42,20 +42,20 @@
 
 #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 /* protocols < 28 */
+#define XMIT_SAME_RDEV_pre28 (1<<2)	/* protocols 20 - 27  */
+#define XMIT_EXTENDED_FLAGS (1<<2)	/* protocols 28 - NOW */
 #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_RDEV_MAJOR (1<<8)
-#define XMIT_HLINKED (1<<9)
-#define XMIT_SAME_DEV_pre30 (1<<10)	/* protocols < 30 */
-#define XMIT_HLINK_FIRST (1<<10)	/* protocols >= 30 */
-#define XMIT_RDEV_MINOR_IS_SMALL (1<<11)
-#define XMIT_USER_NAME_FOLLOWS (1<<12)	/* protocols >= 30 */
-#define XMIT_GROUP_NAME_FOLLOWS (1<<13) /* protocols >= 30 */
+#define XMIT_SAME_RDEV_MAJOR (1<<8)	/* protocols 28 - NOW */
+#define XMIT_HLINKED (1<<9)		/* protocols 28 - NOW */
+#define XMIT_SAME_DEV_pre30 (1<<10)	/* protocols 28 - 29  */
+#define XMIT_USER_NAME_FOLLOWS (1<<10)	/* protocols 30 - NOW */
+#define XMIT_RDEV_MINOR_8_pre30 (1<<11)	/* protocols 28 - 29  */
+#define XMIT_GROUP_NAME_FOLLOWS (1<<11) /* protocols 30 - NOW */
+#define XMIT_HLINK_FIRST (1<<12)	/* protocols 30 - NOW */
 
 /* These flags are used in the live flist data. */
 
@@ -517,8 +517,6 @@ struct idev_node {
 #define MAXHOSTNAMELEN 256
 #endif
 
-/* the length of the md4 checksum */
-#define MD4_SUM_LENGTH 16
 #define SUM_LENGTH 16
 #define SHORT_SUM_LENGTH 2
 #define BLOCKSUM_BIAS 10
@@ -571,11 +569,12 @@ extern int file_extra_cnt;
 extern int preserve_uid;
 extern int preserve_gid;
 extern int preserve_acls;
+extern int preserve_xattrs;
 
 #define FILE_STRUCT_LEN (offsetof(struct file_struct, basename))
 #define EXTRA_LEN (sizeof (union file_extras))
 #define PTR_EXTRA_LEN ((sizeof (char *) + EXTRA_LEN - 1) / EXTRA_LEN)
-#define SUM_EXTRA_CNT ((MD4_SUM_LENGTH + EXTRA_LEN - 1) / EXTRA_LEN)
+#define SUM_EXTRA_CNT ((MAX_DIGEST_LEN + EXTRA_LEN - 1) / EXTRA_LEN)
 
 #define REQ_EXTRA(f,ndx) ((union file_extras*)(f) - (ndx))
 #define OPT_EXTRA(f,bump) ((union file_extras*)(f) - file_extra_cnt - 1 - (bump))
@@ -603,7 +602,8 @@ extern int preserve_acls;
 /* When the associated option is on, all entries will have these present: */
 #define F_OWNER(f) REQ_EXTRA(f, preserve_uid)->unum
 #define F_GROUP(f) REQ_EXTRA(f, preserve_gid)->unum
-#define F_ACL(f) REQ_EXTRA(f, preserve_acls)->unum
+#define F_ACL(f) REQ_EXTRA(f, preserve_acls)->num
+#define F_XATTR(f) REQ_EXTRA(f, preserve_xattrs)->num
 
 /* These items are per-entry optional and mutally exclusive: */
 #define F_HL_GNUM(f) OPT_EXTRA(f, LEN64_BUMP(f))->num
@@ -772,7 +772,7 @@ typedef struct {
 	(type*)expand_item_list(lp, sizeof (type), #type, incr)
 
 #include "byteorder.h"
-#include "lib/mdfour.h"
+#include "lib/mdigest.h"
 #include "lib/wildmatch.h"
 #include "lib/permstring.h"
 #include "lib/addrinfo.h"
@@ -795,9 +795,13 @@ typedef struct {
     struct rsync_acl *acc_acl; /* access ACL */
     struct rsync_acl *def_acl; /* default ACL */
 #endif
+#ifdef SUPPORT_XATTRS
+    item_list *xattr;
+#endif
 } statx;
 
 #define ACL_READY(sx) ((sx).acc_acl != NULL)
+#define XATTR_READY(sx) ((sx).xattr != NULL)
 
 #include "proto.h"
 
@@ -1005,7 +1009,7 @@ size_t strlcat(char *d, const char *s, size_t bufsize);
 #define MY_GID() getgid()
 #endif
 
-extern int verbose, protocol_version;
+extern int verbose;
 
 #ifndef HAVE_INET_NTOP
 const char *inet_ntop(int af, const void *src, char *dst, size_t size);
@@ -1019,23 +1023,6 @@ int inet_pton(int af, const char *src, void *dst);
 const char *get_panic_action(void);
 #endif
 
-static inline int32
-read_abbrevint30(int f)
-{
-	if (protocol_version < 30)
-		return read_int(f);
-	return read_abbrevint(f);
-}
-
-static inline void
-write_abbrevint30(int f, int32 x)
-{
-	if (protocol_version < 30)
-		write_int(f, x);
-	else
-		write_abbrevint(f, x);
-}
-
 static inline int
 isDigit(const char *ptr)
 {