Diff for /libaitrpc/src/lists.c between versions 1.1.2.1 and 1.9.2.2

version 1.1.2.1, 2010/06/23 11:34:48 version 1.9.2.2, 2012/05/16 07:54:49
Line 1 Line 1
   /*************************************************************************
   * (C) 2010 AITNET ltd - Sofia/Bulgaria - <misho@aitbg.com>
   *  by Michael Pounov <misho@openbsd-bg.org>
   *
   * $Author$
   * $Id$
   *
   **************************************************************************
   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 <info@elwix.org>
   
   Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
           by Michael Pounov <misho@elwix.org>.  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 <misho@elwix.org>
   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"  #include "global.h"
   
   
   /*
    * rpc_srv_registerCall() - Register call to RPC server
    *
    * @srv = RPC Server instance
    * @tag = Function tag
    * @funcaddr = Function address
    * @args = Number of return function arguments
    * return: -1 error, 0 already registered tag or 1 register ok
    */
   int
   rpc_srv_registerCall(rpc_srv_t * __restrict srv, u_short tag, void *funcaddr, u_short args)
   {
           rpc_func_t *func;
   
           if (!srv || !funcaddr) {
                   rpc_SetErr(EINVAL, "Invalid parameter can`t register function");
                   return -1;
           } else {
                   /* search for duplicate */
                   TAILQ_FOREACH(func, &srv->srv_funcs, func_node)
                           if (AIT_KEY(&func->func_name) == tag)
                                   return 0;
           }
   
           if (!(func = malloc(sizeof(rpc_func_t)))) {
                   LOGERR;
                   return -1;
           } else {
                   memset(func, 0, sizeof(rpc_func_t));
                   func->func_parent = srv;
           }
   
           AIT_KEY(&func->func_name) = tag;
           AIT_SET_PTR(&func->func_name, funcaddr, 0);
   
           /* allocate return variables */
           if (args > 0 && !(func->func_vars = io_allocVars(args))) {
                   AIT_FREE_VAL(&func->func_name);
                   free(func);
                   return -1;
           }
   
           /* add to list of functions */
           TAILQ_INSERT_TAIL(&srv->srv_funcs, func, func_node);
           return 1;
   }
   
   /*
    * rpc_srv_unregisterCall() - Unregister call from RPC server
    *
    * @srv = RPC Server instance
    * @tag = Function tag
    * return: -1 error, 0 not found call, 1 unregister ok
    */
   int
   rpc_srv_unregisterCall(rpc_srv_t * __restrict srv, u_short tag)
   {
           rpc_func_t *f;
   
           if (!srv) {
                   rpc_SetErr(EINVAL, "Invalid parameter can`t unregister function");
                   return -1;
           }
   
           f = rpc_srv_getCall(srv, tag);
           if (!f)                 /* not found element for unregister */
                   return 0;
   
           TAILQ_REMOVE(&srv->srv_funcs, f, func_node);
   
           io_freeVars(&f->func_vars);
           AIT_FREE_VAL(&f->func_name);
           free(f);
           return 1;
   }
   
   /*
    * rpc_srv_getCall()  - Get registered call from RPC server
    *
    * @srv = RPC Server instance
    * @tag = tag for function
    * return: NULL not found call, !=NULL return call
    */
   inline rpc_func_t *
   rpc_srv_getCall(rpc_srv_t * __restrict srv, uint16_t tag)
   {
           rpc_func_t *f, *tmp;
   
           if (!srv) {
                   rpc_SetErr(EINVAL, "Invalid parameter can`t get function");
                   return NULL;
           }
   
           TAILQ_FOREACH_SAFE(f, &srv->srv_funcs, func_node, tmp)
                   if (AIT_KEY(&f->func_name) == tag)
                           break;
   
           return f;
   }
   
   /* --------------------------------------------------------- */
   
   #if 0
   /*
    * rpc_srv_getBLOB() - Get registered BLOB 
    *
    * @srv = RPC Server instance
    * @var = hash for variable
    * return: NULL not found, !=NULL return blob var
    */
   inline rpc_blob_t *
   rpc_srv_getBLOB(rpc_srv_t * __restrict srv, uint32_t var)
   {
           rpc_blob_t *b;
   
           if (!srv) {
                   rpc_SetErr(EINVAL, "Invalid parameter can`t get BLOB variable");
                   return NULL;
           }
   
           for (b = srv->srv_blob.blobs; b; b = b->blob_next) {
                   if (b->blob_var == var)
                           break;
           }
   
           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, "Invalid parameter can`t register BLOB variable");
                   return blob;
           }
   
           blob = rpc_srv_blobCreate(srv, len);
           if (blob) {
                   blob->blob_next = srv->srv_blob.blobs;
                   srv->srv_blob.blobs = blob;
           }
   
           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, "Invalid parameter can`t unregister BLOB variable");
                   return -1;
           }
   
           b = rpc_srv_getBLOB(srv, var);
           if (!b)                         /* not found element for unregister */
                   return 0;
           /* if BLOB is unmapped force to unmap object */
           if (b->blob_data)
                   rpc_srv_blobUnmap(b);
   
           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);
   
           return 1;
   }
   #endif

Removed from v.1.1.2.1  
changed lines
  Added in v.1.9.2.2


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>