sr-dev March 2017

sr-dev@lists.kamailio.org

31 participants
269 discussions

git:5.0:49bafac8: http_async_client: fix memory leak in pkg memory in case of error

by Federico Cabiddu

Module: kamailio Branch: 5.0 Commit: 49bafac8c6f50a17e44ff3ef350b95d1a51efa8c URL: https://github.com/kamailio/kamailio/commit/49bafac8c6f50a17e44ff3ef350b95d… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2017-03-05T10:12:34+01:00 http_async_client: fix memory leak in pkg memory in case of error (cherry picked from commit bd35608f1799f27c725815637c2c8e99b32d53a2) --- Modified: src/modules/http_async_client/http_multi.c --- Diff: https://github.com/kamailio/kamailio/commit/49bafac8c6f50a17e44ff3ef350b95d… Patch: https://github.com/kamailio/kamailio/commit/49bafac8c6f50a17e44ff3ef350b95d… --- diff --git a/src/modules/http_async_client/http_multi.c b/src/modules/http_async_client/http_multi.c index 849b4e6..5d07a9d 100644 --- a/src/modules/http_async_client/http_multi.c +++ b/src/modules/http_async_client/http_multi.c @@ -316,6 +316,8 @@ void reply_error(struct http_m_cell *cell) cell->cb(reply, cell->param); + pkg_free(reply); + return; }

7 years, 2 months

git:master:bd35608f: http_async_client: fix memory leak in pkg memory in case of error

by Federico Cabiddu

Module: kamailio Branch: master Commit: bd35608f1799f27c725815637c2c8e99b32d53a2 URL: https://github.com/kamailio/kamailio/commit/bd35608f1799f27c725815637c2c8e9… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2017-03-05T10:11:22+01:00 http_async_client: fix memory leak in pkg memory in case of error --- Modified: src/modules/http_async_client/http_multi.c --- Diff: https://github.com/kamailio/kamailio/commit/bd35608f1799f27c725815637c2c8e9… Patch: https://github.com/kamailio/kamailio/commit/bd35608f1799f27c725815637c2c8e9… --- diff --git a/src/modules/http_async_client/http_multi.c b/src/modules/http_async_client/http_multi.c index 849b4e6..5d07a9d 100644 --- a/src/modules/http_async_client/http_multi.c +++ b/src/modules/http_async_client/http_multi.c @@ -316,6 +316,8 @@ void reply_error(struct http_m_cell *cell) cell->cb(reply, cell->param); + pkg_free(reply); + return; }

7 years, 2 months

