--- libaitrpc/src/lists.c 2010/06/24 15:01:19 1.1.2.4 +++ libaitrpc/src/lists.c 2011/03/15 16:48:31 1.1.2.9 @@ -62,12 +62,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 +138,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 +171,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; } @@ -311,9 +312,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 +326,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)