--- libaitsess/src/sess.c 2008/08/28 13:18:30 1.1.1.1 +++ libaitsess/src/sess.c 2011/04/30 22:02:59 1.2.2.1 @@ -1,8 +1,121 @@ +/************************************************************************* +* (C) 2008 AITNET ltd - Sofia/Bulgaria - +* by Michael Pounov +* +* $Author: misho $ +* $Id: sess.c,v 1.2.2.1 2011/04/30 22:02:59 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 + +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + by Michael Pounov . 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 +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; + + 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) +{ + 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 + *valz = NULL; + + // 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 + valz[i] = NULL; + + valz[i - 1] = strdup(peer); + } + + free(Shared); + *ppsVals = valz; + return i; +} + +/* * sess_GetValue() Get value from session shared memory from attribute * @s = Session item * @csAttr = Attribute for search @@ -35,14 +148,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 +208,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 +270,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;