version 1.1.2.4, 2010/06/24 15:01:19
|
version 1.6.2.1, 2012/03/12 16:28:09
|
Line 1
|
Line 1
|
#include "global.h" | /************************************************************************* |
| * (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 |
* rpc_srv_retValsCall() Declare return variables for RPC call and zeroed values | by Michael Pounov <misho@elwix.org>. All rights reserved. |
(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) | Redistribution and use in source and binary forms, with or without |
return NULL; | modification, are permitted provided that the following conditions |
else | are met: |
rpc_srv_zeroValsCall(call); | 1. Redistributions of source code must retain the above copyright |
if (rpc_srv_getValsCall(call, &v) == -1) | notice, this list of conditions and the following disclaimer. |
return NULL; | 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. |
|
|
return v; | 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_freeValsCall() Free return variables for RPC call |
|
* @call = RPC function call |
|
* return: none |
|
*/ |
|
inline void |
|
rpc_srv_freeValsCall(rpc_func_t * __restrict call) |
|
{ |
|
rpc_srv_declValsCall(call, 0); |
|
} |
|
|
|
/* |
/* |
* rpc_srv_declValsCall() Declare return variables for RPC call, | * rpc_srv_allocVars() - Allocate array for call variables |
if already allocated memory for RPC call return values | * |
function reallocate used space with return_vals count elements | |
* @call = RPC function call |
* @call = RPC function call |
* @return_vals = Number of return variables | * @varnum = Number of variables, if ==0 return already allocated variables number |
* return: -1 error, !=-1 ok | * return: -1 error, !=-1 return varnum value |
*/ |
*/ |
inline int | static 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 || varnum < 0) { |
| rpc_SetErr(EINVAL, "Invalid parameter can`t allocate variables for RPC call"); |
if (!call || return_vals < 0) { | |
rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t declare return variables for RPC call...\n"); | |
return -1; |
return -1; |
} else | } |
call->func_args = return_vals; | |
|
|
if (!return_vals) { | if (varnum) { |
if (call->func_vals) { | call->func_vars = io_allocVars(varnum); |
free(call->func_vals); | if (!call->func_vars) |
call->func_vals = NULL; | |
} | |
} else { | |
ptr = realloc(call->func_vals, return_vals * sizeof(rpc_val_t)); | |
if (!ptr) { | |
LOGERR; | |
return -1; |
return -1; |
} else |
|
call->func_vals = ptr; |
|
} |
} |
|
|
return call->func_args; | return io_arraySize(call->func_vars); |
} |
} |
|
|
/* |
/* |
* rpc_srv_zeroValsCall() Clean values from return variables of RPC call | * rpc_srv_getVars() - Get variables array for RPC call |
| * |
* @call = RPC function call |
* @call = RPC function call |
* return: -1 error, !=-1 Returned number of cleaned RPC variables | * @vars = Returned variables array, may be NULL |
| * return: -1 error, !=-1 Number of returned variables |
*/ |
*/ |
inline int |
inline int |
rpc_srv_zeroValsCall(rpc_func_t * __restrict call) | rpc_srv_getVars(rpc_func_t * __restrict call, array_t ** __restrict vars) |
{ |
{ |
if (!call) { |
if (!call) { |
rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t delete return variables ...\n"); | rpc_SetErr(EINVAL, "Invalid parameter can`t get variables"); |
return -1; |
return -1; |
} |
} |
|
|
memset(call->func_vals, 0, call->func_args * sizeof(rpc_val_t)); | if (vars) |
return call->func_args; | *vars = call->func_vars; |
| return io_arraySize(call->func_vars); |
} |
} |
|
|
/* | static inline int |
* rpc_srv_copyValsCall() Copy return variables for RPC call to new variable | calcHashes(rpc_func_t * __restrict func, const char *csModule, const char *csFunc) |
* @call = RPC function call | |
* @newvals = 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) | |
{ |
{ |
if (!call || !newvals) { | char *str = NULL; |
rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t copy return variables to new array\n"); | int len = 0; |
return -1; | |
| assert(func && csFunc); |
| |
| /* set function name */ |
| func->func_name = (u_char*) csFunc; |
| len = strlen(csFunc) + 3; /* extra 3 bytes, because add string "__" and 0 */ |
| /* set module name if exists */ |
| if (csModule) { |
| func->func_file = (u_char*) csModule; |
| len += strlen(csModule); |
} |
} |
|
/* align len to 2 */ |
|
len = (len + 1) & ~1; |
|
|
*newvals = calloc(call->func_args, sizeof(rpc_val_t)); | /* prepare hash source string */ |
if (!*newvals) { | str = malloc(len); |
| if (!str) { |
LOGERR; |
LOGERR; |
return -1; |
return -1; |
} else | } else { |
memcpy(*newvals, call->func_vals, call->func_args * sizeof(rpc_val_t)); | memset(str, 0, len); |
| if (func->func_file) |
return call->func_args; | strlcpy((char*) str, csModule, len); |
} | strlcat((char*) str, "__", len); |
| strlcat((char*) str, csFunc, len); |
/* | |
* rpc_srv_getValsCall() Get return variables for RPC call | |
* @call = RPC function call | |
* @vals = Returned variables, 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) | |
{ | |
if (!call) { | |
rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t get return variables ...\n"); | |
return -1; | |
} |
} |
|
|
if (vals) | func->func_tag = crcFletcher16((u_short*) str, len / 2); |
*vals = call->func_vals; | func->func_hash = hash_fnv((char*) str, len); |
return call->func_args; | |
| free(str); |
| return len; |
} |
} |
|
|
// --------------------------------------------------------- |
// --------------------------------------------------------- |
|
|
/* |
/* |
* rpc_srv_registerCall() Register call to RPC server | * rpc_srv_registerCall() - Register call to RPC server |
| * |
* @srv = RPC Server instance |
* @srv = RPC Server instance |
* @csModule = Module name, if NULL self binary |
* @csModule = Module name, if NULL self binary |
* @csFunc = Function name |
* @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 |
* return: -1 error or 0 register ok |
*/ |
*/ |
int |
int |
rpc_srv_registerCall(rpc_srv_t * __restrict srv, const char *csModule, const char *csFunc, u_char args) | rpc_srv_registerCall(rpc_srv_t * __restrict srv, const char *csModule, |
| const char *csFunc, u_short args) |
{ |
{ |
rpc_func_t *func; |
rpc_func_t *func; |
u_char str[MAXPATHLEN + UCHAR_MAX + 1]; |
|
|
|
memset(str, 0, MAXPATHLEN + UCHAR_MAX + 1); |
|
if (!srv || !csFunc) { |
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; |
return -1; |
} |
} |
if (!(func = malloc(sizeof(rpc_func_t)))) { |
if (!(func = malloc(sizeof(rpc_func_t)))) { |
LOGERR; |
LOGERR; |
return -1; |
return -1; |
} else { | } else |
memset(func, 0, sizeof(rpc_func_t)); |
memset(func, 0, sizeof(rpc_func_t)); |
strlcpy((char*) func->func_name, csFunc, UCHAR_MAX + 1); |
|
} |
|
if (csModule) { |
|
strlcpy((char*) func->func_file, csModule, MAXPATHLEN); |
|
strlcpy((char*) str, csModule, MAXPATHLEN + UCHAR_MAX + 1); |
|
} |
|
strlcat((char*) str, "__", MAXPATHLEN + UCHAR_MAX + 1); |
|
strlcat((char*) str, csFunc, MAXPATHLEN + UCHAR_MAX + 1); |
|
|
|
func->func_tag = crcFletcher16((u_short*) str, (MAXPATHLEN + UCHAR_MAX + 1) / 2); | /* set function name */ |
func->func_hash = hash_fnv((char*) str, MAXPATHLEN + UCHAR_MAX + 1); | func->func_name = strdup(csFunc); |
| /* set module name if exists */ |
| if (csModule) |
| func->func_file = strdup(csModule); |
|
|
|
/* calculate hashes */ |
|
if (calcHashes(func, func->func_file, func->func_name) == -1) { |
|
free(func->func_name); |
|
if (func->func_file) |
|
free(func->func_file); |
|
free(func); |
|
return -1; |
|
} |
|
|
func->func_parent = srv; |
func->func_parent = srv; |
|
|
if (rpc_srv_declValsCall(func, args) == -1) { | /* allocate return variables */ |
| if (args > 0 && rpc_srv_allocVars(func, args) == -1) { |
| free(func->func_name); |
| if (func->func_file) |
| free(func->func_file); |
free(func); |
free(func); |
return -1; |
return -1; |
} |
} |
|
|
|
/* add to list of functions */ |
pthread_mutex_lock(&srv->srv_mtx); |
pthread_mutex_lock(&srv->srv_mtx); |
func->func_next = srv->srv_funcs; |
func->func_next = srv->srv_funcs; |
srv->srv_funcs = func; |
srv->srv_funcs = func; |
Line 183 rpc_srv_registerCall(rpc_srv_t * __restrict srv, const
|
Line 191 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 |
* @srv = RPC Server instance |
* @csModule = Module name, if NULL self binary |
* @csModule = Module name, if NULL self binary |
* @csFunc = Function name |
* @csFunc = Function name |
Line 193 int
|
Line 202 int
|
rpc_srv_unregisterCall(rpc_srv_t * __restrict srv, const char *csModule, const char *csFunc) |
rpc_srv_unregisterCall(rpc_srv_t * __restrict srv, const char *csModule, const char *csFunc) |
{ |
{ |
rpc_func_t func, *f, *curr; |
rpc_func_t func, *f, *curr; |
u_char str[MAXPATHLEN + UCHAR_MAX + 1]; |
|
|
|
memset(&func, 0, sizeof(rpc_func_t)); |
|
memset(str, 0, MAXPATHLEN + UCHAR_MAX + 1); |
|
if (!srv || !csFunc) { |
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; |
return -1; |
} else |
} else |
strlcpy((char*) func.func_name, csFunc, UCHAR_MAX + 1); | memset(&func, 0, sizeof func); |
if (csModule) { | |
strlcpy((char*) func.func_file, csModule, MAXPATHLEN); | |
strlcpy((char*) str, csModule, MAXPATHLEN + UCHAR_MAX + 1); | |
} | |
strlcat((char*) str, "__", MAXPATHLEN + UCHAR_MAX + 1); | |
strlcat((char*) str, csFunc, MAXPATHLEN + UCHAR_MAX + 1); | |
|
|
func.func_tag = crcFletcher16((u_short*) str, (MAXPATHLEN + UCHAR_MAX + 1) / 2); | /* calculate hashes */ |
func.func_hash = hash_fnv((char*) str, MAXPATHLEN + UCHAR_MAX + 1); | if (calcHashes(&func, csModule, csFunc) == -1) |
| return -1; |
|
|
|
pthread_mutex_lock(&srv->srv_mtx); |
f = rpc_srv_getCall(srv, func.func_tag, func.func_hash); |
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; |
return 0; |
|
|
pthread_mutex_lock(&srv->srv_mtx); | /* remove from list of functions */ |
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; |
srv->srv_funcs = srv->srv_funcs->func_next; |
| else { |
if (f->func_args && f->func_vals) | |
free(f->func_vals); | |
free(f); | |
} else { | |
for (curr = srv->srv_funcs; curr->func_next != f; curr = curr->func_next); |
for (curr = srv->srv_funcs; curr->func_next != f; curr = curr->func_next); |
curr->func_next = curr->func_next->func_next; |
curr->func_next = curr->func_next->func_next; |
|
|
if (f->func_args && f->func_vals) |
|
free(f->func_vals); |
|
free(f); |
|
} |
} |
|
io_freeVars(&f->func_vars); |
|
free(f); |
pthread_mutex_unlock(&srv->srv_mtx); |
pthread_mutex_unlock(&srv->srv_mtx); |
|
|
return 1; |
return 1; |
} |
} |
|
|
/* |
/* |
* rpc_srv_getCall() Get registered call from RPC server | * rpc_srv_getCall() - Get registered call from RPC server |
| * |
* @srv = RPC Server instance |
* @srv = RPC Server instance |
* @tag = tag for function |
* @tag = tag for function |
* @hash = hash for function |
* @hash = hash for function |
Line 249 rpc_srv_getCall(rpc_srv_t * __restrict srv, uint16_t t
|
Line 246 rpc_srv_getCall(rpc_srv_t * __restrict srv, uint16_t t
|
rpc_func_t *f; |
rpc_func_t *f; |
|
|
if (!srv) { |
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; |
return NULL; |
} |
} |
|
|
Line 261 rpc_srv_getCall(rpc_srv_t * __restrict srv, uint16_t t
|
Line 258 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 |
* @srv = RPC Server instance |
* @csModule = Module name, if NULL self binary |
* @csModule = Module name, if NULL self binary |
* @csFunc = Function name |
* @csFunc = Function name |
Line 271 rpc_func_t *
|
Line 269 rpc_func_t *
|
rpc_srv_getFunc(rpc_srv_t * __restrict srv, const char *csModule, const char *csFunc) |
rpc_srv_getFunc(rpc_srv_t * __restrict srv, const char *csModule, const char *csFunc) |
{ |
{ |
rpc_func_t func; |
rpc_func_t func; |
u_char str[MAXPATHLEN + UCHAR_MAX + 1]; |
|
|
|
memset(&func, 0, sizeof(rpc_func_t)); |
|
memset(str, 0, MAXPATHLEN + UCHAR_MAX + 1); |
|
if (!srv || !csFunc) { |
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; |
return NULL; |
} else |
} else |
strlcpy((char*) func.func_name, csFunc, UCHAR_MAX + 1); | memset(&func, 0, sizeof(rpc_func_t)); |
if (csModule) { | |
strlcpy((char*) func.func_file, csModule, MAXPATHLEN); | |
strlcpy((char*) str, csModule, MAXPATHLEN + UCHAR_MAX + 1); | |
} | |
strlcat((char*) str, "__", MAXPATHLEN + UCHAR_MAX + 1); | |
strlcat((char*) str, csFunc, MAXPATHLEN + UCHAR_MAX + 1); | |
|
|
func.func_tag = crcFletcher16((u_short*) str, (MAXPATHLEN + UCHAR_MAX + 1) / 2); | /* calculate hashes */ |
func.func_hash = hash_fnv((char*) str, MAXPATHLEN + UCHAR_MAX + 1); | if (calcHashes(&func, csModule, csFunc) == -1) |
| return NULL; |
|
|
return rpc_srv_getCall(srv, func.func_tag, func.func_hash); |
return rpc_srv_getCall(srv, func.func_tag, func.func_hash); |
} |
} |
Line 296 rpc_srv_getFunc(rpc_srv_t * __restrict srv, const char
|
Line 286 rpc_srv_getFunc(rpc_srv_t * __restrict srv, const char
|
// --------------------------------------------------------- |
// --------------------------------------------------------- |
|
|
/* |
/* |
* rpc_srv_getBLOB() Get registered BLOB | * rpc_srv_getBLOB() - Get registered BLOB |
| * |
* @srv = RPC Server instance |
* @srv = RPC Server instance |
* @var = hash for variable |
* @var = hash for variable |
* return: NULL not found, !=NULL return blob var |
* return: NULL not found, !=NULL return blob var |
Line 307 rpc_srv_getBLOB(rpc_srv_t * __restrict srv, uint32_t v
|
Line 298 rpc_srv_getBLOB(rpc_srv_t * __restrict srv, uint32_t v
|
rpc_blob_t *b; |
rpc_blob_t *b; |
|
|
if (!srv) { |
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; |
return NULL; |
} |
} |
|
|
for (b = srv->srv_blob.blobs; b; b = b->blob_next) | for (b = srv->srv_blob.blobs; b; b = b->blob_next) { |
if (b->blob_var == var) |
if (b->blob_var == var) |
break; |
break; |
|
} |
|
|
return b; |
return b; |
} |
} |
|
|
/* |
/* |
* rpc_srv_registerBLOB() Register new BLOB to server | * rpc_srv_registerBLOB() - Register new BLOB to server |
| * |
* @srv = RPC Server instance |
* @srv = RPC Server instance |
* @len = BLOB length |
* @len = BLOB length |
* return: -1 error or 0 register ok | * return: NULL error or new registered BLOB |
*/ |
*/ |
rpc_blob_t * |
rpc_blob_t * |
rpc_srv_registerBLOB(rpc_srv_t * __restrict srv, size_t len) |
rpc_srv_registerBLOB(rpc_srv_t * __restrict srv, size_t len) |
Line 330 rpc_srv_registerBLOB(rpc_srv_t * __restrict srv, size_
|
Line 323 rpc_srv_registerBLOB(rpc_srv_t * __restrict srv, size_
|
rpc_blob_t *blob = NULL; |
rpc_blob_t *blob = NULL; |
|
|
if (!srv || !len) { |
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; |
return blob; |
} |
} |
|
|
Line 346 rpc_srv_registerBLOB(rpc_srv_t * __restrict srv, size_
|
Line 339 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 |
* @srv = RPC Server instance |
* @var = BLOB Variable for unregister |
* @var = BLOB Variable for unregister |
* return: -1 error, 0 not found call, 1 unregister ok |
* return: -1 error, 0 not found call, 1 unregister ok |
Line 357 rpc_srv_unregisterBLOB(rpc_srv_t * __restrict srv, uin
|
Line 351 rpc_srv_unregisterBLOB(rpc_srv_t * __restrict srv, uin
|
rpc_blob_t *b, *curr; |
rpc_blob_t *b, *curr; |
|
|
if (!srv) { |
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; |
return -1; |
} |
} |
|
|
b = rpc_srv_getBLOB(srv, var); |
b = rpc_srv_getBLOB(srv, var); |
if (!b) // not found element for unregister | if (!b) /* not found element for unregister */ |
return 0; |
return 0; |
|
/* if BLOB is unmapped force to unmap object */ |
|
if (b->blob_data) |
|
rpc_srv_blobUnmap(b); |
|
|
pthread_mutex_lock(&srv->srv_blob.mtx); |
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; |
srv->srv_blob.blobs = srv->srv_blob.blobs->blob_next; |
} else { |
} else { |
for (curr = srv->srv_blob.blobs; curr->blob_next != b; curr = curr->blob_next); |
for (curr = srv->srv_blob.blobs; curr->blob_next != b; curr = curr->blob_next); |
curr->blob_next = curr->blob_next->blob_next; |
curr->blob_next = curr->blob_next->blob_next; |
} |
} |
|
pthread_mutex_unlock(&srv->srv_blob.mtx); |
rpc_srv_blobFree(srv, b); |
rpc_srv_blobFree(srv, b); |
free(b); |
free(b); |
pthread_mutex_unlock(&srv->srv_blob.mtx); |
|
|
|
return 1; |
return 1; |
} |
} |