git:5.0:6d602361: ipops: proper return code for ip_is_in_subnet()

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.0 Commit: 6d602361521fbbc86aa1c43a986bce1422a591cf URL: https://github.com/kamailio/kamailio/commit/6d602361521fbbc86aa1c43a986bce1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-05T09:48:52+01:00 ipops: proper return code for ip_is_in_subnet() - returning 0 stopos the config execution, do -1 instead - reported by A Messina, GH #1018 (cherry picked from commit 36973d12c579eba656203614d092ffd47661596e) --- Modified: src/modules/ipops/ipops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6d602361521fbbc86aa1c43a986bce1… Patch: https://github.com/kamailio/kamailio/commit/6d602361521fbbc86aa1c43a986bce1… --- diff --git a/src/modules/ipops/ipops_mod.c b/src/modules/ipops/ipops_mod.c index 0e6f04e..150b962 100644 --- a/src/modules/ipops/ipops_mod.c +++ b/src/modules/ipops/ipops_mod.c @@ -77,7 +77,8 @@ MODULE_VERSION int _compare_ips(char*, size_t, enum enum_ip_type, char*, size_t, enum enum_ip_type); int _compare_ips_v4(struct in_addr *ip, char*, size_t); int _compare_ips_v6(struct in6_addr *ip, char*, size_t); -int _ip_is_in_subnet(char *ip1, size_t len1, enum enum_ip_type ip1_type, char *ip2, size_t len2, enum enum_ip_type ip2_type, int netmask); +int _ip_is_in_subnet(char *ip1, size_t len1, enum enum_ip_type ip1_type, + char *ip2, size_t len2, enum enum_ip_type ip2_type, int netmask); int _ip_is_in_subnet_v4(struct in_addr *ip, char *net, size_t netlen, int netmask); int _ip_is_in_subnet_v6(struct in6_addr *ip, char *net, size_t netlen, int netmask); int _ip_is_in_subnet_str(void *ip, enum enum_ip_type type, char *s, int slen); @@ -304,8 +305,10 @@ int _compare_ips_v6(struct in6_addr *ip, char* ip2, size_t len2) return 0; } -/*! \brief Return 1 if IP1 is in the subnet given by IP2 and the netmask, 0 otherwise. */ -int _ip_is_in_subnet(char *ip1, size_t len1, enum enum_ip_type ip1_type, char *ip2, size_t len2, enum enum_ip_type ip2_type, int netmask) +/*! \brief Return 1 if IP1 is in the subnet given by IP2 and the netmask, + * 0 otherwise. */ +int _ip_is_in_subnet(char *ip1, size_t len1, enum enum_ip_type ip1_type, + char *ip2, size_t len2, enum enum_ip_type ip2_type, int netmask) { struct in_addr in_addr1, in_addr2; struct in6_addr in6_addr1, in6_addr2; @@ -875,7 +878,9 @@ static int w_ip_is_in_subnet(struct sip_msg* _msg, char* _s1, char* _s2) if((ret = _ip_is_in_subnet_str_trimmed(ip,ip1_type,b,e))>0) return ret; } e = string2.s+string2.len; - return _ip_is_in_subnet_str_trimmed(ip,ip1_type,b,e); + ret = _ip_is_in_subnet_str_trimmed(ip,ip1_type,b,e); + if(ret==0) return -1; + return ret; }

7 years, 2 months

git:master:36973d12: ipops: proper return code for ip_is_in_subnet()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 36973d12c579eba656203614d092ffd47661596e URL: https://github.com/kamailio/kamailio/commit/36973d12c579eba656203614d092ffd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-05T09:48:08+01:00 ipops: proper return code for ip_is_in_subnet() - returning 0 stopos the config execution, do -1 instead - reported by A Messina, GH #1018 --- Modified: src/modules/ipops/ipops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/36973d12c579eba656203614d092ffd… Patch: https://github.com/kamailio/kamailio/commit/36973d12c579eba656203614d092ffd… --- diff --git a/src/modules/ipops/ipops_mod.c b/src/modules/ipops/ipops_mod.c index 0e6f04e..150b962 100644 --- a/src/modules/ipops/ipops_mod.c +++ b/src/modules/ipops/ipops_mod.c @@ -77,7 +77,8 @@ MODULE_VERSION int _compare_ips(char*, size_t, enum enum_ip_type, char*, size_t, enum enum_ip_type); int _compare_ips_v4(struct in_addr *ip, char*, size_t); int _compare_ips_v6(struct in6_addr *ip, char*, size_t); -int _ip_is_in_subnet(char *ip1, size_t len1, enum enum_ip_type ip1_type, char *ip2, size_t len2, enum enum_ip_type ip2_type, int netmask); +int _ip_is_in_subnet(char *ip1, size_t len1, enum enum_ip_type ip1_type, + char *ip2, size_t len2, enum enum_ip_type ip2_type, int netmask); int _ip_is_in_subnet_v4(struct in_addr *ip, char *net, size_t netlen, int netmask); int _ip_is_in_subnet_v6(struct in6_addr *ip, char *net, size_t netlen, int netmask); int _ip_is_in_subnet_str(void *ip, enum enum_ip_type type, char *s, int slen); @@ -304,8 +305,10 @@ int _compare_ips_v6(struct in6_addr *ip, char* ip2, size_t len2) return 0; } -/*! \brief Return 1 if IP1 is in the subnet given by IP2 and the netmask, 0 otherwise. */ -int _ip_is_in_subnet(char *ip1, size_t len1, enum enum_ip_type ip1_type, char *ip2, size_t len2, enum enum_ip_type ip2_type, int netmask) +/*! \brief Return 1 if IP1 is in the subnet given by IP2 and the netmask, + * 0 otherwise. */ +int _ip_is_in_subnet(char *ip1, size_t len1, enum enum_ip_type ip1_type, + char *ip2, size_t len2, enum enum_ip_type ip2_type, int netmask) { struct in_addr in_addr1, in_addr2; struct in6_addr in6_addr1, in6_addr2; @@ -875,7 +878,9 @@ static int w_ip_is_in_subnet(struct sip_msg* _msg, char* _s1, char* _s2) if((ret = _ip_is_in_subnet_str_trimmed(ip,ip1_type,b,e))>0) return ret; } e = string2.s+string2.len; - return _ip_is_in_subnet_str_trimmed(ip,ip1_type,b,e); + ret = _ip_is_in_subnet_str_trimmed(ip,ip1_type,b,e); + if(ret==0) return -1; + return ret; }

