X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/3591c0660c52cec9fa06e7539b56604a7499fa10..bb0f7089fea7318a48b0fc3a4b052330a9fabcc3:/rsync.h

diff --git a/rsync.h b/rsync.h
index 62c03467..7e2967b7 100644
--- a/rsync.h
+++ b/rsync.h
@@ -22,7 +22,6 @@
 
 #define RSYNC_NAME "rsync"
 #define RSYNCD_CONF "/etc/rsyncd.conf"
-#define RSYNCD_LOG "/var/adm/rsyncd.log"
 
 #define BACKUP_SUFFIX "~"
 
@@ -42,7 +41,7 @@
 #define SAME_TIME (1<<7)
 
 /* update this if you make incompatible changes */
-#define PROTOCOL_VERSION 17
+#define PROTOCOL_VERSION 18
 #define MIN_PROTOCOL_VERSION 11
 #define MAX_PROTOCOL_VERSION 30
 
@@ -51,12 +50,15 @@
 #define SPARSE_WRITE_SIZE (1024)
 #define WRITE_SIZE (32*1024)
 #define CHUNK_SIZE (32*1024)
-#define MAX_MAP_SIZE (4*1024*1024)
+#define MAX_MAP_SIZE (1*1024*1024)
+#define IO_BUFFER_SIZE (4096)
+#define MAX_READ_BUFFER (1024*1024)
 
-#define MAX_ARGS 100
+#define MAX_ARGS 1000
 
 #define BLOCKING_TIMEOUT 10
 
+#define MPLEX_BASE 7
 #define FERROR 1
 #define FINFO 2
 
@@ -140,8 +142,9 @@
 #endif
 #include <errno.h>
 
-#ifdef HAVE_MMAP
+#if defined(HAVE_MMAP) && defined(HAVE_MUNMAP)
 #include <sys/mman.h>
+#define USE_MMAP 1
 #endif
 
 #ifdef HAVE_UTIME_H
@@ -171,6 +174,10 @@
 #include "lib/getopt.h"
 #endif
 
+#ifdef HAVE_GLOB
+#include <glob.h>
+#endif
+
 /* these are needed for the uid/gid mapping code */
 #include <pwd.h>
 #include <grp.h>
@@ -179,6 +186,8 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
+#include <syslog.h>
+#include <sys/file.h>
 
 #ifndef S_IFLNK
 #define S_IFLNK  0120000
@@ -251,6 +260,10 @@
 #define MAXPATHLEN 1024
 #endif
 
+#ifndef INADDR_NONE
+#define INADDR_NONE 0xffffffff
+#endif
+
 struct file_struct {
 	unsigned flags;
 	time_t modtime;