--- libaitsess/src/sess.c	2008/08/28 13:18:30	1.1.1.1
+++ libaitsess/src/sess.c	2010/09/01 20:24:20	1.1.1.1.2.4
@@ -1,8 +1,68 @@
+/*************************************************************************
+* (C) 2008 AITNET ltd - Sofia/Bulgaria - <misho@aitbg.com>
+*  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 $
+*
+*************************************************************************/
 #include "global.h"
 #include "aitsess.h"
 
 
 /*
+ * 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)
+{
+	register int i;
+	char **valz, *Shared = NULL;
+	char *peer, *p_brk;
+
+	if (!s || !ppsVals)
+		return -1;
+	valz = malloc(sizeof(caddr_t));
+	if (!valz) {
+		LOGERR;
+		return -1;
+	} else
+		memset(valz, 0, sizeof(caddr_t));
+
+	// allocated memory & mirrored shared memory into this
+	Shared = malloc(s->eom);
+	if (!Shared) {
+		LOGERR;
+		free(valz);
+		return -1;
+	} else
+		memcpy(Shared, s->addr, s->eom);
+
+	for (i = 0, peer = strtok_r(Shared, MEM_DELIM"\r\n", &p_brk); peer; 
+			peer = strtok_r(NULL, MEM_DELIM"\r\n", &p_brk)) {
+		if (!strchr(peer, '='))
+			continue;
+		else
+			i++;
+
+		valz = realloc(valz, (i + 1) * sizeof(caddr_t));
+		if (!valz) {
+			LOGERR;
+			free(Shared);
+			return -1;
+		} else
+			memset(valz[i], 0, sizeof(caddr_t));
+
+		valz[i - 1] = strdup(peer);
+	}
+
+	free(Shared);
+	return i;
+}
+
+/*
  * sess_GetValue() Get value from session shared memory from attribute
  * @s = Session item
  * @csAttr = Attribute for search
@@ -35,14 +95,14 @@ int sess_GetValue(tagSess * __restrict s, const char *
 	} else
 		memcpy(Shared, s->addr, s->eom);
 
-	for (i = 1, peer = strtok_r(Shared, ":\r\n", &p_brk); peer; 
-			i++, peer = strtok_r(NULL, ":\r\n", &p_brk)) {
+	for (i = 1, peer = strtok_r(Shared, MEM_DELIM"\r\n", &p_brk); peer; 
+			i++, peer = strtok_r(NULL, MEM_DELIM"\r\n", &p_brk)) {
 		attr = strtok_r(peer, "=\r\n", &a_brk);
 		if (attr && !strncmp(attr, csAttr, MAX_ATTRIBUTE)) {
 			val = strtok_r(NULL, "=\r\n", &a_brk);
 			if (val && strlen(val)) {
 				if (psVal)
-					strncpy(psVal, val, *pnLen);
+					strlcpy(psVal, val, *pnLen);
 				if (pnLen)
 					*pnLen = strlen(val);
 			} else
@@ -95,15 +155,15 @@ int sess_DelValue(tagSess * __restrict s, const char *
 		memcpy(Shared, s->addr, s->eom);
 	}
 
-	for (i = 1, peer = strtok_r(Shared, ":\r\n", &p_brk); peer; 
-			i++, peer = strtok_r(NULL, ":\r\n", &p_brk)) {
+	for (i = 1, peer = strtok_r(Shared, MEM_DELIM"\r\n", &p_brk); peer; 
+			i++, peer = strtok_r(NULL, MEM_DELIM"\r\n", &p_brk)) {
 		if (!strncmp(peer, csAttr, attrlen))
-			if (peer[attrlen] == '=' || peer[attrlen] == ':' || !peer[attrlen] ||
+			if (peer[attrlen] == '=' || peer[attrlen] == *MEM_DELIM || !peer[attrlen] ||
 					peer[attrlen] == '\r' || peer[attrlen] == '\n')
 				continue;
 
 		strcat(Buffer, peer);
-		strcat(Buffer, "\n");
+		strcat(Buffer, MEM_DELIM);
 	}
 
 	memset(s->addr, 0, s->eom);
@@ -157,34 +217,34 @@ int sess_SetValue(tagSess * __restrict s, const char *
 		memcpy(Shared, s->addr, s->eom);
 	}
 
-	for (i = 1, upd = 0, peer = strtok_r(Shared, ":\r\n", &p_brk); peer; 
-			i++, peer = strtok_r(NULL, ":\r\n", &p_brk)) {
+	for (i = 1, upd = 0, peer = strtok_r(Shared, MEM_DELIM"\r\n", &p_brk); peer; 
+			i++, peer = strtok_r(NULL, MEM_DELIM"\r\n", &p_brk)) {
 		if (!strncmp(peer, szAttr, strlen(szAttr))) {
 			upd++;
 			if (psVal) {
 				strcat(Buffer, szAttr);
 				strcat(Buffer, psVal);
-				strcat(Buffer, "\n");
+				strcat(Buffer, MEM_DELIM);
 			} else {
 				strcat(Buffer, csAttr);
-				strcat(Buffer, "\n");
+				strcat(Buffer, MEM_DELIM);
 				def = IS_DEF;
 			}
 			continue;
 		}
 
 		strcat(Buffer, peer);
-		strcat(Buffer, "\n");
+		strcat(Buffer, MEM_DELIM);
 	}
 
 	if (!upd) {
 		if (psVal) {
 			strcat(Buffer, szAttr);
 			strcat(Buffer, psVal);
-			strcat(Buffer, "\n");
+			strcat(Buffer, MEM_DELIM);
 		} else {
 			strcat(Buffer, csAttr);
-			strcat(Buffer, "\n");
+			strcat(Buffer, MEM_DELIM);
 			def = IS_DEF;
 		}
 		def |= IS_ADD;