===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rsync/extern.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- src/usr.bin/rsync/extern.h	2019/02/17 18:11:50	1.18
+++ src/usr.bin/rsync/extern.h	2019/02/18 21:34:54	1.19
@@ -1,4 +1,4 @@
-/*	$Id: extern.h,v 1.18 2019/02/17 18:11:50 deraadt Exp $ */
+/*	$Id: extern.h,v 1.19 2019/02/18 21:34:54 benno Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -23,6 +23,11 @@
 #define	RSYNC_PROTOCOL	(27)
 
 /*
+ * The default service (see services(5)) for rsync.
+ */
+#define RSYNC_SERVICE	"rsync"
+
+/*
  * Maximum amount of file data sent over the wire at once.
  */
 #define MAX_CHUNK	(32 * 1024)
@@ -135,11 +140,12 @@
 
 enum	blkstatst {
 	BLKSTAT_NONE = 0,
-	BLKSTAT_DATASZ,
+	BLKSTAT_NEXT,
 	BLKSTAT_DATA,
 	BLKSTAT_TOK,
 	BLKSTAT_HASH,
-	BLKSTAT_DONE
+	BLKSTAT_DONE,
+	BLKSTAT_PHASE,
 };
 
 /*
@@ -325,8 +331,8 @@
 void		  upload_free(struct upload *);
 
 struct blkset	 *blk_recv(struct sess *, int, const char *);
-int		  blk_recv_ack(struct sess *,
-			int, const struct blkset *, int32_t);
+void		  blk_recv_ack(struct sess *,
+			char [20], const struct blkset *, int32_t);
 void		  blk_match(struct sess *, const struct blkset *,
 			const char *, struct blkstat *);
 int		  blk_send(struct sess *, int, size_t,
@@ -346,7 +352,7 @@
 char		 *mkstempfifoat(int, char *);
 char		 *mkstempnodat(int, char *, mode_t, dev_t);
 char		 *mkstempsock(const char *, char *);
-int		  mktemplate(char **, const char *, int);
+int		  mktemplate(struct sess *, char **, const char *, int);
 
 char		 *symlink_read(struct sess *, const char *);
 char		 *symlinkat_read(struct sess *, int, const char *);