--- libelwix/inc/elwix/avar.h	2015/06/25 17:53:49	1.9
+++ libelwix/inc/elwix/avar.h	2019/08/16 15:23:33	1.10.42.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: avar.h,v 1.9 2015/06/25 17:53:49 misho Exp $
+* $Id: avar.h,v 1.10.42.1 2019/08/16 15:23:33 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 - 2015
+Copyright 2004 - 2019
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -57,7 +57,7 @@ typedef enum {
 	i8, i16, i32, i64,		/* integers ... */
 } ait_type_t;
 
-typedef struct {
+typedef struct __packed {
 	uint8_t		val_type;
 	union {
 		struct {
@@ -93,7 +93,7 @@ typedef struct {
 		int64_t		i64;
 	} val;
 	uint8_t		val_data[0];
-} __packed ait_val_t;	/* sizeof 16 bytes */
+} /*__packed*/ ait_val_t;	/* sizeof 16 bytes */
 
 #define AIT_TYPE(_vl)			((ait_type_t) (_vl)->val_type)
 #define AIT_LEN(_vl)			(_vl)->val_len
@@ -304,6 +304,10 @@ typedef struct {
 								AIT_SET_STR((_vl), \
 										AIT_GET_STR((_v))); \
 								break; \
+							case data: \
+								AIT_SET_DATA((_vl), \
+										AIT_GET_DATA((_v)), \
+								break; \
 							default: \
 								break; \
 						} \
@@ -331,19 +335,23 @@ typedef struct {
 								if (!__val->val_in && \
 										__val->val.buffer) \
 									e_free(__val->val.buffer); \
-								__val->val.buffer = NULL; \
 								break; \
 							case string: \
 								if (!__val->val_in && \
 										__val->val.string) \
 									e_free(__val->val.string); \
-								__val->val.string = NULL; \
 								break; \
+							case data: \
+								if (!__val->val_in) \
+									memset(__val->val_data, 0, \
+											AIT_LEN(__val)); \
+								break; \
 							default: \
 								break; \
 						} \
 						__val->val_type = empty; \
 						__val->val_opt ^= __val->val_opt; \
+						__val->val.net ^= __val->val.net; \
 						AIT_LEN(__val) = 0; \
 						AIT_KEY(__val) = 0; \
 					} while (0)