--- libaitsess/src/sess.c	2010/09/01 20:24:20	1.1.1.1.2.4
+++ libaitsess/src/sess.c	2011/09/07 13:11:56	1.3
@@ -3,20 +3,78 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: sess.c,v 1.1.1.1.2.4 2010/09/01 20:24:20 misho Exp $
+* $Id: sess.c,v 1.3 2011/09/07 13:11:56 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
+	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.
+*/
 #include "global.h"
 #include "aitsess.h"
 
 
 /*
+ * sess_FreeValues() Free all values from value array allocated from sess_GetValues()
+ * @ppsVals = Array strings
+ * return: none
+*/
+inline void
+sess_FreeValues(char *** __restrict ppsVals)
+{
+	char **ptr;
+
+	assert(ppsVals);
+	if (!ppsVals)
+		return;
+
+	for (ptr = *ppsVals; *ptr; ptr++)
+		free(*ptr);
+	free(*ppsVals);
+	*ppsVals = NULL;
+}
+
+/*
  * sess_GetValues() Get all values from session shared memory
  * @s = Session item
  * @ppsVals = Return array strings
  * return: -1 error: in parameter, !=-1 count of returned strings in ppsVals (must be free after use!)
 */
-int sess_GetValues(tagSess * __restrict s, char ***ppsVals)
+int
+sess_GetValues(tagSess * __restrict s, char ***ppsVals)
 {
 	register int i;
 	char **valz, *Shared = NULL;
@@ -29,7 +87,7 @@ int sess_GetValues(tagSess * __restrict s, char ***pps
 		LOGERR;
 		return -1;
 	} else
-		memset(valz, 0, sizeof(caddr_t));
+		*valz = NULL;
 
 	// allocated memory & mirrored shared memory into this
 	Shared = malloc(s->eom);
@@ -53,12 +111,13 @@ int sess_GetValues(tagSess * __restrict s, char ***pps
 			free(Shared);
 			return -1;
 		} else
-			memset(valz[i], 0, sizeof(caddr_t));
+			valz[i] = NULL;
 
 		valz[i - 1] = strdup(peer);
 	}
 
 	free(Shared);
+	*ppsVals = valz;
 	return i;
 }
 
@@ -71,7 +130,8 @@ int sess_GetValues(tagSess * __restrict s, char ***pps
 	// *{pnLen} input is max_size of buffer & output is really taken bytes
  * return: 0 not found, -1 error: in parameter, >0 get position, if define item merged with IS_DEF
 */
-int sess_GetValue(tagSess * __restrict s, const char *csAttr, char *psVal, int *pnLen)
+int
+sess_GetValue(tagSess * __restrict s, const char *csAttr, char *psVal, int *pnLen)
 {
 	register int i;
 	int def = IS_VAL;
@@ -123,7 +183,8 @@ int sess_GetValue(tagSess * __restrict s, const char *
  * @csAttr = Attribute for erasing
  * return: 0 Ok, -1 error: in parameter
 */
-int sess_DelValue(tagSess * __restrict s, const char *csAttr)
+int
+sess_DelValue(tagSess * __restrict s, const char *csAttr)
 {
 	register int i;
 	int ret, attrlen;
@@ -186,7 +247,8 @@ int sess_DelValue(tagSess * __restrict s, const char *
  * return: 0 nothing, -1 error: in parameter, 
  	>0 set position, if add item merged with IS_ADD and if define item merged with IS_DEF
 */
-int sess_SetValue(tagSess * __restrict s, const char *csAttr, const char *psVal)
+int
+sess_SetValue(tagSess * __restrict s, const char *csAttr, const char *psVal)
 {
 	register int i;
 	int upd, ret, def = IS_VAL;