Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed a race condition in rsync that opened a security hole. The
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
82ac323
..
deb20a2
100644
(file)
--- a/
rsync.h
+++ b/
rsync.h
@@
-21,6
+21,8
@@
#define RSYNC_RSH_ENV "RSYNC_RSH"
#define RSYNC_NAME "rsync"
#define RSYNC_RSH_ENV "RSYNC_RSH"
#define RSYNC_NAME "rsync"
+#define RSYNCD_CONF "/etc/rsyncd.conf"
+
#define BACKUP_SUFFIX "~"
/* a non-zero CHAR_OFFSET makes the rolling sum stronger, but is
#define BACKUP_SUFFIX "~"
/* a non-zero CHAR_OFFSET makes the rolling sum stronger, but is
@@
-39,19
+41,24
@@
#define SAME_TIME (1<<7)
/* update this if you make incompatible changes */
#define SAME_TIME (1<<7)
/* update this if you make incompatible changes */
-#define PROTOCOL_VERSION 1
7
+#define PROTOCOL_VERSION 1
9
#define MIN_PROTOCOL_VERSION 11
#define MAX_PROTOCOL_VERSION 30
#define MIN_PROTOCOL_VERSION 11
#define MAX_PROTOCOL_VERSION 30
+#define RSYNC_PORT 873
+
#define SPARSE_WRITE_SIZE (1024)
#define WRITE_SIZE (32*1024)
#define CHUNK_SIZE (32*1024)
#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 (4092)
+#define MAX_READ_BUFFER (1024*1024)
-#define
BLOCKING_TIMEOUT 1
0
+#define
MAX_ARGS 100
0
-#define FERROR stderr
-#define FINFO (am_server?stderr:stdout)
+#define MPLEX_BASE 7
+#define FERROR 1
+#define FINFO 2
#include "config.h"
#include "config.h"
@@
-66,6
+73,7
@@
#include <unistd.h>
#endif
#include <stdio.h>
#include <unistd.h>
#endif
#include <stdio.h>
+#include <stddef.h>
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
@@
-83,10
+91,6
@@
#include <string.h>
#endif
#include <string.h>
#endif
-#ifdef HAVE_COMPAT_H
-#include <compat.h>
-#endif
-
#ifdef HAVE_MALLOC_H
#include <malloc.h>
#endif
#ifdef HAVE_MALLOC_H
#include <malloc.h>
#endif
@@
-132,8
+136,9
@@
#endif
#include <errno.h>
#endif
#include <errno.h>
-#if
def HAVE_MMAP
+#if
defined(HAVE_MMAP) && defined(HAVE_MUNMAP)
#include <sys/mman.h>
#include <sys/mman.h>
+#define USE_MMAP 1
#endif
#ifdef HAVE_UTIME_H
#endif
#ifdef HAVE_UTIME_H
@@
-163,10
+168,41
@@
#include "lib/getopt.h"
#endif
#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>
/* these are needed for the uid/gid mapping code */
#include <pwd.h>
#include <grp.h>
+#include <stdarg.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <syslog.h>
+#include <sys/file.h>
+
+#if HAVE_DIRENT_H
+# include <dirent.h>
+#else
+# define dirent direct
+# if HAVE_SYS_NDIR_H
+# include <sys/ndir.h>
+# endif
+# if HAVE_SYS_DIR_H
+# include <sys/dir.h>
+# endif
+# if HAVE_NDIR_H
+# include <ndir.h>
+# endif
+#endif
+
+#ifdef HAVE_COMPAT_H
+#include <compat.h>
+#endif
+
+
#ifndef S_IFLNK
#define S_IFLNK 0120000
#endif
#ifndef S_IFLNK
#define S_IFLNK 0120000
#endif
@@
-175,10
+211,18
@@
#define S_ISLNK(mode) (((mode) & S_IFLNK) == S_IFLNK)
#endif
#define S_ISLNK(mode) (((mode) & S_IFLNK) == S_IFLNK)
#endif
+#define BOOL int
+
#ifndef uchar
#define uchar unsigned char
#endif
#ifndef uchar
#define uchar unsigned char
#endif
+#if HAVE_UNSIGNED_CHAR
+#define schar signed char
+#else
+#define schar char
+#endif
+
#ifndef int32
#if (SIZEOF_INT == 4)
#define int32 int
#ifndef int32
#if (SIZEOF_INT == 4)
#define int32 int
@@
-193,10
+237,25
@@
#define uint32 unsigned int32
#endif
#define uint32 unsigned int32
#endif
-#ifdef HAVE_LONGLONG
+#if HAVE_OFF64_T
+#define OFF_T off64_t
+#define STRUCT_STAT struct stat64
+#else
+#define OFF_T off_t
+#define STRUCT_STAT struct stat
+#endif
+
+#if HAVE_OFF64_T
+#define int64 off64_t
+#elif (SIZEOF_LONG == 8)
+#define int64 long
+#elif (SIZEOF_INT == 8)
+#define int64 int
+#elif HAVE_LONGLONG
#define int64 long long
#else
#define int64 off_t
#define int64 long long
#else
#define int64 off_t
+#define NO_INT64
#endif
#ifndef MIN
#endif
#ifndef MIN
@@
-215,10
+274,14
@@
#define MAXPATHLEN 1024
#endif
#define MAXPATHLEN 1024
#endif
+#ifndef INADDR_NONE
+#define INADDR_NONE 0xffffffff
+#endif
+
struct file_struct {
unsigned flags;
time_t modtime;
struct file_struct {
unsigned flags;
time_t modtime;
-
off_t
length;
+
OFF_T
length;
mode_t mode;
ino_t inode;
dev_t dev;
mode_t mode;
ino_t inode;
dev_t dev;
@@
-233,13
+296,13
@@
struct file_struct {
};
struct file_list {
};
struct file_list {
- int count;
- int malloced;
- struct file_struct **files;
+
int count;
+
int malloced;
+
struct file_struct **files;
};
struct sum_buf {
};
struct sum_buf {
-
off_t
offset; /* offset in file of this chunk */
+
OFF_T
offset; /* offset in file of this chunk */
int len; /* length of chunk of file */
int i; /* index of this chunk */
uint32 sum1; /* simple checksum */
int len; /* length of chunk of file */
int i; /* index of this chunk */
uint32 sum1; /* simple checksum */
@@
-247,7
+310,7
@@
struct sum_buf {
};
struct sum_struct {
};
struct sum_struct {
-
off_t
flength; /* total file length */
+
OFF_T
flength; /* total file length */
int count; /* how many chunks */
int remainder; /* flength % block_length */
int n; /* block_length */
int count; /* how many chunks */
int remainder; /* flength % block_length */
int n; /* block_length */
@@
-257,9
+320,31
@@
struct sum_struct {
struct map_struct {
char *map,*p;
int fd,p_size,p_len;
struct map_struct {
char *map,*p;
int fd,p_size,p_len;
- off_t size, p_offset;
+ OFF_T size, p_offset;
+};
+
+struct exclude_struct {
+ char *orig;
+ char *pattern;
+ int regular_exp;
+ int include;
+ int directory;
+ int local;
};
};
+struct stats {
+ int64 total_size;
+ int64 total_transferred_size;
+ int64 total_written;
+ int64 total_read;
+ int64 literal_data;
+ int64 matched_data;
+ int flist_size;
+ int num_files;
+ int num_transferred_files;
+};
+
+
/* we need this function because of the silly way in which duplicate
entries are handled in the file lists - we can't change this
without breaking existing versions */
/* we need this function because of the silly way in which duplicate
entries are handled in the file lists - we can't change this
without breaking existing versions */
@@
-269,7
+354,6
@@
static inline int flist_up(struct file_list *flist, int i)
return i;
}
return i;
}
-
#include "byteorder.h"
#include "version.h"
#include "proto.h"
#include "byteorder.h"
#include "version.h"
#include "proto.h"
@@
-285,33
+369,10
@@
extern char *sys_errlist[];
# define strrchr rindex
#endif
# define strrchr rindex
#endif
-#if HAVE_DIRENT_H
-# include <dirent.h>
-#else
-# define dirent direct
-# if HAVE_SYS_NDIR_H
-# include <sys/ndir.h>
-# endif
-# if HAVE_SYS_DIR_H
-# include <sys/dir.h>
-# endif
-# if HAVE_NDIR_H
-# include <ndir.h>
-# endif
-#endif
-
#ifndef HAVE_ERRNO_DECL
extern int errno;
#endif
#ifndef HAVE_ERRNO_DECL
extern int errno;
#endif
-#ifndef HAVE_BCOPY
-#define bcopy(src,dest,n) memcpy(dest,src,n)
-#endif
-
-#ifndef HAVE_BZERO
-#define bzero(buf,n) memset(buf,0,n)
-#endif
-
#define SUPPORT_LINKS HAVE_READLINK
#define SUPPORT_HARD_LINKS HAVE_LINK
#define SUPPORT_LINKS HAVE_READLINK
#define SUPPORT_HARD_LINKS HAVE_LINK
@@
-376,3
+437,6
@@
extern int errno;
#define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode) || S_ISSOCK(mode) || S_ISFIFO(mode))
#define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode) || S_ISSOCK(mode) || S_ISFIFO(mode))
+#ifndef ACCESSPERMS
+#define ACCESSPERMS 0777
+#endif