--- libaitsync/inc/defs.h	2010/03/24 16:00:15	1.1.1.1
+++ libaitsync/inc/defs.h	2012/11/13 13:53:14	1.3.2.3
@@ -3,23 +3,77 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: defs.h,v 1.1.1.1 2010/03/24 16:00:15 misho Exp $
+* $Id: defs.h,v 1.3.2.3 2012/11/13 13:53:14 misho Exp $
 *
-*************************************************************************/
+**************************************************************************
+The ELWIX and AITNET software is distributed under the following
+terms:
+
+All of the documentation and software included in the ELWIX and AITNET
+Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
+
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+	by Michael Pounov <misho@elwix.org>.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. All advertising materials mentioning features or use of this software
+   must display the following acknowledgement:
+This product includes software developed by Michael Pounov <misho@elwix.org>
+ELWIX - Embedded LightWeight unIX and its contributors.
+4. Neither the name of AITNET nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+*/
 #ifndef __DEFS_H
 #define __DEFS_H
 
 
+#ifndef STRSIZ
 #define STRSIZ		256
+#endif
+
+#define CHUNK_MAX	4096
+#define DLTSYNC_MAGIC	0xDEBAC0DA
+#define SIGSYNC_MAGIC	0xDEADBEEF
+
 #define TABLESIZ	(1 << 16)
 #define NULL_TAG	(-1)
 
 #define GETTAG2(s1, s2)	(((s1) + (s2)) & 0xFFFF)
 #define GETTAG(sum)	GETTAG2((sum) & 0xFFFF, (sum) >> 16)
 
-#define SETERR	syncSetErr(errno, strerror(errno));
+#define LOGERR		sync_SetErr(errno, strerror(errno))
 
 
+typedef struct tagSyncChunk {
+	u_int sc_magic;
+	u_long sc_id;
+	off_t sc_off;
+	size_t sc_len;
+	u_int sc_roll;
+	u_char sc_cksum[MD5_DIGEST_LENGTH];
+} sync_chunk_t;
+
+
 typedef struct tagSyncTag {
 	u_long st_id;
 	u_short st_tag;
@@ -32,7 +86,7 @@ struct tagPiece {
 };
 
 
-inline void syncSetErr(int eno, char *estr, ...);
+inline void sync_SetErr(int eno, char *estr, ...);