--- libaitsess/src/sess.c 2011/09/07 13:11:56 1.3 +++ libaitsess/src/sess.c 2011/11/03 15:36:03 1.3.2.7 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: sess.c,v 1.3 2011/09/07 13:11:56 misho Exp $ +* $Id: sess.c,v 1.3.2.7 2011/11/03 15:36:03 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -158,7 +158,7 @@ sess_GetValue(tagSess * __restrict s, const char *csAt 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)) { + if (attr && !strncmp(attr, csAttr, MAX_ATTRIBUTE - 1)) { val = strtok_r(NULL, "=\r\n", &a_brk); if (val && strlen(val)) { if (psVal) @@ -188,7 +188,7 @@ sess_DelValue(tagSess * __restrict s, const char *csAt { register int i; int ret, attrlen; - char *Buffer, *Shared, szAttr[MAX_ATTRIBUTE + 1]; + char *Buffer, *Shared, szAttr[MAX_ATTRIBUTE]; char *peer, *p_brk; if (!s || !csAttr || !*csAttr) @@ -196,9 +196,8 @@ sess_DelValue(tagSess * __restrict s, const char *csAt else attrlen = strlen(csAttr); Buffer = Shared = NULL; - memset(szAttr, 0, MAX_ATTRIBUTE + 1); - strncpy(szAttr, csAttr, MAX_ATTRIBUTE - 1); - strcat(szAttr, "="); + strlcpy(szAttr, csAttr, sizeof szAttr); + strlcat(szAttr, "=", sizeof szAttr); Buffer = malloc(s->eom); if (!Buffer) { @@ -223,11 +222,10 @@ sess_DelValue(tagSess * __restrict s, const char *csAt peer[attrlen] == '\r' || peer[attrlen] == '\n') continue; - strcat(Buffer, peer); - strcat(Buffer, MEM_DELIM); + strlcat(Buffer, peer, s->eom); + strlcat(Buffer, MEM_DELIM, s->eom); } - memset(s->addr, 0, s->eom); memcpy(s->addr, Buffer, s->eom); if (s->type == SHARED_MAP) @@ -252,16 +250,15 @@ sess_SetValue(tagSess * __restrict s, const char *csAt { register int i; int upd, ret, def = IS_VAL; - char *Buffer, *Shared, szAttr[MAX_ATTRIBUTE + 1]; + char *Buffer, *Shared, szAttr[MAX_ATTRIBUTE]; char *peer, *p_brk; if (!s || !csAttr || !*csAttr) return -1; else Buffer = Shared = NULL; - memset(szAttr, 0, MAX_ATTRIBUTE + 1); - strncpy(szAttr, csAttr, MAX_ATTRIBUTE - 1); - strcat(szAttr, "="); + strlcpy(szAttr, csAttr, sizeof szAttr); + strlcat(szAttr, "=", sizeof szAttr); Buffer = malloc(s->eom); if (!Buffer) { @@ -284,35 +281,34 @@ sess_SetValue(tagSess * __restrict s, const char *csAt if (!strncmp(peer, szAttr, strlen(szAttr))) { upd++; if (psVal) { - strcat(Buffer, szAttr); - strcat(Buffer, psVal); - strcat(Buffer, MEM_DELIM); + strlcat(Buffer, szAttr, s->eom); + strlcat(Buffer, psVal, s->eom); + strlcat(Buffer, MEM_DELIM, s->eom); } else { - strcat(Buffer, csAttr); - strcat(Buffer, MEM_DELIM); + strlcat(Buffer, csAttr, s->eom); + strlcat(Buffer, MEM_DELIM, s->eom); def = IS_DEF; } continue; } - strcat(Buffer, peer); - strcat(Buffer, MEM_DELIM); + strlcat(Buffer, peer, s->eom); + strlcat(Buffer, MEM_DELIM, s->eom); } if (!upd) { if (psVal) { - strcat(Buffer, szAttr); - strcat(Buffer, psVal); - strcat(Buffer, MEM_DELIM); + strlcat(Buffer, szAttr, s->eom); + strlcat(Buffer, psVal, s->eom); + strlcat(Buffer, MEM_DELIM, s->eom); } else { - strcat(Buffer, csAttr); - strcat(Buffer, MEM_DELIM); + strlcat(Buffer, csAttr, s->eom); + strlcat(Buffer, MEM_DELIM, s->eom); def = IS_DEF; } def |= IS_ADD; } - memset(s->addr, 0, s->eom); memcpy(s->addr, Buffer, s->eom); if (s->type == SHARED_MAP) @@ -322,4 +318,111 @@ sess_SetValue(tagSess * __restrict s, const char *csAt free(Shared); free(Buffer); return upd | def; +} + + +/* + * sess_prepareSession() Attach to shared memory and de-marshaling data + * @s = Session + * @useDirect = Use direct shared memory if !=0 or snapshot of data to array + * return: NULL error or no data, !=NULL array with variables, + * after use must free resources with sess_doneSession() + */ +array_t * +sess_prepareSession(tagSess * __restrict s, u_char useDirect) +{ + array_t *arr = NULL; + sess_hdr_t *hdr; + int ret; + + assert(s); + if (!s) { + sess_SetErr(EINVAL, "Error:: invalid argument\n"); + return NULL; + } + if (s->addr) { + sess_SetErr(EINVAL, "Error:: already attached memory\n"); + return NULL; + } + + ATTACH_MEMORY(s); + if (!s->addr) + return NULL; + else + hdr = (sess_hdr_t*) s->addr; + if (hdr->hdr_magic != SESS_AIT_MAGIC) { + DETACH_MEMORY(s); + + sess_SetErr(EINVAL, "Error:: shared memory not contains values with proper format\n"); + return NULL; + } + + DEC_SEMAPHORE(s, ret); + s->zcopy = useDirect; + arr = io_map2vars(s->addr + sizeof(sess_hdr_t), s->eom - sizeof(sess_hdr_t), + hdr->hdr_argc, useDirect); + ADD_SEMAPHORE(s, ret); + + if (!s->zcopy) + DETACH_MEMORY(s); + return arr; +} + +/* + * sess_doneSession() Free resources allocated with sess_prepareSession() + * @s = Session + * @arr = Array with variables for free + * return: none + */ +void +sess_doneSession(tagSess * __restrict s, array_t ** __restrict arr) +{ + assert(s); + if (!s) { + sess_SetErr(EINVAL, "Error:: invalid argument\n"); + return; + } + + if (!s->zcopy) + io_arrayFree(*arr); + else + DETACH_MEMORY(s); + io_arrayDestroy(arr); +} + +/* + * sess_commitSession() Commit data to shared memory + * @s = Session + * @arr = Array with variables for save + * return -1 error or !=-1 size of stored variables into shared memory + */ +int +sess_commitSession(tagSess * __restrict s, array_t * __restrict arr) +{ + sess_hdr_t *hdr; + int rs, ret = 0; + + assert(s && arr); + if (!s || !arr) { + sess_SetErr(EINVAL, "Error:: invalid argument\n"); + return -1; + } + + ATTACH_MEMORY(s); + if (!s->addr) { + DETACH_MEMORY(s); + return -1; + } else + hdr = (sess_hdr_t*) s->addr; + + DEC_SEMAPHORE(s, rs); + if ((ret = io_vars2map(s->addr + sizeof(sess_hdr_t), s->eom - sizeof(sess_hdr_t), arr)) != -1) { + hdr->hdr_magic = SESS_AIT_MAGIC; + hdr->hdr_argc = io_arraySize(arr); + ret += sizeof(sess_hdr_t); + } + ADD_SEMAPHORE(s, rs); + + DETACH_MEMORY(s); + return ret; }