--- libaitsess/inc/defs.h	2011/04/30 22:02:59	1.2.2.1
+++ libaitsess/inc/defs.h	2012/02/28 13:00:24	1.5
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: defs.h,v 1.2.2.1 2011/04/30 22:02:59 misho Exp $
+* $Id: defs.h,v 1.5 2012/02/28 13:00:24 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ 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
+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
@@ -46,15 +46,39 @@ SUCH DAMAGE.
 #ifndef __DEFS_H
 #define __DEFS_H
 
-#define MAX_STR		255
+#define STRSIZ		256
 
+#define SESS_AIT_MAGIC	0x3CC3
+
 #define MEM_MODE	0640
-#define MEM_DELIM	":"
+#define MEM_DELIM	"\xFF"
 
+#define MEM_MAGIC_START	0xAAAAAAAA
+#define MEM_MAGIC_STOP	0x55555555
+#define MEM_ALLOC_MAX	0xFFFFFFF3
+
+/* memory pool helper macros */
+
+#define MEM_MIN_BUCKET	4
+#define MEM_MAX_BUCKET	32
+
+#define MEM_PTR2LINT(x)	((u_int) ((uintptr_t)(x)) & 0xFFFFFFFF)
+#define MEM_PTR2HINT(x)	((u_int) (sizeof(uintptr_t) == sizeof(u_int)) ? 0 : \
+				(((uintptr_t)(x)) >> 32) & 0xFFFFFFFF)
+#define MEM_INT2PTR(x)	((void*) ((uintptr_t)(x)))
+
+#define MEM_BADADDR(x)	(MEM_PTR2LINT(x) < 0x00001000U || MEM_PTR2LINT(x) > 0xFFFFF000U)
+#define MEM_CORRUPT(x)	(!(x) || ((u_int*)(x))[-1] != MEM_MAGIC_START || \
+				((u_int*)(x))[((u_int*)(x))[-2]] != MEM_MAGIC_STOP)
+
+#define mem_data(x, _type)	(assert((x)), (_type) ((x)->alloc_mem ? ((x)->alloc_mem + 2) : NULL))
+#define mem_len(x)		(assert((x)), (x)->alloc_mem ? *(x)->alloc_mem : 0)
+#define mem_size(x)		(mem_len((x)) * sizeof(u_int))
+
+
 #define LOGERR	{ \
-			sessErrno = errno; \
-			bzero(sessError, MAX_STR + 1); \
-			strncpy(sessError, strerror(errno), MAX_STR); \
+			sess_Errno = errno; \
+			strlcpy(sess_Error, strerror(errno), sizeof sess_Error); \
 		}
 
 /*
@@ -72,9 +96,14 @@ union semun {
 };
 #endif
 
+typedef struct _tagSessHdr {
+	uint16_t	hdr_magic;
+	uint16_t	hdr_argc;
+} sess_hdr_t;
 
-extern int sessErrno;
-extern char sessError[];
+
+extern int sess_Errno;
+extern char sess_Error[STRSIZ];
 
 
 #endif