--- libaitrpc/src/lists.c 2011/11/03 15:32:21 1.6 +++ libaitrpc/src/lists.c 2012/03/15 01:55:33 1.7 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: lists.c,v 1.6 2011/11/03 15:32:21 misho Exp $ +* $Id: lists.c,v 1.7 2012/03/15 01:55:33 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ 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 +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -47,7 +47,8 @@ SUCH DAMAGE. /* - * rpc_srv_allocVars() Allocate array for call variables + * rpc_srv_allocVars() - Allocate array for call variables + * * @call = RPC function call * @varnum = Number of variables, if ==0 return already allocated variables number * return: -1 error, !=-1 return varnum value @@ -56,7 +57,7 @@ static inline int rpc_srv_allocVars(rpc_func_t * __restrict call, int varnum) { if (!call || varnum < 0) { - rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t allocate variables for RPC call...\n"); + rpc_SetErr(EINVAL, "Invalid parameter can`t allocate variables for RPC call"); return -1; } @@ -70,28 +71,9 @@ rpc_srv_allocVars(rpc_func_t * __restrict call, int va } /* - * rpc_srv_copyVars() Copy variables for RPC call to new variable array + * rpc_srv_getVars() - Get variables array for RPC call + * * @call = RPC function call - * @newvars = New allocated variables array, must be free after use - * return: -1 error, !=-1 Returned number of copied RPC variables - */ -inline int -rpc_srv_copyVars(rpc_func_t * __restrict call, array_t ** __restrict newvars) -{ - if (!call || !newvars) { - rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t copy variables to new array\n"); - return -1; - } - - if (io_arrayCopy(newvars, call->func_vars) == -1) - return -1; - - return io_arraySize(*newvars); -} - -/* - * rpc_srv_getVars() Get variables array for RPC call - * @call = RPC function call * @vars = Returned variables array, may be NULL * return: -1 error, !=-1 Number of returned variables */ @@ -99,7 +81,7 @@ inline int rpc_srv_getVars(rpc_func_t * __restrict call, array_t ** __restrict vars) { if (!call) { - rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t get variables ...\n"); + rpc_SetErr(EINVAL, "Invalid parameter can`t get variables"); return -1; } @@ -108,10 +90,11 @@ rpc_srv_getVars(rpc_func_t * __restrict call, array_t return io_arraySize(call->func_vars); } -// --------------------------------------------------------- +/* --------------------------------------------------------- */ /* - * rpc_srv_registerCall() Register call to RPC server + * rpc_srv_registerCall() - Register call to RPC server + * * @srv = RPC Server instance * @csModule = Module name, if NULL self binary * @csFunc = Function name @@ -119,40 +102,40 @@ rpc_srv_getVars(rpc_func_t * __restrict call, array_t * return: -1 error or 0 register ok */ int -rpc_srv_registerCall(rpc_srv_t * __restrict srv, const char *csModule, const char *csFunc, u_short args) +rpc_srv_registerCall(rpc_srv_t * __restrict srv, const char *csModule, + const char *csFunc, u_short args) { rpc_func_t *func; - u_char str[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"); + rpc_SetErr(EINVAL, "Invalid parameter can`t register function"); return -1; } if (!(func = malloc(sizeof(rpc_func_t)))) { LOGERR; return -1; - } else { + } else memset(func, 0, sizeof(rpc_func_t)); - strlcpy((char*) func->func_name, csFunc, sizeof func->func_name); + + /* calculate hashes */ + if (rpc_calcHashes(func, csModule, csFunc) == -1) { + AIT_FREE_VAL(&func->func_name); + AIT_FREE_VAL(&func->func_file); + free(func); + return -1; } - if (csModule) { - strlcpy((char*) func->func_file, csModule, sizeof func->func_file); - strlcpy((char*) str, csModule, sizeof str); - } - strlcat((char*) str, "__", sizeof str); - strlcat((char*) str, csFunc, sizeof str); - func->func_tag = crcFletcher16((u_short*) str, sizeof str / 2); - func->func_hash = hash_fnv((char*) str, sizeof str); - func->func_parent = srv; + /* allocate return variables */ if (args > 0 && rpc_srv_allocVars(func, args) == -1) { + AIT_FREE_VAL(&func->func_name); + AIT_FREE_VAL(&func->func_file); free(func); return -1; } + /* add to list of functions */ pthread_mutex_lock(&srv->srv_mtx); func->func_next = srv->srv_funcs; srv->srv_funcs = func; @@ -161,7 +144,8 @@ rpc_srv_registerCall(rpc_srv_t * __restrict srv, const } /* - * rpc_srv_unregisterCall() Unregister call from RPC server + * rpc_srv_unregisterCall() - Unregister call from RPC server + * * @srv = RPC Server instance * @csModule = Module name, if NULL self binary * @csFunc = Function name @@ -171,30 +155,25 @@ int rpc_srv_unregisterCall(rpc_srv_t * __restrict srv, const char *csModule, const char *csFunc) { rpc_func_t func, *f, *curr; - u_char str[MAXPATHLEN + UCHAR_MAX + 1]; - memset(&func, 0, sizeof(rpc_func_t)); - memset(str, 0, sizeof str); if (!srv || !csFunc) { - rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t unregister function from RPC server ...\n"); + rpc_SetErr(EINVAL, "Invalid parameter can`t unregister function"); return -1; } else - strlcpy((char*) func.func_name, csFunc, sizeof func.func_name); - if (csModule) { - strlcpy((char*) func.func_file, csModule, sizeof func.func_file); - strlcpy((char*) str, csModule, sizeof str); - } - strlcat((char*) str, "__", sizeof str); - strlcat((char*) str, csFunc, sizeof str); + memset(&func, 0, sizeof func); - func.func_tag = crcFletcher16((u_short*) str, sizeof str / 2); - func.func_hash = hash_fnv((char*) str, sizeof str); + /* calculate hashes */ + if (rpc_calcHashes(&func, csModule, csFunc) == -1) + return -1; - pthread_mutex_lock(&srv->srv_mtx); f = rpc_srv_getCall(srv, func.func_tag, func.func_hash); + AIT_FREE_VAL(&func.func_name); + AIT_FREE_VAL(&func.func_file); if (!f) /* not found element for unregister */ return 0; + pthread_mutex_lock(&srv->srv_mtx); + /* remove from list of functions */ if (srv->srv_funcs == f) /* if is 1st element */ srv->srv_funcs = srv->srv_funcs->func_next; else { @@ -202,6 +181,8 @@ rpc_srv_unregisterCall(rpc_srv_t * __restrict srv, con curr->func_next = curr->func_next->func_next; } io_freeVars(&f->func_vars); + AIT_FREE_VAL(&f->func_name); + AIT_FREE_VAL(&f->func_file); free(f); pthread_mutex_unlock(&srv->srv_mtx); @@ -209,7 +190,8 @@ rpc_srv_unregisterCall(rpc_srv_t * __restrict srv, con } /* - * rpc_srv_getCall() Get registered call from RPC server + * rpc_srv_getCall() - Get registered call from RPC server + * * @srv = RPC Server instance * @tag = tag for function * @hash = hash for function @@ -221,7 +203,7 @@ rpc_srv_getCall(rpc_srv_t * __restrict srv, uint16_t t rpc_func_t *f; if (!srv) { - rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t get function from RPC server ...\n"); + rpc_SetErr(EINVAL, "Invalid parameter can`t get function"); return NULL; } @@ -233,7 +215,8 @@ rpc_srv_getCall(rpc_srv_t * __restrict srv, uint16_t t } /* - * rpc_srv_getFunc() Get registered call from RPC server by Name + * rpc_srv_getFunc() - Get registered call from RPC server by Name + * * @srv = RPC Server instance * @csModule = Module name, if NULL self binary * @csFunc = Function name @@ -242,33 +225,30 @@ rpc_srv_getCall(rpc_srv_t * __restrict srv, uint16_t t rpc_func_t * rpc_srv_getFunc(rpc_srv_t * __restrict srv, const char *csModule, const char *csFunc) { - rpc_func_t func; - u_char str[MAXPATHLEN + UCHAR_MAX + 1]; + rpc_func_t func, *f = NULL; - memset(&func, 0, sizeof(rpc_func_t)); - memset(str, 0, sizeof str); if (!srv || !csFunc) { - rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t get function from RPC server ...\n"); + rpc_SetErr(EINVAL, "Invalid parameter can`t get function"); return NULL; } else - strlcpy((char*) func.func_name, csFunc, sizeof func.func_name); - if (csModule) { - strlcpy((char*) func.func_file, csModule, sizeof func.func_file); - strlcpy((char*) str, csModule, sizeof str); - } - strlcat((char*) str, "__", sizeof str); - strlcat((char*) str, csFunc, sizeof str); + memset(&func, 0, sizeof(rpc_func_t)); - func.func_tag = crcFletcher16((u_short*) str, sizeof str / 2); - func.func_hash = hash_fnv((char*) str, sizeof str); + /* calculate hashes */ + if (rpc_calcHashes(&func, csModule, csFunc) == -1) + return NULL; - return rpc_srv_getCall(srv, func.func_tag, func.func_hash); + f = rpc_srv_getCall(srv, func.func_tag, func.func_hash); + + AIT_FREE_VAL(&func.func_name); + AIT_FREE_VAL(&func.func_file); + return f; } // --------------------------------------------------------- /* - * rpc_srv_getBLOB() Get registered BLOB + * rpc_srv_getBLOB() - Get registered BLOB + * * @srv = RPC Server instance * @var = hash for variable * return: NULL not found, !=NULL return blob var @@ -279,7 +259,7 @@ rpc_srv_getBLOB(rpc_srv_t * __restrict srv, uint32_t v rpc_blob_t *b; if (!srv) { - rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t get variable from BLOB server ...\n"); + rpc_SetErr(EINVAL, "Invalid parameter can`t get BLOB variable"); return NULL; } @@ -292,7 +272,8 @@ rpc_srv_getBLOB(rpc_srv_t * __restrict srv, uint32_t v } /* - * rpc_srv_registerBLOB() Register new BLOB to server + * rpc_srv_registerBLOB() - Register new BLOB to server + * * @srv = RPC Server instance * @len = BLOB length * return: NULL error or new registered BLOB @@ -303,7 +284,7 @@ rpc_srv_registerBLOB(rpc_srv_t * __restrict srv, size_ rpc_blob_t *blob = NULL; if (!srv || !len) { - rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t register BLOB to server ...\n"); + rpc_SetErr(EINVAL, "Invalid parameter can`t register BLOB variable"); return blob; } @@ -319,7 +300,8 @@ rpc_srv_registerBLOB(rpc_srv_t * __restrict srv, size_ } /* - * rpc_srv_unregisterBLOB() Unregister BLOB from server + * rpc_srv_unregisterBLOB() - Unregister BLOB from server + * * @srv = RPC Server instance * @var = BLOB Variable for unregister * return: -1 error, 0 not found call, 1 unregister ok @@ -330,7 +312,7 @@ rpc_srv_unregisterBLOB(rpc_srv_t * __restrict srv, uin rpc_blob_t *b, *curr; if (!srv) { - rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t unregister BLOB from server ...\n"); + rpc_SetErr(EINVAL, "Invalid parameter can`t unregister BLOB variable"); return -1; } @@ -354,3 +336,51 @@ rpc_srv_unregisterBLOB(rpc_srv_t * __restrict srv, uin return 1; } + +/* + * rpc_calcHashes() - Calculate hashes for RPC call + * + * @func = function + * @csModule = Module name, if NULL self binary + * @csFunc = Function name + * return: -1 error or 0 ok + */ +int +rpc_calcHashes(rpc_func_t * __restrict func, const char *csModule, const char *csFunc) +{ + char *str = NULL; + int len = 0; + + assert(func && csFunc); + + /* set function name */ + AIT_SET_STR(&func->func_name, csFunc); + len = strlen(csFunc) + 3; /* extra 3 bytes, because add string "__" and 0 */ + /* set module name if exists */ + if (csModule) { + AIT_SET_STR(&func->func_file, csModule); + len += strlen(csModule); + } + /* align len to 2 */ + len = io_align(len, 1); + + /* prepare hash source string */ + str = malloc(len); + if (!str) { + LOGERR; + return -1; + } else { + memset(str, 0, len); + if (csModule) + strlcpy((char*) str, csModule, len); + strlcat((char*) str, "__", len); + strlcat((char*) str, csFunc, len); + } + + func->func_tag = crcFletcher16((u_short*) str, len / 2); + func->func_hash = hash_fnv((char*) str, len); + + free(str); + return len; +} +