--- libaitio/src/Attic/vars.c 2012/03/27 22:31:37 1.4.4.3 +++ libaitio/src/Attic/vars.c 2012/03/29 12:23:00 1.5.2.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: vars.c,v 1.4.4.3 2012/03/27 22:31:37 misho Exp $ +* $Id: vars.c,v 1.5.2.2 2012/03/29 12:23:00 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -60,7 +60,7 @@ io_vars2buffer(u_char *buf, int buflen, array_t *vars) int Limit = 0; register int i; ait_val_t *v, *val; - u_char *data; + u_char *dat; assert(buf); assert(vars); @@ -78,7 +78,7 @@ io_vars2buffer(u_char *buf, int buflen, array_t *vars) memset(buf, 0, buflen); v = (ait_val_t*) buf; - data = buf + Limit; + dat = buf + Limit; } /* marshaling */ @@ -86,7 +86,7 @@ io_vars2buffer(u_char *buf, int buflen, array_t *vars) val = io_array(vars, i, ait_val_t*); v[i].val_type = val->val_type; - AIT_HASH(&v[i]) = htobe16(AIT_HASH(val)); + AIT_KEY(&v[i]) = htobe16(AIT_KEY(val)); AIT_LEN(&v[i]) = htobe32(AIT_LEN(val)); switch (AIT_TYPE(val)) { @@ -103,6 +103,19 @@ io_vars2buffer(u_char *buf, int buflen, array_t *vars) case u64: v[i].val.net = htobe64(val->val.net); break; + case data: + if (AIT_LEN(val) > buflen - Limit) { + io_SetErr(EMSGSIZE, "Error:: too short buffer buflen=%d " + "needed min %d ...\n", buflen, Limit + AIT_LEN(val)); + return -1; + } else + Limit += AIT_LEN(val); + + memcpy(dat, val->val_data, AIT_LEN(val)); + /* Debug:: data offset in packet, not matter for anything! */ + v[i].val.net = dat - buf; + dat += AIT_LEN(val); + break; case buffer: case string: if (AIT_LEN(val) > buflen - Limit) { @@ -112,10 +125,10 @@ io_vars2buffer(u_char *buf, int buflen, array_t *vars) } else Limit += AIT_LEN(val); - memcpy(data, val->val.buffer, AIT_LEN(val)); + memcpy(dat, val->val.buffer, AIT_LEN(val)); /* Debug:: data offset in packet, not matter for anything! */ - v[i].val.net = data - buf; - data += AIT_LEN(val); + v[i].val.net = dat - buf; + dat += AIT_LEN(val); break; default: io_SetErr(EINVAL, "Error:: unsupported variable type=%d at element #%d ...\n", @@ -144,7 +157,7 @@ io_buffer2vars(u_char *buf, int buflen, int vnum, int int Limit = 0; register int i; ait_val_t *v, *val; - u_char *data; + u_char *dat; assert(buf); if (!buf || !buflen || !vnum) @@ -160,7 +173,7 @@ io_buffer2vars(u_char *buf, int buflen, int vnum, int return NULL; v = (ait_val_t*) buf; - data = buf + Limit; + dat = buf + Limit; } /* de-marshaling */ @@ -180,10 +193,10 @@ io_buffer2vars(u_char *buf, int buflen, int vnum, int val->val_type = v[i].val_type; #if defined(__OpenBSD__) AIT_LEN(val) = betoh32(AIT_LEN(&v[i])); - AIT_HASH(val) = betoh16(AIT_HASH(&v[i])); + AIT_KEY(val) = betoh16(AIT_KEY(&v[i])); #else AIT_LEN(val) = be32toh(AIT_LEN(&v[i])); - AIT_HASH(val) = be16toh(AIT_HASH(&v[i])); + AIT_KEY(val) = be16toh(AIT_KEY(&v[i])); #endif switch (AIT_TYPE(val)) { @@ -204,6 +217,9 @@ io_buffer2vars(u_char *buf, int buflen, int vnum, int val->val.net = be64toh(v[i].val.net); #endif break; + case data: + /* WARNING:: remap data type to buffer */ + val->val_type = buffer; case buffer: case string: if (AIT_LEN(val) > buflen - Limit) { @@ -224,10 +240,10 @@ io_buffer2vars(u_char *buf, int buflen, int vnum, int io_arrayDestroy(&vars); return NULL; } else - memcpy(val->val.buffer, data, AIT_LEN(val)); + memcpy(val->val.buffer, dat, AIT_LEN(val)); } else - val->val.buffer = data; - data += AIT_LEN(val); + val->val.buffer = dat; + dat += AIT_LEN(val); break; default: io_SetErr(EINVAL, "Error:: unsupported variable type=%d at element #%d ...\n", @@ -258,7 +274,7 @@ io_vars2map(u_char *buf, int buflen, array_t *vars) int Limit = 0; register int i; ait_val_t *v, *val; - u_char *data; + u_char *dat; assert(buf); assert(vars); @@ -276,7 +292,7 @@ io_vars2map(u_char *buf, int buflen, array_t *vars) memset(buf, 0, buflen); v = (ait_val_t*) buf; - data = buf + Limit; + dat = buf + Limit; } /* marshaling */ @@ -284,7 +300,7 @@ io_vars2map(u_char *buf, int buflen, array_t *vars) val = io_array(vars, i, ait_val_t*); v[i].val_type = val->val_type; - AIT_HASH(&v[i]) = AIT_HASH(val); + AIT_KEY(&v[i]) = AIT_KEY(val); AIT_LEN(&v[i]) = AIT_LEN(val); switch (AIT_TYPE(val)) { @@ -301,6 +317,19 @@ io_vars2map(u_char *buf, int buflen, array_t *vars) case u64: v[i].val.net = val->val.net; break; + case data: + if (AIT_LEN(val) > buflen - Limit) { + io_SetErr(EMSGSIZE, "Error:: too short buffer buflen=%d " + "needed min %d ...\n", buflen, Limit + AIT_LEN(val)); + return -1; + } else + Limit += AIT_LEN(val); + + memcpy(dat, val->val_data, AIT_LEN(val)); + /* Debug:: data offset in packet, not matter for anything! */ + v[i].val.net = dat - buf; + dat += AIT_LEN(val); + break; case buffer: case string: if (AIT_LEN(val) > buflen - Limit) { @@ -310,10 +339,10 @@ io_vars2map(u_char *buf, int buflen, array_t *vars) } else Limit += AIT_LEN(val); - memcpy(data, val->val.buffer, AIT_LEN(val)); + memcpy(dat, val->val.buffer, AIT_LEN(val)); /* Debug:: data offset in packet, not matter for anything! */ - v[i].val.net = data - buf; - data += AIT_LEN(val); + v[i].val.net = dat - buf; + dat += AIT_LEN(val); break; default: io_SetErr(EINVAL, "Error:: unsupported variable type=%d at element #%d ...\n", @@ -342,7 +371,7 @@ io_map2vars(u_char *buf, int buflen, int vnum, int zcp int Limit = 0; register int i; ait_val_t *v, *val; - u_char *data; + u_char *dat; assert(buf); if (!buf || !buflen || !vnum) @@ -358,7 +387,7 @@ io_map2vars(u_char *buf, int buflen, int vnum, int zcp return NULL; v = (ait_val_t*) buf; - data = buf + Limit; + dat = buf + Limit; } /* de-marshaling */ @@ -376,7 +405,7 @@ io_map2vars(u_char *buf, int buflen, int vnum, int zcp io_arraySet(vars, i, val); val->val_type = v[i].val_type; - AIT_HASH(val) = AIT_HASH(&v[i]); + AIT_KEY(val) = AIT_KEY(&v[i]); AIT_LEN(val) = AIT_LEN(&v[i]); switch (AIT_TYPE(val)) { @@ -393,6 +422,9 @@ io_map2vars(u_char *buf, int buflen, int vnum, int zcp case u64: val->val.net = v[i].val.net; break; + case data: + /* WARNING:: remap data type to buffer */ + val->val_type = buffer; case buffer: case string: if (AIT_LEN(val) > buflen - Limit) { @@ -413,10 +445,10 @@ io_map2vars(u_char *buf, int buflen, int vnum, int zcp io_arrayDestroy(&vars); return NULL; } else - memcpy(val->val.buffer, data, AIT_LEN(val)); + memcpy(val->val.buffer, dat, AIT_LEN(val)); } else - val->val.buffer = data; - data += AIT_LEN(val); + val->val.buffer = dat; + dat += AIT_LEN(val); break; default: io_SetErr(EINVAL, "Error:: unsupported variable type=%d at element #%d ...\n", @@ -537,4 +569,78 @@ io_freeVar(ait_val_t * __restrict val) free(val); val = NULL; } +} + +static int +_cmp_arr_key_asc(const void *a, const void *b) +{ + return AIT_KEY(*(ait_val_t**) a) - AIT_KEY(*(ait_val_t**) b); +} + +static int +_cmp_arr_key_desc(const void *a, const void *b) +{ + return AIT_KEY(*(ait_val_t**) b) - AIT_KEY(*(ait_val_t**) a); +} + +/* + * io_sortVars() Sorting array with variables + * + * @vars = Variable array + * @order = Sort order. If =0 ascend or !=0 descend + * @cmp = Compare function for sorting. If =NULL compare by key + * return: none + */ +inline void +io_sortVars(array_t * __restrict vars, int order, int (*cmp)(const void*, const void*)) +{ + if (!vars) + return; + + if (cmp) + qsort(vars->arr_data, vars->arr_num, sizeof(void*), cmp); + else if (order) + qsort(vars->arr_data, vars->arr_num, sizeof(void*), _cmp_arr_key_desc); + else + qsort(vars->arr_data, vars->arr_num, sizeof(void*), _cmp_arr_key_asc); +} + +/* + * io_findKeyVars() Find variable by key from array + * + * @vars = Variables + * @key = Search key + * return: NULL error or not found, !=NULL valid element + */ +ait_val_t * +io_findKeyVars(array_t * __restrict vars, u_short key) +{ + array_t *tmp; + ait_val_t **v = NULL; + register int i; + const u_char *p; + + if (!vars) + return NULL; + + if (io_arrayCopy(&tmp, vars) == -1) + return NULL; + else + qsort(tmp->arr_data, tmp->arr_num, sizeof(void*), _cmp_arr_key_asc); + + /* binary search */ + for (p = (const u_char*) tmp->arr_data, i = io_arraySize(tmp); i; i >>= 1) { + v = (ait_val_t**) (p + (i >> 1) * sizeof(void*)); + if (!(key - AIT_KEY(*v))) { /* found! */ + io_arrayDestroy(&tmp); + return *v; + } + if ((key - AIT_KEY(*v)) > 0) { /* move right key > current */ + p = (const u_char*) v + sizeof(void*); + i--; + } /* else move left */ + } + + io_arrayDestroy(&tmp); + return NULL; }