--- libaitrpc/src/lists.c 2010/06/23 15:07:15 1.1.2.2 +++ libaitrpc/src/lists.c 2011/05/02 23:12:08 1.2 @@ -1,7 +1,74 @@ +/************************************************************************* +* (C) 2010 AITNET ltd - Sofia/Bulgaria - +* by Michael Pounov +* +* $Author: misho $ +* $Id: lists.c,v 1.2 2011/05/02 23:12:08 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 + (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 + */ +inline rpc_val_t * +rpc_srv_retValsCall(rpc_func_t * __restrict call, int return_vals) +{ + rpc_val_t *v = NULL; + + if (rpc_srv_declValsCall(call, return_vals) == -1) + return NULL; + else + rpc_srv_zeroValsCall(call); + if (rpc_srv_getValsCall(call, &v) == -1) + return NULL; + + return v; +} + +/* * rpc_srv_freeValsCall() Free return variables for RPC call * @call = RPC function call * return: none @@ -13,7 +80,9 @@ rpc_srv_freeValsCall(rpc_func_t * __restrict call) } /* - * rpc_srv_declValsCall() Declare return variables for RPC call + * 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 @@ -38,21 +107,22 @@ 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; } /* - * rpc_srv_delValsCall() Clean values from return variables of RPC call + * rpc_srv_zeroValsCall() Clean values from return variables of RPC call * @call = RPC function call * return: -1 error, !=-1 Returned number of cleaned RPC variables */ inline int -rpc_srv_delValsCall(rpc_func_t * __restrict call) +rpc_srv_zeroValsCall(rpc_func_t * __restrict call) { if (!call) { rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t delete return variables ...\n"); @@ -113,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 @@ -144,7 +214,9 @@ rpc_srv_registerCall(rpc_srv_t * __restrict srv, const func->func_tag = crcFletcher16((u_short*) str, (MAXPATHLEN + UCHAR_MAX + 1) / 2); func->func_hash = hash_fnv((char*) str, MAXPATHLEN + UCHAR_MAX + 1); - if (rpc_srv_declValsCall(func, args) == -1) { + func->func_parent = srv; + + if (args > 0 && rpc_srv_declValsCall(func, args) == -1) { free(func); return -1; } @@ -285,10 +357,73 @@ 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; } +/* + * rpc_srv_registerBLOB() Register new BLOB to server + * @srv = RPC Server instance + * @len = BLOB length + * return: NULL error or new registered BLOB + */ +rpc_blob_t * +rpc_srv_registerBLOB(rpc_srv_t * __restrict srv, size_t len) +{ + rpc_blob_t *blob = NULL; + + if (!srv || !len) { + rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t register BLOB to server ...\n"); + return blob; + } + + blob = rpc_srv_blobCreate(srv, len); + if (blob) { + pthread_mutex_lock(&srv->srv_blob.mtx); + blob->blob_next = srv->srv_blob.blobs; + srv->srv_blob.blobs = blob; + pthread_mutex_unlock(&srv->srv_blob.mtx); + } + + return blob; +} + +/* + * 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 + */ +int +rpc_srv_unregisterBLOB(rpc_srv_t * __restrict srv, uint32_t var) +{ + rpc_blob_t *b, *curr; + + if (!srv) { + rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t unregister BLOB from server ...\n"); + return -1; + } + + b = rpc_srv_getBLOB(srv, var); + 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 + 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); + curr->blob_next = curr->blob_next->blob_next; + } + rpc_srv_blobFree(srv, b); + free(b); + pthread_mutex_unlock(&srv->srv_blob.mtx); + + return 1; +}