From 358234a0e7bcb9150f76ecc3a8092eda15976667 Mon Sep 17 00:00:00 2001 From: Alex Hermann Date: Mon, 19 Oct 2020 12:09:03 +0200 Subject: [PATCH 1/2] janssonrpcc: Remove unused variable and redundant assignment --- src/modules/janssonrpcc/janssonrpc_funcs.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/modules/janssonrpcc/janssonrpc_funcs.c b/src/modules/janssonrpcc/janssonrpc_funcs.c index 93e62bd53db..2dad1fbf4dc 100644 --- a/src/modules/janssonrpcc/janssonrpc_funcs.c +++ b/src/modules/janssonrpcc/janssonrpc_funcs.c @@ -44,7 +44,6 @@ int jsonrpc_request(struct sip_msg* _m, str params; str options; str route; - param_hooks_t phooks; param_t* pit=NULL; param_t* freeme=NULL; int retry; @@ -85,7 +84,7 @@ int jsonrpc_request(struct sip_msg* _m, options.len--; } - if (parse_params(&options, CLASS_ANY, &phooks, &pit)<0) { + if (parse_params(&options, CLASS_ANY, NULL, &pit)<0) { ERR("failed parsing params value\n"); return -1; } @@ -123,8 +122,6 @@ int jsonrpc_request(struct sip_msg* _m, goto end; } - retval = 0; - retval = mod_jsonrpc_request( _m, /* sip_msg */ conn, /* connection group */ From 96e1f7213e17ac8da8f19abcccdd81dfe649c092 Mon Sep 17 00:00:00 2001 From: Alex Hermann Date: Tue, 20 Oct 2020 10:40:28 +0200 Subject: [PATCH 2/2] janssonrpc: No need for copying options The address stay valid until free_params is called. And before that happens, mod_jsonrpc_request() makes its own copy. --- src/modules/janssonrpcc/janssonrpc_funcs.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/modules/janssonrpcc/janssonrpc_funcs.c b/src/modules/janssonrpcc/janssonrpc_funcs.c index 2dad1fbf4dc..70b3e9413eb 100644 --- a/src/modules/janssonrpcc/janssonrpc_funcs.c +++ b/src/modules/janssonrpcc/janssonrpc_funcs.c @@ -94,8 +94,7 @@ int jsonrpc_request(struct sip_msg* _m, for (; pit;pit=pit->next) { if PIT_MATCHES("route") { - pkg_str_dup(&route, &pit->body); - CHECK_MALLOC_GOTO(route.s, end); + route = pit->body; } else if PIT_MATCHES("timeout") { timeout = atoi(pit->body.s); @@ -135,7 +134,6 @@ int jsonrpc_request(struct sip_msg* _m, end: if(freeme) free_params(freeme); - if(route.s) pkg_free(route.s); return retval; }