version 1.3.2.1, 2011/08/19 08:24:13
|
version 1.3.2.2, 2011/08/19 14:23:05
|
Line 180 rpc_srv_registerCall(rpc_srv_t * __restrict srv, const
|
Line 180 rpc_srv_registerCall(rpc_srv_t * __restrict srv, const
|
rpc_func_t *func; |
rpc_func_t *func; |
u_char str[MAXPATHLEN + UCHAR_MAX + 1]; |
u_char str[MAXPATHLEN + UCHAR_MAX + 1]; |
|
|
memset(str, 0, MAXPATHLEN + UCHAR_MAX + 1); | memset(str, 0, sizeof str); |
if (!srv || !csFunc) { |
if (!srv || !csFunc) { |
rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t register function to RPC server ...\n"); |
rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t register function to RPC server ...\n"); |
return -1; |
return -1; |
Line 190 rpc_srv_registerCall(rpc_srv_t * __restrict srv, const
|
Line 190 rpc_srv_registerCall(rpc_srv_t * __restrict srv, const
|
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); | strlcpy((char*) func->func_name, csFunc, sizeof func->func_name); |
} |
} |
if (csModule) { |
if (csModule) { |
strlcpy((char*) func->func_file, csModule, MAXPATHLEN); | strlcpy((char*) func->func_file, csModule, sizeof func->func_file); |
strlcpy((char*) str, csModule, MAXPATHLEN + UCHAR_MAX + 1); | strlcpy((char*) str, csModule, sizeof str); |
} |
} |
strlcat((char*) str, "__", MAXPATHLEN + UCHAR_MAX + 1); | strlcat((char*) str, "__", sizeof str); |
strlcat((char*) str, csFunc, MAXPATHLEN + UCHAR_MAX + 1); | strlcat((char*) str, csFunc, sizeof str); |
|
|
func->func_tag = crcFletcher16((u_short*) str, (MAXPATHLEN + UCHAR_MAX + 1) / 2); | func->func_tag = crcFletcher16((u_short*) str, sizeof str / 2); |
func->func_hash = hash_fnv((char*) str, MAXPATHLEN + UCHAR_MAX + 1); | func->func_hash = hash_fnv((char*) str, sizeof str); |
|
|
func->func_parent = srv; |
func->func_parent = srv; |
|
|
Line 230 rpc_srv_unregisterCall(rpc_srv_t * __restrict srv, con
|
Line 230 rpc_srv_unregisterCall(rpc_srv_t * __restrict srv, con
|
u_char str[MAXPATHLEN + UCHAR_MAX + 1]; |
u_char str[MAXPATHLEN + UCHAR_MAX + 1]; |
|
|
memset(&func, 0, sizeof(rpc_func_t)); |
memset(&func, 0, sizeof(rpc_func_t)); |
memset(str, 0, MAXPATHLEN + UCHAR_MAX + 1); | memset(str, 0, sizeof str); |
if (!srv || !csFunc) { |
if (!srv || !csFunc) { |
rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t unregister function from RPC server ...\n"); |
rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t unregister function from RPC server ...\n"); |
return -1; |
return -1; |
} else |
} else |
strlcpy((char*) func.func_name, csFunc, UCHAR_MAX + 1); | strlcpy((char*) func.func_name, csFunc, sizeof func.func_name); |
if (csModule) { |
if (csModule) { |
strlcpy((char*) func.func_file, csModule, MAXPATHLEN); | strlcpy((char*) func.func_file, csModule, sizeof func.func_file); |
strlcpy((char*) str, csModule, MAXPATHLEN + UCHAR_MAX + 1); | strlcpy((char*) str, csModule, sizeof str); |
} |
} |
strlcat((char*) str, "__", MAXPATHLEN + UCHAR_MAX + 1); | strlcat((char*) str, "__", sizeof str); |
strlcat((char*) str, csFunc, MAXPATHLEN + UCHAR_MAX + 1); | strlcat((char*) str, csFunc, sizeof str); |
|
|
func.func_tag = crcFletcher16((u_short*) str, (MAXPATHLEN + UCHAR_MAX + 1) / 2); | func.func_tag = crcFletcher16((u_short*) str, sizeof str / 2); |
func.func_hash = hash_fnv((char*) str, MAXPATHLEN + UCHAR_MAX + 1); | func.func_hash = hash_fnv((char*) str, sizeof str); |
|
|
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 */ |
Line 308 rpc_srv_getFunc(rpc_srv_t * __restrict srv, const char
|
Line 308 rpc_srv_getFunc(rpc_srv_t * __restrict srv, const char
|
u_char str[MAXPATHLEN + UCHAR_MAX + 1]; |
u_char str[MAXPATHLEN + UCHAR_MAX + 1]; |
|
|
memset(&func, 0, sizeof(rpc_func_t)); |
memset(&func, 0, sizeof(rpc_func_t)); |
memset(str, 0, MAXPATHLEN + UCHAR_MAX + 1); | memset(str, 0, sizeof str); |
if (!srv || !csFunc) { |
if (!srv || !csFunc) { |
rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t get function from RPC server ...\n"); |
rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t get function from RPC server ...\n"); |
return NULL; |
return NULL; |
} else |
} else |
strlcpy((char*) func.func_name, csFunc, UCHAR_MAX + 1); | strlcpy((char*) func.func_name, csFunc, sizeof func.func_name); |
if (csModule) { |
if (csModule) { |
strlcpy((char*) func.func_file, csModule, MAXPATHLEN); | strlcpy((char*) func.func_file, csModule, sizeof func.func_file); |
strlcpy((char*) str, csModule, MAXPATHLEN + UCHAR_MAX + 1); | strlcpy((char*) str, csModule, sizeof str); |
} |
} |
strlcat((char*) str, "__", MAXPATHLEN + UCHAR_MAX + 1); | strlcat((char*) str, "__", sizeof str); |
strlcat((char*) str, csFunc, MAXPATHLEN + UCHAR_MAX + 1); | strlcat((char*) str, csFunc, sizeof str); |
|
|
func.func_tag = crcFletcher16((u_short*) str, (MAXPATHLEN + UCHAR_MAX + 1) / 2); | func.func_tag = crcFletcher16((u_short*) str, sizeof str / 2); |
func.func_hash = hash_fnv((char*) str, MAXPATHLEN + UCHAR_MAX + 1); | func.func_hash = hash_fnv((char*) str, sizeof str); |
|
|
return rpc_srv_getCall(srv, func.func_tag, func.func_hash); |
return rpc_srv_getCall(srv, func.func_tag, func.func_hash); |
} |
} |