7 years, 2 months

git:master:1e20acb2: Merge pull request #1015 from lazedo/ctl-buffer-size-master

by GitHub

Module: kamailio Branch: master Commit: 1e20acb2d8e4f1ef1dda4e3a64a5834f88db2336 URL: https://github.com/kamailio/kamailio/commit/1e20acb2d8e4f1ef1dda4e3a64a5834… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-03-04T08:54:49+01:00 Merge pull request #1015 from lazedo/ctl-buffer-size-master ctl : implement rpc buffer size --- Modified: src/modules/ctl/binrpc_run.c --- Diff: https://github.com/kamailio/kamailio/commit/1e20acb2d8e4f1ef1dda4e3a64a5834… Patch: https://github.com/kamailio/kamailio/commit/1e20acb2d8e4f1ef1dda4e3a64a5834… --- diff --git a/src/modules/ctl/binrpc_run.c b/src/modules/ctl/binrpc_run.c index 7c497ce..0a27278 100644 --- a/src/modules/ctl/binrpc_run.c +++ b/src/modules/ctl/binrpc_run.c @@ -32,12 +32,15 @@ #include <stdlib.h> /* strtod */ #include <stdarg.h> +#define DEFAULT_RPC_PRINTF_BUF_SIZE 1024 + /* if set try to automatically convert values to the requested type in rpc->scan (default: not set) */ int autoconvert=0; int binrpc_max_body_size = 32; /* multiplied by 1024 in mod init */ int binrpc_struct_max_body_size = 8; /* multiplied by 1024 in mod init */ +int binrpc_buffer_size = DEFAULT_RPC_PRINTF_BUF_SIZE; #define BINRPC_MAX_BODY binrpc_max_body_size /* maximum body for send */ #define STRUCT_MAX_BODY binrpc_struct_max_body_size @@ -1012,7 +1015,7 @@ static int rpc_add(struct binrpc_ctx* ctx, char* fmt, ...) -#define RPC_PRINTF_BUF_SIZE 1024 +#define RPC_PRINTF_BUF_SIZE binrpc_buffer_size /* returns 0 on success, -1 on error */ static int rpc_rpl_printf(struct binrpc_ctx* ctx, char* fmt, ...) {

7 years, 2 months

git:master:da6a5d9d: ctl : implement rpc buffer size

by Luis Azedo

