version 1.3.2.1, 2011/09/07 15:52:35
|
version 1.3.2.3, 2011/09/07 21:06:56
|
Line 158 sess_GetValue(tagSess * __restrict s, const char *csAt
|
Line 158 sess_GetValue(tagSess * __restrict s, const char *csAt
|
for (i = 1, peer = strtok_r(Shared, MEM_DELIM"\r\n", &p_brk); peer; |
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)) { |
i++, peer = strtok_r(NULL, MEM_DELIM"\r\n", &p_brk)) { |
attr = strtok_r(peer, "=\r\n", &a_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); |
val = strtok_r(NULL, "=\r\n", &a_brk); |
if (val && strlen(val)) { |
if (val && strlen(val)) { |
if (psVal) |
if (psVal) |
Line 188 sess_DelValue(tagSess * __restrict s, const char *csAt
|
Line 188 sess_DelValue(tagSess * __restrict s, const char *csAt
|
{ |
{ |
register int i; |
register int i; |
int ret, attrlen; |
int ret, attrlen; |
char *Buffer, *Shared, szAttr[MAX_ATTRIBUTE + 1]; | char *Buffer, *Shared, szAttr[MAX_ATTRIBUTE]; |
char *peer, *p_brk; |
char *peer, *p_brk; |
|
|
if (!s || !csAttr || !*csAttr) |
if (!s || !csAttr || !*csAttr) |
Line 196 sess_DelValue(tagSess * __restrict s, const char *csAt
|
Line 196 sess_DelValue(tagSess * __restrict s, const char *csAt
|
else |
else |
attrlen = strlen(csAttr); |
attrlen = strlen(csAttr); |
Buffer = Shared = NULL; |
Buffer = Shared = NULL; |
memset(szAttr, 0, MAX_ATTRIBUTE + 1); | strlcpy(szAttr, csAttr, sizeof szAttr); |
strncpy(szAttr, csAttr, MAX_ATTRIBUTE - 1); | strlcat(szAttr, "=", sizeof szAttr); |
strcat(szAttr, "="); | |
|
|
Buffer = malloc(s->eom); |
Buffer = malloc(s->eom); |
if (!Buffer) { |
if (!Buffer) { |
Line 223 sess_DelValue(tagSess * __restrict s, const char *csAt
|
Line 222 sess_DelValue(tagSess * __restrict s, const char *csAt
|
peer[attrlen] == '\r' || peer[attrlen] == '\n') |
peer[attrlen] == '\r' || peer[attrlen] == '\n') |
continue; |
continue; |
|
|
strcat(Buffer, peer); | strlcat(Buffer, peer, s->eom); |
strcat(Buffer, MEM_DELIM); | strlcat(Buffer, MEM_DELIM, s->eom); |
} |
} |
|
|
memset(s->addr, 0, s->eom); |
|
memcpy(s->addr, Buffer, s->eom); |
memcpy(s->addr, Buffer, s->eom); |
|
|
if (s->type == SHARED_MAP) |
if (s->type == SHARED_MAP) |
Line 252 sess_SetValue(tagSess * __restrict s, const char *csAt
|
Line 250 sess_SetValue(tagSess * __restrict s, const char *csAt
|
{ |
{ |
register int i; |
register int i; |
int upd, ret, def = IS_VAL; |
int upd, ret, def = IS_VAL; |
char *Buffer, *Shared, szAttr[MAX_ATTRIBUTE + 1]; | char *Buffer, *Shared, szAttr[MAX_ATTRIBUTE]; |
char *peer, *p_brk; |
char *peer, *p_brk; |
|
|
if (!s || !csAttr || !*csAttr) |
if (!s || !csAttr || !*csAttr) |
return -1; |
return -1; |
else |
else |
Buffer = Shared = NULL; |
Buffer = Shared = NULL; |
memset(szAttr, 0, MAX_ATTRIBUTE + 1); | strlcpy(szAttr, csAttr, sizeof szAttr); |
strncpy(szAttr, csAttr, MAX_ATTRIBUTE - 1); | strlcat(szAttr, "=", sizeof szAttr); |
strcat(szAttr, "="); | |
|
|
Buffer = malloc(s->eom); |
Buffer = malloc(s->eom); |
if (!Buffer) { |
if (!Buffer) { |
Line 284 sess_SetValue(tagSess * __restrict s, const char *csAt
|
Line 281 sess_SetValue(tagSess * __restrict s, const char *csAt
|
if (!strncmp(peer, szAttr, strlen(szAttr))) { |
if (!strncmp(peer, szAttr, strlen(szAttr))) { |
upd++; |
upd++; |
if (psVal) { |
if (psVal) { |
strcat(Buffer, szAttr); | strlcat(Buffer, szAttr, s->eom); |
strcat(Buffer, psVal); | strlcat(Buffer, psVal, s->eom); |
strcat(Buffer, MEM_DELIM); | strlcat(Buffer, MEM_DELIM, s->eom); |
} else { |
} else { |
strcat(Buffer, csAttr); | strlcat(Buffer, csAttr, s->eom); |
strcat(Buffer, MEM_DELIM); | strlcat(Buffer, MEM_DELIM, s->eom); |
def = IS_DEF; |
def = IS_DEF; |
} |
} |
continue; |
continue; |
} |
} |
|
|
strcat(Buffer, peer); | strlcat(Buffer, peer, s->eom); |
strcat(Buffer, MEM_DELIM); | strlcat(Buffer, MEM_DELIM, s->eom); |
} |
} |
|
|
if (!upd) { |
if (!upd) { |
if (psVal) { |
if (psVal) { |
strcat(Buffer, szAttr); | strlcat(Buffer, szAttr, s->eom); |
strcat(Buffer, psVal); | strlcat(Buffer, psVal, s->eom); |
strcat(Buffer, MEM_DELIM); | strlcat(Buffer, MEM_DELIM, s->eom); |
} else { |
} else { |
strcat(Buffer, csAttr); | strlcat(Buffer, csAttr, s->eom); |
strcat(Buffer, MEM_DELIM); | strlcat(Buffer, MEM_DELIM, s->eom); |
def = IS_DEF; |
def = IS_DEF; |
} |
} |
def |= IS_ADD; |
def |= IS_ADD; |
} |
} |
|
|
memset(s->addr, 0, s->eom); |
|
memcpy(s->addr, Buffer, s->eom); |
memcpy(s->addr, Buffer, s->eom); |
|
|
if (s->type == SHARED_MAP) |
if (s->type == SHARED_MAP) |
Line 417 sess_commitSession(tagSess * __restrict s, array_t * _
|
Line 413 sess_commitSession(tagSess * __restrict s, array_t * _
|
return -1; |
return -1; |
} else |
} else |
hdr = (sess_hdr_t*) s->addr; |
hdr = (sess_hdr_t*) s->addr; |
if (hdr->hdr_magic != SESS_AIT_MAGIC) { |
|
if (!s->zcopy) |
|
DETACH_MEMORY(s); |
|
|
|
sess_SetErr(EINVAL, "Error:: shared memory not contains values with proper format\n"); |
|
return -1; |
|
} |
|
|
|
DEC_SEMAPHORE(s, rs); |
DEC_SEMAPHORE(s, rs); |
if ((ret = io_vals2map(s->addr + sizeof(sess_hdr_t), s->eom - sizeof(sess_hdr_t), arr)) != -1) { |
if ((ret = io_vals2map(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); |
hdr->hdr_argc = io_arraySize(arr); |
ret += sizeof(sess_hdr_t); |
ret += sizeof(sess_hdr_t); |
} |
} |