--- libaitrpc/src/lists.c 2010/06/24 15:01:19 1.1.2.4 +++ libaitrpc/src/lists.c 2011/08/29 23:26:56 1.4.2.1 @@ -1,132 +1,166 @@ +/************************************************************************* +* (C) 2010 AITNET ltd - Sofia/Bulgaria - +* by Michael Pounov +* +* $Author: misho $ +* $Id: lists.c,v 1.4.2.1 2011/08/29 23:26:56 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" /* - * rpc_srv_retValsCall() Declare return variables for RPC call and zeroed values + * rpc_srv_returnVars() Init return variables for RPC call and zeroed values (for safe handling return values, use this!) * @call = RPC function call - * @return_vals = Number of return variables - * return: NULL error, !=NULL array with return values for RPC call with return_vals items + * @varnum = Number of return variables + * return: NULL error, !=NULL array with return values for RPC call with varnum items */ -inline rpc_val_t * -rpc_srv_retValsCall(rpc_func_t * __restrict call, int return_vals) +inline ait_val_t * +rpc_srv_returnVars(rpc_func_t * __restrict call, int varnum) { - rpc_val_t *v = NULL; + ait_val_t *v = NULL; - if (rpc_srv_declValsCall(call, return_vals) == -1) + if (rpc_srv_allocVars(call, varnum) == -1) return NULL; else - rpc_srv_zeroValsCall(call); - if (rpc_srv_getValsCall(call, &v) == -1) + rpc_srv_zeroVars(call); + if (rpc_srv_getVars(call, &v) == -1) return NULL; return v; } /* - * rpc_srv_freeValsCall() Free return variables for RPC call + * rpc_srv_allocVars() Allocate array for call variables, + if already allocated memory for RPC call reallocate used space * @call = RPC function call - * return: none + * @varnum = Number of variables, if ==0 free previous allocated variables + * return: -1 error, !=-1 return varnum value */ -inline void -rpc_srv_freeValsCall(rpc_func_t * __restrict call) -{ - rpc_srv_declValsCall(call, 0); -} - -/* - * rpc_srv_declValsCall() Declare return variables for RPC call, - if already allocated memory for RPC call return values - function reallocate used space with return_vals count elements - * @call = RPC function call - * @return_vals = Number of return variables - * return: -1 error, !=-1 ok - */ inline int -rpc_srv_declValsCall(rpc_func_t * __restrict call, int return_vals) +rpc_srv_allocVars(rpc_func_t * __restrict call, int varnum) { void *ptr; - if (!call || return_vals < 0) { - rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t declare return variables for RPC call...\n"); + if (!call || varnum < 0) { + rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t allocate variables for RPC call...\n"); return -1; } else - call->func_args = return_vals; + call->func_args = varnum; - if (!return_vals) { - if (call->func_vals) { - free(call->func_vals); - call->func_vals = NULL; + if (!varnum) { + if (call->func_vars) { + free(call->func_vars); + call->func_vars = NULL; } } else { - ptr = realloc(call->func_vals, return_vals * sizeof(rpc_val_t)); + ptr = realloc(call->func_vars, varnum * sizeof(ait_val_t)); if (!ptr) { LOGERR; + call->func_args = 0; return -1; } else - call->func_vals = ptr; + call->func_vars = ptr; } - return call->func_args; + return varnum; } /* - * rpc_srv_zeroValsCall() Clean values from return variables of RPC call + * rpc_srv_zeroVars() Clean values from variables of RPC call * @call = RPC function call * return: -1 error, !=-1 Returned number of cleaned RPC variables */ inline int -rpc_srv_zeroValsCall(rpc_func_t * __restrict call) +rpc_srv_zeroVars(rpc_func_t * __restrict call) { if (!call) { - rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t delete return variables ...\n"); + rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t delete variables ...\n"); return -1; } - memset(call->func_vals, 0, call->func_args * sizeof(rpc_val_t)); + memset(call->func_vars, 0, call->func_args * sizeof(ait_val_t)); return call->func_args; } /* - * rpc_srv_copyValsCall() Copy return variables for RPC call to new variable + * rpc_srv_copyVars() Copy variables for RPC call to new variable array * @call = RPC function call - * @newvals = New allocated variables array, must be free after use + * @newvars = New allocated variables array, must be free after use * return: -1 error, !=-1 Returned number of copied RPC variables */ inline int -rpc_srv_copyValsCall(rpc_func_t * __restrict call, rpc_val_t ** __restrict newvals) +rpc_srv_copyVars(rpc_func_t * __restrict call, ait_val_t ** __restrict newvars) { - if (!call || !newvals) { - rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t copy return variables to new array\n"); + if (!call || !newvars) { + rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t copy variables to new array\n"); return -1; } - *newvals = calloc(call->func_args, sizeof(rpc_val_t)); - if (!*newvals) { + *newvars = calloc(call->func_args, sizeof(ait_val_t)); + if (!*newvars) { LOGERR; return -1; } else - memcpy(*newvals, call->func_vals, call->func_args * sizeof(rpc_val_t)); + memcpy(*newvars, call->func_vars, call->func_args * sizeof(ait_val_t)); return call->func_args; } /* - * rpc_srv_getValsCall() Get return variables for RPC call + * rpc_srv_getVars() Get variables array for RPC call * @call = RPC function call - * @vals = Returned variables, may be NULL + * @vars = Returned variables array, may be NULL * return: -1 error, !=-1 Number of returned variables */ inline int -rpc_srv_getValsCall(rpc_func_t * __restrict call, rpc_val_t ** __restrict vals) +rpc_srv_getVars(rpc_func_t * __restrict call, ait_val_t ** __restrict vars) { if (!call) { - rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t get return variables ...\n"); + rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t get variables ...\n"); return -1; } - if (vals) - *vals = call->func_vals; + if (vars) + *vars = call->func_vars; return call->func_args; } @@ -137,7 +171,7 @@ rpc_srv_getValsCall(rpc_func_t * __restrict call, rpc_ * @srv = RPC Server instance * @csModule = Module name, if NULL self binary * @csFunc = Function name - * @args = Number of function arguments + * @args = Number of return function arguments, use for restriction case! * return: -1 error or 0 register ok */ int @@ -146,7 +180,7 @@ rpc_srv_registerCall(rpc_srv_t * __restrict srv, const rpc_func_t *func; u_char str[MAXPATHLEN + UCHAR_MAX + 1]; - memset(str, 0, MAXPATHLEN + UCHAR_MAX + 1); + memset(str, 0, sizeof str); if (!srv || !csFunc) { rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t register function to RPC server ...\n"); return -1; @@ -156,21 +190,21 @@ rpc_srv_registerCall(rpc_srv_t * __restrict srv, const return -1; } else { memset(func, 0, sizeof(rpc_func_t)); - strlcpy((char*) func->func_name, csFunc, UCHAR_MAX + 1); + strlcpy((char*) func->func_name, csFunc, sizeof func->func_name); } if (csModule) { - strlcpy((char*) func->func_file, csModule, MAXPATHLEN); - strlcpy((char*) str, csModule, MAXPATHLEN + UCHAR_MAX + 1); + strlcpy((char*) func->func_file, csModule, sizeof func->func_file); + strlcpy((char*) str, csModule, sizeof str); } - strlcat((char*) str, "__", MAXPATHLEN + UCHAR_MAX + 1); - strlcat((char*) str, csFunc, MAXPATHLEN + UCHAR_MAX + 1); + strlcat((char*) str, "__", sizeof str); + strlcat((char*) str, csFunc, sizeof str); - func->func_tag = crcFletcher16((u_short*) str, (MAXPATHLEN + UCHAR_MAX + 1) / 2); - func->func_hash = hash_fnv((char*) str, MAXPATHLEN + UCHAR_MAX + 1); + func->func_tag = crcFletcher16((u_short*) str, sizeof str / 2); + func->func_hash = hash_fnv((char*) str, sizeof str); func->func_parent = srv; - if (rpc_srv_declValsCall(func, args) == -1) { + if (args > 0 && rpc_srv_allocVars(func, args) == -1) { free(func); return -1; } @@ -196,39 +230,39 @@ rpc_srv_unregisterCall(rpc_srv_t * __restrict srv, con u_char str[MAXPATHLEN + UCHAR_MAX + 1]; memset(&func, 0, sizeof(rpc_func_t)); - memset(str, 0, MAXPATHLEN + UCHAR_MAX + 1); + memset(str, 0, sizeof str); if (!srv || !csFunc) { rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t unregister function from RPC server ...\n"); return -1; } else - strlcpy((char*) func.func_name, csFunc, UCHAR_MAX + 1); + strlcpy((char*) func.func_name, csFunc, sizeof func.func_name); if (csModule) { - strlcpy((char*) func.func_file, csModule, MAXPATHLEN); - strlcpy((char*) str, csModule, MAXPATHLEN + UCHAR_MAX + 1); + strlcpy((char*) func.func_file, csModule, sizeof func.func_file); + strlcpy((char*) str, csModule, sizeof str); } - strlcat((char*) str, "__", MAXPATHLEN + UCHAR_MAX + 1); - strlcat((char*) str, csFunc, MAXPATHLEN + UCHAR_MAX + 1); + strlcat((char*) str, "__", sizeof str); + strlcat((char*) str, csFunc, sizeof str); - func.func_tag = crcFletcher16((u_short*) str, (MAXPATHLEN + UCHAR_MAX + 1) / 2); - func.func_hash = hash_fnv((char*) str, MAXPATHLEN + UCHAR_MAX + 1); + func.func_tag = crcFletcher16((u_short*) str, sizeof str / 2); + func.func_hash = hash_fnv((char*) str, sizeof str); f = rpc_srv_getCall(srv, func.func_tag, func.func_hash); - if (!f) // not found element for unregister + if (!f) /* not found element for unregister */ return 0; pthread_mutex_lock(&srv->srv_mtx); - if (srv->srv_funcs == f) { // if is 1st element + if (srv->srv_funcs == f) { /* if is 1st element */ srv->srv_funcs = srv->srv_funcs->func_next; - if (f->func_args && f->func_vals) - free(f->func_vals); + if (f->func_args && f->func_vars) + free(f->func_vars); free(f); } else { for (curr = srv->srv_funcs; curr->func_next != f; curr = curr->func_next); curr->func_next = curr->func_next->func_next; - if (f->func_args && f->func_vals) - free(f->func_vals); + if (f->func_args && f->func_vars) + free(f->func_vars); free(f); } pthread_mutex_unlock(&srv->srv_mtx); @@ -274,21 +308,21 @@ rpc_srv_getFunc(rpc_srv_t * __restrict srv, const char u_char str[MAXPATHLEN + UCHAR_MAX + 1]; memset(&func, 0, sizeof(rpc_func_t)); - memset(str, 0, MAXPATHLEN + UCHAR_MAX + 1); + memset(str, 0, sizeof str); if (!srv || !csFunc) { rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t get function from RPC server ...\n"); return NULL; } else - strlcpy((char*) func.func_name, csFunc, UCHAR_MAX + 1); + strlcpy((char*) func.func_name, csFunc, sizeof func.func_name); if (csModule) { - strlcpy((char*) func.func_file, csModule, MAXPATHLEN); - strlcpy((char*) str, csModule, MAXPATHLEN + UCHAR_MAX + 1); + strlcpy((char*) func.func_file, csModule, sizeof func.func_file); + strlcpy((char*) str, csModule, sizeof str); } - strlcat((char*) str, "__", MAXPATHLEN + UCHAR_MAX + 1); - strlcat((char*) str, csFunc, MAXPATHLEN + UCHAR_MAX + 1); + strlcat((char*) str, "__", sizeof str); + strlcat((char*) str, csFunc, sizeof str); - func.func_tag = crcFletcher16((u_short*) str, (MAXPATHLEN + UCHAR_MAX + 1) / 2); - func.func_hash = hash_fnv((char*) str, MAXPATHLEN + UCHAR_MAX + 1); + func.func_tag = crcFletcher16((u_short*) str, sizeof str / 2); + func.func_hash = hash_fnv((char*) str, sizeof str); return rpc_srv_getCall(srv, func.func_tag, func.func_hash); } @@ -311,9 +345,12 @@ rpc_srv_getBLOB(rpc_srv_t * __restrict srv, uint32_t v return NULL; } - for (b = srv->srv_blob.blobs; b; b = b->blob_next) + pthread_mutex_lock(&srv->srv_blob.mtx); + for (b = srv->srv_blob.blobs; b; b = b->blob_next) { if (b->blob_var == var) break; + } + pthread_mutex_unlock(&srv->srv_blob.mtx); return b; } @@ -322,7 +359,7 @@ rpc_srv_getBLOB(rpc_srv_t * __restrict srv, uint32_t v * rpc_srv_registerBLOB() Register new BLOB to server * @srv = RPC Server instance * @len = BLOB length - * return: -1 error or 0 register ok + * return: NULL error or new registered BLOB */ rpc_blob_t * rpc_srv_registerBLOB(rpc_srv_t * __restrict srv, size_t len) @@ -362,11 +399,11 @@ rpc_srv_unregisterBLOB(rpc_srv_t * __restrict srv, uin } b = rpc_srv_getBLOB(srv, var); - if (!b) // not found element for unregister + if (!b) /* not found element for unregister */ return 0; pthread_mutex_lock(&srv->srv_blob.mtx); - if (srv->srv_blob.blobs == b) { // if is 1st element + if (srv->srv_blob.blobs == b) { /* if is 1st element */ srv->srv_blob.blobs = srv->srv_blob.blobs->blob_next; } else { for (curr = srv->srv_blob.blobs; curr->blob_next != b; curr = curr->blob_next);