Module: kamailio Branch: master Commit: da6a5d9de5763330cc4159a2168f5e0042116cbc URL: https://github.com/kamailio/kamailio/commit/da6a5d9de5763330cc4159a2168f5e0… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-03-03T17:45:13Z ctl : implement rpc buffer size --- Modified: src/modules/ctl/binrpc_run.c --- Diff: https://github.com/kamailio/kamailio/commit/da6a5d9de5763330cc4159a2168f5e0… Patch: https://github.com/kamailio/kamailio/commit/da6a5d9de5763330cc4159a2168f5e0… --- diff --git a/src/modules/ctl/binrpc_run.c b/src/modules/ctl/binrpc_run.c index 7c497ce..0a27278 100644 --- a/src/modules/ctl/binrpc_run.c +++ b/src/modules/ctl/binrpc_run.c @@ -32,12 +32,15 @@ #include <stdlib.h> /* strtod */ #include <stdarg.h> +#define DEFAULT_RPC_PRINTF_BUF_SIZE 1024 + /* if set try to automatically convert values to the requested type in rpc->scan (default: not set) */ int autoconvert=0; int binrpc_max_body_size = 32; /* multiplied by 1024 in mod init */ int binrpc_struct_max_body_size = 8; /* multiplied by 1024 in mod init */ +int binrpc_buffer_size = DEFAULT_RPC_PRINTF_BUF_SIZE; #define BINRPC_MAX_BODY binrpc_max_body_size /* maximum body for send */ #define STRUCT_MAX_BODY binrpc_struct_max_body_size @@ -1012,7 +1015,7 @@ static int rpc_add(struct binrpc_ctx* ctx, char* fmt, ...) -#define RPC_PRINTF_BUF_SIZE 1024 +#define RPC_PRINTF_BUF_SIZE binrpc_buffer_size /* returns 0 on success, -1 on error */ static int rpc_rpl_printf(struct binrpc_ctx* ctx, char* fmt, ...) {

7 years, 2 months

