--- libaitrpc/src/lists.c 2010/06/24 15:01:19 1.1.2.4 +++ libaitrpc/src/lists.c 2011/08/18 15:08:03 1.3 @@ -1,3 +1,48 @@ +/************************************************************************* +* (C) 2010 AITNET ltd - Sofia/Bulgaria - +* by Michael Pounov +* +* $Author: misho $ +* $Id: lists.c,v 1.3 2011/08/18 15:08:03 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" @@ -62,12 +107,13 @@ rpc_srv_declValsCall(rpc_func_t * __restrict call, int ptr = realloc(call->func_vals, return_vals * sizeof(rpc_val_t)); if (!ptr) { LOGERR; + call->func_args = 0; return -1; } else call->func_vals = ptr; } - return call->func_args; + return return_vals; } /* @@ -137,7 +183,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 @@ -170,7 +216,7 @@ rpc_srv_registerCall(rpc_srv_t * __restrict srv, const func->func_parent = srv; - if (rpc_srv_declValsCall(func, args) == -1) { + if (args > 0 && rpc_srv_declValsCall(func, args) == -1) { free(func); return -1; } @@ -213,11 +259,11 @@ rpc_srv_unregisterCall(rpc_srv_t * __restrict srv, con func.func_hash = hash_fnv((char*) str, MAXPATHLEN + UCHAR_MAX + 1); 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) @@ -311,9 +357,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 +371,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 +411,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);