[kamailio/kamailio] ctl : implement rpc buffer size (#1015)

by lazedo

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1015 -- Commit Summary -- * ctl : implement rpc buffer size -- File Changes -- M src/modules/ctl/binrpc_run.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1015.patch https://github.com/kamailio/kamailio/pull/1015.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1015

7 years, 2 months

git:master:b1a243e1: kazoo : producer heartbeats

by Luis Azedo

Module: kamailio Branch: master Commit: b1a243e166bdcf7d76b071a0964187e6ce714602 URL: https://github.com/kamailio/kamailio/commit/b1a243e166bdcf7d76b071a0964187e… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-03-03T20:05:58Z kazoo : producer heartbeats --- Modified: src/modules/kazoo/kz_amqp.c Modified: src/modules/kazoo/kz_amqp.h --- Diff: https://github.com/kamailio/kamailio/commit/b1a243e166bdcf7d76b071a0964187e… Patch: https://github.com/kamailio/kamailio/commit/b1a243e166bdcf7d76b071a0964187e…

7 years, 2 months

git:master:72c21719: kazoo : code cleanup

by Luis Azedo

Module: kamailio Branch: master Commit: 72c2171905bbdcefd03706f1362334eec0ac939e URL: https://github.com/kamailio/kamailio/commit/72c2171905bbdcefd03706f1362334e… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-03-03T20:05:43Z kazoo : code cleanup --- Modified: src/modules/kazoo/kazoo.c Modified: src/modules/kazoo/kz_amqp.h --- Diff: https://github.com/kamailio/kamailio/commit/72c2171905bbdcefd03706f1362334e… Patch: https://github.com/kamailio/kamailio/commit/72c2171905bbdcefd03706f1362334e… --- diff --git a/src/modules/kazoo/kazoo.c b/src/modules/kazoo/kazoo.c index bf35a5f..5c81ad2 100644 --- a/src/modules/kazoo/kazoo.c +++ b/src/modules/kazoo/kazoo.c @@ -41,6 +41,8 @@ #define DBK_DEFAULT_NO_CONSUMERS 1 #define DBK_DEFAULT_NO_WORKERS 8 +#define AMQP_WORKERS_RANKING PROC_XWORKER + static int mod_init(void); static int mod_child_init(int rank); static int fire_init_event(int rank); @@ -352,27 +354,15 @@ static int mod_child_init(int rank) kz_amqp_zone_ptr g; kz_amqp_server_ptr s; - fire_init_event(rank); + if (rank==PROC_INIT) + fire_init_event(rank); if (rank==PROC_INIT || rank==PROC_TCP_MAIN) return 0; -// if (rank>PROC_MAIN) -// kz_cmd_pipe = kz_cmd_pipe_fds[1]; - - if (rank==PROC_MAIN) { - /* - pid=fork_process(PROC_NOCHLDINIT, "AMQP Timer", 0); - if (pid<0) - return -1; - if(pid==0){ - return(kz_amqp_timeout_proc()); - } - */ - for(i=0; i < dbk_consumer_workers; i++) { - pid=fork_process(PROC_XWORKER, "AMQP Consumer Worker", 1); + pid=fork_process(AMQP_WORKERS_RANKING, "AMQP Consumer Worker", 1); if (pid<0) return -1; /* error */ if(pid==0){ @@ -408,7 +398,7 @@ static int mod_child_init(int rank) return 0; } - if(dbk_pua_mode == 1) { + if(rank == AMQP_WORKERS_RANKING && dbk_pua_mode == 1) { if (kz_pa_dbf.init==0) { LM_CRIT("child_init: database not bound\n"); diff --git a/src/modules/kazoo/kz_amqp.h b/src/modules/kazoo/kz_amqp.h index aa07640..0e5d668 100644 --- a/src/modules/kazoo/kz_amqp.h +++ b/src/modules/kazoo/kz_amqp.h @@ -80,16 +80,8 @@ extern int dbk_consumer_workers; typedef struct kz_amqp_connection_t { kz_amqp_connection_info info; char* url; -// struct kz_amqp_connection_t* next; } kz_amqp_connection, *kz_amqp_connection_ptr; -/* -typedef struct { - kz_amqp_connection_ptr current; - kz_amqp_connection_ptr head; - kz_amqp_connection_ptr tail; -} kz_amqp_connection_pool, *kz_amqp_connection_pool_ptr; -*/ typedef struct kz_amqp_conn_t { struct kz_amqp_server_t* server; amqp_connection_state_t conn; @@ -99,7 +91,6 @@ typedef struct kz_amqp_conn_t { amqp_socket_t *socket; amqp_channel_t channel_count; amqp_channel_t channel_counter; -// struct kz_amqp_conn_t* next; } kz_amqp_conn, *kz_amqp_conn_ptr; typedef struct { @@ -133,10 +124,6 @@ typedef struct { amqp_channel_t channel; struct timeval timeout; - /* timer */ -// struct event *timer_ev; -// int timerfd; - /* async */ char *cb_route; char *err_route;

7 years, 2 months

git:master:7e710287: kazoo : add specific pua helpers

by Luis Azedo

Module: kamailio Branch: master Commit: 7e710287c2b1894f322e9f76cd317d0cae0c4e31 URL: https://github.com/kamailio/kamailio/commit/7e710287c2b1894f322e9f76cd317d0… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-03-03T20:05:09Z kazoo : add specific pua helpers --- Modified: src/modules/kazoo/kazoo.c Modified: src/modules/kazoo/kz_pua.c Modified: src/modules/kazoo/kz_pua.h --- Diff: https://github.com/kamailio/kamailio/commit/7e710287c2b1894f322e9f76cd317d0… Patch: https://github.com/kamailio/kamailio/commit/7e710287c2b1894f322e9f76cd317d0… --- diff --git a/src/modules/kazoo/kazoo.c b/src/modules/kazoo/kazoo.c index ee4213f..bf35a5f 100644 --- a/src/modules/kazoo/kazoo.c +++ b/src/modules/kazoo/kazoo.c @@ -138,6 +138,9 @@ static cmd_export_t cmds[] = { {"kazoo_query", (cmd_function) kz_amqp_query, 4, fixup_kz_amqp, fixup_kz_amqp_free, ANY_ROUTE}, {"kazoo_query", (cmd_function) kz_amqp_query_ex, 3, fixup_kz_amqp, fixup_kz_amqp_free, ANY_ROUTE}, {"kazoo_pua_publish", (cmd_function) kz_pua_publish, 1, 0, 0, ANY_ROUTE}, + {"kazoo_pua_publish_mwi", (cmd_function) kz_pua_publish_mwi, 1, 0, 0, ANY_ROUTE}, + {"kazoo_pua_publish_presence", (cmd_function) kz_pua_publish_presence, 1, 0, 0, ANY_ROUTE}, + {"kazoo_pua_publish_dialoginfo", (cmd_function) kz_pua_publish_dialoginfo, 1, 0, 0, ANY_ROUTE}, {"kazoo_subscribe", (cmd_function) kz_amqp_subscribe, 1, fixup_kz_amqp4, fixup_kz_amqp4_free, ANY_ROUTE}, {"kazoo_subscribe", (cmd_function) kz_amqp_subscribe_simple, 4, fixup_kz_amqp4, fixup_kz_amqp4_free, ANY_ROUTE}, diff --git a/src/modules/kazoo/kz_pua.c b/src/modules/kazoo/kz_pua.c index a16106e..60b89dc 100644 --- a/src/modules/kazoo/kz_pua.c +++ b/src/modules/kazoo/kz_pua.c @@ -511,3 +511,80 @@ int kz_pua_publish(struct sip_msg* msg, char *json) { return ret; } +int kz_pua_publish_mwi(struct sip_msg* msg, char *json) { + struct json_object *json_obj = NULL; + int ret = 1; + + if(dbk_pua_mode != 1) { + LM_ERR("pua_mode must be 1 to publish\n"); + ret = -1; + goto error; + } + + /* extract info from json and construct xml */ + json_obj = kz_json_parse(json); + if (json_obj == NULL) { + ret = -1; + goto error; + } + + ret = kz_pua_publish_mwi_to_presentity(json_obj); + +error: + if(json_obj) + json_object_put(json_obj); + + return ret; +} + +int kz_pua_publish_presence(struct sip_msg* msg, char *json) { + struct json_object *json_obj = NULL; + int ret = 1; + + if(dbk_pua_mode != 1) { + LM_ERR("pua_mode must be 1 to publish\n"); + ret = -1; + goto error; + } + + /* extract info from json and construct xml */ + json_obj = kz_json_parse(json); + if (json_obj == NULL) { + ret = -1; + goto error; + } + + ret = kz_pua_publish_presence_to_presentity(json_obj); + +error: + if(json_obj) + json_object_put(json_obj); + + return ret; +} + +int kz_pua_publish_dialoginfo(struct sip_msg* msg, char *json) { + struct json_object *json_obj = NULL; + int ret = 1; + + if(dbk_pua_mode != 1) { + LM_ERR("pua_mode must be 1 to publish\n"); + ret = -1; + goto error; + } + + /* extract info from json and construct xml */ + json_obj = kz_json_parse(json); + if (json_obj == NULL) { + ret = -1; + goto error; + } + + ret = kz_pua_publish_dialoginfo_to_presentity(json_obj); + +error: + if(json_obj) + json_object_put(json_obj); + + return ret; +} diff --git a/src/modules/kazoo/kz_pua.h b/src/modules/kazoo/kz_pua.h index 2e6fbdd..47e16f6 100644 --- a/src/modules/kazoo/kz_pua.h +++ b/src/modules/kazoo/kz_pua.h @@ -27,6 +27,9 @@ int kz_initialize_pua(); int kz_pua_publish(struct sip_msg* msg, char *json); +int kz_pua_publish_mwi(struct sip_msg* msg, char *json); +int kz_pua_publish_presence(struct sip_msg* msg, char *json); +int kz_pua_publish_dialoginfo(struct sip_msg* msg, char *json); #endif

7 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2017