- sr-dev - kamailio.org

git:master:fce9044e: http_client: move to next field before freeing item in fixup function
by Daniel-Constantin Mierla 30 Jun '17

30 Jun '17

Module: kamailio Branch: master Commit: fce9044ece62d6b5e81330de62fa1fa402145e68 URL: https://github.com/kamailio/kamailio/commit/fce9044ece62d6b5e81330de62fa1fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-30T14:15:55+02:00 http_client: move to next field before freeing item in fixup function --- Modified: src/modules/http_client/curlcon.c --- Diff: https://github.com/kamailio/kamailio/commit/fce9044ece62d6b5e81330de62fa1fa… Patch: https://github.com/kamailio/kamailio/commit/fce9044ece62d6b5e81330de62fa1fa… --- diff --git a/src/modules/http_client/curlcon.c b/src/modules/http_client/curlcon.c index cc5c9ed497..8e73200f0e 100644 --- a/src/modules/http_client/curlcon.c +++ b/src/modules/http_client/curlcon.c @@ -679,6 +679,7 @@ int fixup_raw_http_client_conn_list(void) while (raw_conn_list != NULL) { raw_cc = raw_conn_list; + raw_conn_list = raw_conn_list->next; if (raw_cc->name.s) pkg_free(raw_cc->name.s); if (raw_cc->url.s) pkg_free(raw_cc->url.s); if (raw_cc->username.s) pkg_free(raw_cc->username.s); @@ -690,7 +691,6 @@ int fixup_raw_http_client_conn_list(void) if (raw_cc->ciphersuites.s) pkg_free(raw_cc->ciphersuites.s); if (raw_cc->http_proxy.s) pkg_free(raw_cc->http_proxy.s); pkg_free(raw_cc); - raw_conn_list = raw_conn_list->next; } return ret; }

1 0

git:master:dbcd8574: call_control: free pkg memory in case of errors when parsing params
by Daniel-Constantin Mierla 30 Jun '17

30 Jun '17

Module: kamailio Branch: master Commit: dbcd85746ec1ba4a3be1af920dd2b1aad632297e URL: https://github.com/kamailio/kamailio/commit/dbcd85746ec1ba4a3be1af920dd2b1a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-30T14:02:20+02:00 call_control: free pkg memory in case of errors when parsing params --- Modified: src/modules/call_control/call_control.c --- Diff: https://github.com/kamailio/kamailio/commit/dbcd85746ec1ba4a3be1af920dd2b1a… Patch: https://github.com/kamailio/kamailio/commit/dbcd85746ec1ba4a3be1af920dd2b1a… --- diff --git a/src/modules/call_control/call_control.c b/src/modules/call_control/call_control.c index a31892c706..e1776de61a 100644 --- a/src/modules/call_control/call_control.c +++ b/src/modules/call_control/call_control.c @@ -218,13 +218,13 @@ typedef struct CallInfo { #define CHECK_COND(cond) \ if ((cond) == 0) { \ LM_ERR("malformed modparam\n"); \ - return -1; \ + goto error; \ } #define CHECK_ALLOC(p) \ if (!(p)) { \ LM_ERR("no memory left\n"); \ - return -1; \ + goto error; \ } @@ -242,9 +242,9 @@ destroy_list(AVP_List *list) { int -parse_param(void *val, AVP_List** avps) { +cc_parse_param(void *val, AVP_List** avps) { - char *p; + char *p = NULL; str s, content; AVP_List *mp = NULL; @@ -253,6 +253,10 @@ parse_param(void *val, AVP_List** avps) { content.s = (char*) val; content.len = strlen(content.s); + if(content.len==0) { + LM_ERR("empty parameter\n"); + return -1; + } p = (char*) pkg_malloc (content.len + 1); CHECK_ALLOC(p); @@ -298,26 +302,35 @@ parse_param(void *val, AVP_List** avps) { } return 0; + +error: + if(mp) { + if(mp->pv) { + pkg_free(mp->pv); + } + pkg_free(mp); + } + return -1; } int parse_param_init(unsigned int type, void *val) { - if (parse_param(val, &cc_init_avps) == -1) + if (cc_parse_param(val, &cc_init_avps) == -1) return E_CFG; return 0; } int parse_param_start(unsigned int type, void *val) { - if (parse_param(val, &cc_start_avps) == -1) + if (cc_parse_param(val, &cc_start_avps) == -1) return E_CFG; return 0; } int parse_param_stop(unsigned int type, void *val) { - if (parse_param(val, &cc_stop_avps) == -1) + if (cc_parse_param(val, &cc_stop_avps) == -1) return E_CFG; return 0; } @@ -1233,4 +1246,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_call_control_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:145d10f5: websocket: use sizeof over the type of the pointer to be allocated
by Daniel-Constantin Mierla 30 Jun '17

30 Jun '17

Module: kamailio Branch: master Commit: 145d10f5a2dcad3cbdb477aaabdc853bb606b355 URL: https://github.com/kamailio/kamailio/commit/145d10f5a2dcad3cbdb477aaabdc853… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-30T13:36:26+02:00 websocket: use sizeof over the type of the pointer to be allocated --- Modified: src/modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/145d10f5a2dcad3cbdb477aaabdc853… Patch: https://github.com/kamailio/kamailio/commit/145d10f5a2dcad3cbdb477aaabdc853… --- diff --git a/src/modules/websocket/ws_frame.c b/src/modules/websocket/ws_frame.c index a01953959a..6af2bb039e 100644 --- a/src/modules/websocket/ws_frame.c +++ b/src/modules/websocket/ws_frame.c @@ -209,13 +209,13 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) /* Allocate send buffer and build frame */ frame_length = frame->payload_len + extended_length + 2; - if ((send_buf = pkg_malloc(sizeof(unsigned char) * frame_length)) + if ((send_buf = pkg_malloc(sizeof(char) * frame_length)) == NULL) { LM_ERR("allocating send buffer from pkg memory\n"); return -1; } - memset(send_buf, 0, sizeof(unsigned char) * frame_length); + memset(send_buf, 0, sizeof(char) * frame_length); send_buf[pos++] = 0x80 | (frame->opcode & 0xff); if (extended_length == 0) send_buf[pos++] = (frame->payload_len & 0xff);

1 0

git:master:e5134e8c: call_obj: free current element in case of alloc failure to its field
by Daniel-Constantin Mierla 30 Jun '17

30 Jun '17

Module: kamailio Branch: master Commit: e5134e8cb64828da5f607b7c74d490c8ffaf1702 URL: https://github.com/kamailio/kamailio/commit/e5134e8cb64828da5f607b7c74d490c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-30T13:46:21+02:00 call_obj: free current element in case of alloc failure to its field --- Modified: src/modules/call_obj/cobj.c --- Diff: https://github.com/kamailio/kamailio/commit/e5134e8cb64828da5f607b7c74d490c… Patch: https://github.com/kamailio/kamailio/commit/e5134e8cb64828da5f607b7c74d490c… --- diff --git a/src/modules/call_obj/cobj.c b/src/modules/call_obj/cobj.c index 3a6ba31e51..cf014b659f 100644 --- a/src/modules/call_obj/cobj.c +++ b/src/modules/call_obj/cobj.c @@ -436,6 +436,8 @@ int cobj_get_timestamp(uint64_t ts, cobj_elem_t **elem, int limit) elem_new->callid.s = (char*)pkg_malloc(obj->callid.len + 1); /* +1 Zero at the end */ if (!elem_new->callid.s) { LM_ERR("Cannot allocate memory for callid\n"); + pkg_free(elem_new); + elem_new = NULL; goto clean; } memcpy(elem_new->callid.s, obj->callid.s, obj->callid.len);

1 0

git:master:5418f380: domain: use same condition to alloc and free local variable
by Daniel-Constantin Mierla 30 Jun '17

30 Jun '17

Module: kamailio Branch: master Commit: 5418f380ad55618004936102273b72f1f8e36113 URL: https://github.com/kamailio/kamailio/commit/5418f380ad55618004936102273b72f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-30T13:32:18+02:00 domain: use same condition to alloc and free local variable --- Modified: src/modules/domain/domain.c --- Diff: https://github.com/kamailio/kamailio/commit/5418f380ad55618004936102273b72f… Patch: https://github.com/kamailio/kamailio/commit/5418f380ad55618004936102273b72f… --- diff --git a/src/modules/domain/domain.c b/src/modules/domain/domain.c index 27951c91ab..1dbdd2f5d5 100644 --- a/src/modules/domain/domain.c +++ b/src/modules/domain/domain.c @@ -258,7 +258,7 @@ int ki_lookup_domain_prefix(struct sip_msg *_msg, str *_sdomain, str *_sprefix) val.s = did; if(add_avp(flags, name, val) < 0) { LM_ERR("unable to add a new AVP '%.*s'\n", name.s.len, name.s.s); - if(_sprefix) + if(_sprefix && _sprefix->s) pkg_free(name.s.s); return -1; }

1 0

Re: [sr-dev] [kamailio/kamailio] kamctl: added DBPORT option (18e3327)
by Daniel-Constantin Mierla 30 Jun '17

30 Jun '17

Thanks, pushed the fix to master and 5.0 branches. -- 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/commit/18e3327bedc1647a5abe0d377b15b74…

1 0

git:master:4f587124: db_mysql Look for MariaDB as well as MySQL
by Olle E. Johansson 30 Jun '17

30 Jun '17

Module: kamailio Branch: master Commit: 4f587124998e665c5ab9df7fe14cfbb3a39a9ec8 URL: https://github.com/kamailio/kamailio/commit/4f587124998e665c5ab9df7fe14cfbb… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2017-06-30T11:00:35+02:00 db_mysql Look for MariaDB as well as MySQL --- Modified: src/modules/db_mysql/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/4f587124998e665c5ab9df7fe14cfbb… Patch: https://github.com/kamailio/kamailio/commit/4f587124998e665c5ab9df7fe14cfbb… --- diff --git a/src/modules/db_mysql/Makefile b/src/modules/db_mysql/Makefile index fd09bfcce3..c8b48f985d 100644 --- a/src/modules/db_mysql/Makefile +++ b/src/modules/db_mysql/Makefile @@ -16,6 +16,10 @@ MYSQLCFG=$(shell which mysql_config) ifeq ($(MYSQLCFG),) MYSQLCFG=$(shell which mysql_config5) endif +# If no Mysql - do we have MariaDB? +ifeq ($(MYSQLCFG),) +MYSQLCFG=$(shell which mariadb_config) +endif endif ifneq ($(MYSQLCFG),)

1 0

regarding offline charging
by Anabham Manusha 30 Jun '17

30 Jun '17

hi iam implementing ims so far i have done calling through sip clients like xlite and jitsi now i lke to add offline charging to my IMS modules.can an one suggest how can i add??

2 3

git:master:ccb368e6: core: parse fline - cast number to char for print to avoid compile warning
by Daniel-Constantin Mierla 30 Jun '17

30 Jun '17

Module: kamailio Branch: master Commit: ccb368e6420c1e4849867bcdbd136d0e9a8db67d URL: https://github.com/kamailio/kamailio/commit/ccb368e6420c1e4849867bcdbd136d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-30T10:30:51+02:00 core: parse fline - cast number to char for print to avoid compile warning --- Modified: src/core/parser/parse_fline.c --- Diff: https://github.com/kamailio/kamailio/commit/ccb368e6420c1e4849867bcdbd136d0… Patch: https://github.com/kamailio/kamailio/commit/ccb368e6420c1e4849867bcdbd136d0… --- diff --git a/src/core/parser/parse_fline.c b/src/core/parser/parse_fline.c index 5b2d346f12..04758b2751 100644 --- a/src/core/parser/parse_fline.c +++ b/src/core/parser/parse_fline.c @@ -248,7 +248,7 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start* fl) if (prn) { for (t=0; t<offset; t++) if (*(buffer+t)) *(prn+t)=*(buffer+t); - else *(prn+t)=176; /* '°' */ + else *(prn+t)=(char)176; /* '°' */ LOG(L_DBG, "parsed so far: %.*s\n", offset, ZSW(prn) ); pkg_free( prn ); };

1 0

git:master:f461081a: core: dns cache - catch unknown record type to avoid compile warnings
by Daniel-Constantin Mierla 30 Jun '17

30 Jun '17

Module: kamailio Branch: master Commit: f461081a400b398a8c47b1cb338ffc4bf8bd2ede URL: https://github.com/kamailio/kamailio/commit/f461081a400b398a8c47b1cb338ffc4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-30T10:11:50+02:00 core: dns cache - catch unknown record type to avoid compile warnings --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/f461081a400b398a8c47b1cb338ffc4… Patch: https://github.com/kamailio/kamailio/commit/f461081a400b398a8c47b1cb338ffc4… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 39bed3d315..3b0f5404c4 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -2402,6 +2402,10 @@ inline static struct hostent* dns_entry2he(struct dns_hash_entry* e) case T_AAAA: ip = ((struct aaaa_rdata*)rr->rdata)->ip6; break; + default: + LM_CRIT("wrong entry type %d for %.*s\n", + e->type, e->name_len, e->name); + return 0; } memcpy(p_addr[i], ip, len); }

1 0

git:5.0:8cdee50d: kamctl: kamdbctl - proper use of DBPORT for postgres
by Daniel-Constantin Mierla 30 Jun '17

30 Jun '17

Module: kamailio Branch: 5.0 Commit: 8cdee50d7c89c1617b68e2eff1ce646eba0c33fb URL: https://github.com/kamailio/kamailio/commit/8cdee50d7c89c1617b68e2eff1ce646… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-30T08:39:23+02:00 kamctl: kamdbctl - proper use of DBPORT for postgres (cherry picked from commit 17f907d5fa1267f434f422fb61e4b315e3eafb97) --- Modified: utils/kamctl/kamdbctl.pgsql --- Diff: https://github.com/kamailio/kamailio/commit/8cdee50d7c89c1617b68e2eff1ce646… Patch: https://github.com/kamailio/kamailio/commit/8cdee50d7c89c1617b68e2eff1ce646… --- diff --git a/utils/kamctl/kamdbctl.pgsql b/utils/kamctl/kamdbctl.pgsql index a946f2a204..059b6faa82 100644 --- a/utils/kamctl/kamdbctl.pgsql +++ b/utils/kamctl/kamdbctl.pgsql @@ -55,8 +55,8 @@ if [ -z "$DBPORT" ] ; then CMD="psql -q -h $DBHOST -U $DBROOTUSER " DUMP_CMD="pg_dump -h $DBHOST -U $DBROOTUSER -c" else - CMD="psql -q -h $DBHOST -p $DBHOST -U $DBROOTUSER " - DUMP_CMD="pg_dump -h $DBHOST -p $DBHOST -U $DBROOTUSER -c" + CMD="psql -q -h $DBHOST -p $DBPORT -U $DBROOTUSER " + DUMP_CMD="pg_dump -h $DBHOST -p $DBPORT -U $DBROOTUSER -c" fi #################################################################

1 0

git:master:17f907d5: kamctl: kamdbctl - proper use of DBPORT for postgres
by Daniel-Constantin Mierla 30 Jun '17

30 Jun '17

Module: kamailio Branch: master Commit: 17f907d5fa1267f434f422fb61e4b315e3eafb97 URL: https://github.com/kamailio/kamailio/commit/17f907d5fa1267f434f422fb61e4b31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-30T08:38:11+02:00 kamctl: kamdbctl - proper use of DBPORT for postgres --- Modified: utils/kamctl/kamdbctl.pgsql --- Diff: https://github.com/kamailio/kamailio/commit/17f907d5fa1267f434f422fb61e4b31… Patch: https://github.com/kamailio/kamailio/commit/17f907d5fa1267f434f422fb61e4b31… --- diff --git a/utils/kamctl/kamdbctl.pgsql b/utils/kamctl/kamdbctl.pgsql index a946f2a204..059b6faa82 100644 --- a/utils/kamctl/kamdbctl.pgsql +++ b/utils/kamctl/kamdbctl.pgsql @@ -55,8 +55,8 @@ if [ -z "$DBPORT" ] ; then CMD="psql -q -h $DBHOST -U $DBROOTUSER " DUMP_CMD="pg_dump -h $DBHOST -U $DBROOTUSER -c" else - CMD="psql -q -h $DBHOST -p $DBHOST -U $DBROOTUSER " - DUMP_CMD="pg_dump -h $DBHOST -p $DBHOST -U $DBROOTUSER -c" + CMD="psql -q -h $DBHOST -p $DBPORT -U $DBROOTUSER " + DUMP_CMD="pg_dump -h $DBHOST -p $DBPORT -U $DBROOTUSER -c" fi #################################################################

1 0

git:master:4826ba74: permissions: new parameter load_backends
by Daniel-Constantin Mierla 29 Jun '17

29 Jun '17

Module: kamailio Branch: master Commit: 4826ba749a3d8589d57bc5fcb38eeb6f9e840e02 URL: https://github.com/kamailio/kamailio/commit/4826ba749a3d8589d57bc5fcb38eeb6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-29T09:21:22+02:00 permissions: new parameter load_backends - control what backends should be loaded - 1 - address table - 2 - trusted table - 4 - allow file - 8 - deny file - it can be a combination (sum) of the options to load many backends - default value 0xffff (load all backends) --- Modified: src/modules/permissions/permissions.c Modified: src/modules/permissions/permissions.h --- Diff: https://github.com/kamailio/kamailio/commit/4826ba749a3d8589d57bc5fcb38eeb6… Patch: https://github.com/kamailio/kamailio/commit/4826ba749a3d8589d57bc5fcb38eeb6… --- diff --git a/src/modules/permissions/permissions.c b/src/modules/permissions/permissions.c index 3d50c6b0b7..f6715556a3 100644 --- a/src/modules/permissions/permissions.c +++ b/src/modules/permissions/permissions.c @@ -89,6 +89,8 @@ static int check_all_branches = 1; int _perm_max_subnets = 512; +int _perm_load_backends = 0xFFFF; + /* * Convert the name of the files into table index */ @@ -178,6 +180,7 @@ static param_export_t params[] = { {"mask_col", PARAM_STR, &mask_col }, {"port_col", PARAM_STR, &port_col }, {"max_subnets", PARAM_INT, &_perm_max_subnets }, + {"load_backends", PARAM_INT, &_perm_load_backends }, {0, 0, 0} }; @@ -576,33 +579,42 @@ static int double_fixup(void** param, int param_no) */ static int mod_init(void) { - if(permissions_init_rpc()!=0) - { - LM_ERR("failed to register RPC commands\n"); + if(_perm_load_backends==0) { + LM_ERR("failure - no backend to be loaded\n"); return -1; } - allow[0].filename = get_pathname(default_allow_file); - allow[0].rules = parse_config_file(allow[0].filename); - if (allow[0].rules) { - LM_DBG("default allow file (%s) parsed\n", allow[0].filename); - } else { - LM_INFO("default allow file (%s) not found => empty rule set\n", - allow[0].filename); + if(permissions_init_rpc()!=0) { + LM_ERR("failed to register RPC commands\n"); + return -1; } - deny[0].filename = get_pathname(default_deny_file); - deny[0].rules = parse_config_file(deny[0].filename); - if (deny[0].rules) { - LM_DBG("default deny file (%s) parsed\n", deny[0].filename); + if(_perm_load_backends&PERM_LOAD_ALLOWFILE) { + allow[0].filename = get_pathname(default_allow_file); + allow[0].rules = parse_config_file(allow[0].filename); + if (allow[0].rules) { + LM_DBG("default allow file (%s) parsed\n", allow[0].filename); + } else { + LM_INFO("default allow file (%s) not found => empty rule set\n", + allow[0].filename); + } } else { - LM_INFO("default deny file (%s) not found => empty rule set\n", - deny[0].filename); + allow[0].filename = NULL; + allow[0].rules = NULL; } - if (init_trusted() != 0) { - LM_ERR("failed to initialize the allow_trusted function\n"); - return -1; + if(_perm_load_backends&PERM_LOAD_DENYFILE) { + deny[0].filename = get_pathname(default_deny_file); + deny[0].rules = parse_config_file(deny[0].filename); + if (deny[0].rules) { + LM_DBG("default deny file (%s) parsed\n", deny[0].filename); + } else { + LM_INFO("default deny file (%s) not found => empty rule set\n", + deny[0].filename); + } + } else { + deny[0].filename = NULL; + deny[0].rules = NULL; } if (init_tag_avp(&tag_avp_param) < 0) { @@ -610,9 +622,18 @@ static int mod_init(void) return -1; } - if (init_addresses() != 0) { - LM_ERR("failed to initialize the allow_address function\n"); - return -1; + if(_perm_load_backends&PERM_LOAD_TRUSTEDDB) { + if (init_trusted() != 0) { + LM_ERR("failed to initialize the allow_trusted function\n"); + return -1; + } + } + + if(_perm_load_backends&PERM_LOAD_ADDRESSDB) { + if (init_addresses() != 0) { + LM_ERR("failed to initialize the allow_address function\n"); + return -1; + } } if ((db_mode != DISABLE_CACHE) && (db_mode != ENABLE_CACHE)) { diff --git a/src/modules/permissions/permissions.h b/src/modules/permissions/permissions.h index 1613652ee6..bec8a7c236 100644 --- a/src/modules/permissions/permissions.h +++ b/src/modules/permissions/permissions.h @@ -60,6 +60,12 @@ extern str mask_col; /* Name of mask column */ extern str port_col; /* Name of port column */ extern int peer_tag_mode; /* Matching mode */ +/* backends to be loaded */ +#define PERM_LOAD_ADDRESSDB (1<<0) +#define PERM_LOAD_TRUSTEDDB (1<<1) +#define PERM_LOAD_ALLOWFILE (1<<2) +#define PERM_LOAD_DENYFILE (1<<3) +extern int _perm_load_backends; /* */ typedef struct int_or_pvar { unsigned int i;

2 1

git:master:e703b10c: keepalive: removed duplicated typedef definition
by Daniel-Constantin Mierla 29 Jun '17

29 Jun '17

Module: kamailio Branch: master Commit: e703b10cab467a0bd2a147fe63177a29310ece81 URL: https://github.com/kamailio/kamailio/commit/e703b10cab467a0bd2a147fe63177a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-29T09:33:47+02:00 keepalive: removed duplicated typedef definition --- Modified: src/modules/keepalive/api.h --- Diff: https://github.com/kamailio/kamailio/commit/e703b10cab467a0bd2a147fe63177a2… Patch: https://github.com/kamailio/kamailio/commit/e703b10cab467a0bd2a147fe63177a2… --- diff --git a/src/modules/keepalive/api.h b/src/modules/keepalive/api.h index 020989b4ce..33b7db135b 100644 --- a/src/modules/keepalive/api.h +++ b/src/modules/keepalive/api.h @@ -29,6 +29,7 @@ #define __KEEPALIVE_API_H_ #include "../../core/sr_module.h" +#include "keepalive.h" typedef int ka_state; @@ -36,7 +37,6 @@ typedef int ka_state; #define KA_STATE_UP 1 #define KA_STATE_DOWN 2 -typedef void (*ka_statechanged_f)(str *uri, int state, void *user_attr); typedef int (*ka_add_dest_f)(str *uri, str *owner, int flags, ka_statechanged_f callback, void *user_attr); typedef ka_state (*ka_dest_state_f)(str *uri); @@ -70,4 +70,4 @@ static inline int keepalive_load_api(keepalive_api_t *api) return 0; } -#endif /* __KEEPALIVE_API_H__ */ \ No newline at end of file +#endif /* __KEEPALIVE_API_H__ */

1 0

git:master:6ad1744f: modules: readme files regenerated - permissions ... [skip ci]
by Kamailio Dev 29 Jun '17

29 Jun '17

Module: kamailio Branch: master Commit: 6ad1744f13d8ceda7463024e6df37a7d229bc4cc URL: https://github.com/kamailio/kamailio/commit/6ad1744f13d8ceda7463024e6df37a7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-06-29T09:31:37+02:00 modules: readme files regenerated - permissions ... [skip ci] --- Modified: src/modules/permissions/README --- Diff: https://github.com/kamailio/kamailio/commit/6ad1744f13d8ceda7463024e6df37a7… Patch: https://github.com/kamailio/kamailio/commit/6ad1744f13d8ceda7463024e6df37a7…

1 0

git:master:64c529d1: permissions: documented load_backends parameter
by Daniel-Constantin Mierla 29 Jun '17

29 Jun '17

Module: kamailio Branch: master Commit: 64c529d15262921bed26f7f4b15af043382bba36 URL: https://github.com/kamailio/kamailio/commit/64c529d15262921bed26f7f4b15af04… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-29T09:27:33+02:00 permissions: documented load_backends parameter --- Modified: src/modules/permissions/doc/permissions_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/64c529d15262921bed26f7f4b15af04… Patch: https://github.com/kamailio/kamailio/commit/64c529d15262921bed26f7f4b15af04… --- diff --git a/src/modules/permissions/doc/permissions_admin.xml b/src/modules/permissions/doc/permissions_admin.xml index 6579b7dfb1..315a70c832 100644 --- a/src/modules/permissions/doc/permissions_admin.xml +++ b/src/modules/permissions/doc/permissions_admin.xml @@ -792,6 +792,30 @@ modparam("permissions", "max_subnets", 1024) </programlisting> </example> </section> + <section id ="permissions.p.load_backends"> + <title><varname>load_backends</varname> (int)</title> + <para> + Control what backends should be loaded: 1 - address table; + 2 - trusted table; 4 - allow file; 8 - deny file. + </para> + <para> + It can be a combination (sum) of the options to load many backends + (e.g., 3 - loads address and trusted tables). + </para> + <para> + <emphasis> + Default value is <quote>0xffff</quote> (load all backends). + </emphasis> + </para> + <example> + <title>Set <varname>load_backends</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("permissions", "load_backends", 1) +... +</programlisting> + </example> + </section> </section> <section>

1 0

[kamailio/kamailio] radius : Fixes use of freeradiusclient library (#1170)
by Yasin CANER 29 Jun '17

29 Jun '17

Fixes use of freeradiusclient library for radius modules. Setting right path. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1170 -- Commit Summary -- * radius : Fixes freeradiusclient library -- File Changes -- M src/modules/misc_radius/radius.h (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1170.patch https://github.com/kamailio/kamailio/pull/1170.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/1170

3 10

[kamailio/kamailio] jansson: can't extract values from string-only json array (#1171)
by Sebastian Damm 29 Jun '17

29 Jun '17

### Description I have a json string stored in a variable, and I want to iterate over the values in it. This works if there are integer values in the json string. But if it consists only of string values, jansson_get throws an error. According to jsonlint, all my json strings are valid. ### Troubleshooting #### Reproduction This is the part of kamailio.cfg leading to the error: ``` # Integer json array $var(myIntList) = '[2,3,4,5]'; xlog("L_INFO", "Integer json string is >>>> $var(myIntList) <<<<"); jansson_get('[0]', $var(myIntList), "$var(intValue)"); xlog("L_INFO", "First Int Element: >> $var(intValue) <<"); jansson_get('[1]', $var(myIntList), "$var(intValue)"); xlog("L_INFO", "Second Int Element: >> $var(intValue) <<"); # String json array $var(myStringList) = '["foo", "bar", "baz"]'; xlog("L_INFO", "String json string is >>>> $var(myStringList) <<<<"); jansson_get('[0]', $var(myStrList), "$var(strValue)"); xlog("L_INFO", "First Str Element: >> $var(strValue) <<"); jansson_get('[1]', $var(myStrList), "$var(strValue)"); xlog("L_INFO", "Second Str Element: >> $var(strValue) <<"); # Mixed json array $var(myMixedList) = '[2, "bar"]'; xlog("L_INFO", "Mixed json string (int first) is >>>> $var(myMixedList) <<<<"); jansson_get('[0]', $var(myMixedList), "$var(mixedValue)"); xlog("L_INFO", "First Mixed Element: >> $var(mixedValue) <<"); jansson_get('[1]', $var(myMixedList), "$var(mixedValue)"); xlog("L_INFO", "Second Mixed Element: >> $var(mixedValue) <<"); $var(myMixedList) = '["bar", 2]'; xlog("L_INFO", "Mixed json string (string first) is >>>> $var(myMixedList) <<<<"); jansson_get('[0]', $var(myMixedList), "$var(mixedValue)"); xlog("L_INFO", "First Mixed Element: >> $var(mixedValue) <<"); jansson_get('[1]', $var(myMixedList), "$var(mixedValue)"); xlog("L_INFO", "Second Mixed Element: >> $var(mixedValue) <<"); ``` #### Log Messages This is the output generated by the above kamailio.cfg snippet. ``` Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: Integer json string is >>>> [2,3,4,5] <<<< Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: First Int Element: >> 2 << Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: Second Int Element: >> 3 << Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: String json string is >>>> ["foo", "bar", "baz"] <<<< Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: ERROR: jansson [jansson_funcs.c:59]: janssonmod_get(): failed to parse: 0 Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: ERROR: jansson [jansson_funcs.c:61]: janssonmod_get(): json error at line 1: '[' or '{' expected near '0' Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: First Str Element: >> 0 << Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: ERROR: jansson [jansson_funcs.c:59]: janssonmod_get(): failed to parse: 0 Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: ERROR: jansson [jansson_funcs.c:61]: janssonmod_get(): json error at line 1: '[' or '{' expected near '0' Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: Second Str Element: >> 0 << Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: Mixed json string (int first) is >>>> [2, "bar"] <<<< Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: First Mixed Element: >> 2 << Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: Second Mixed Element: >> bar << Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: Mixed json string (string first) is >>>> ["bar", 2] <<<< Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: First Mixed Element: >> bar << Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: Second Mixed Element: >> 2 << ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.0.2 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 4.9.2 ``` * **Operating System**: Debian Jessie ``` Linux busch.domain 3.16.0-4-amd64 #1 SMP Debian 3.16.39-1+deb8u1 (2017-02-22) x86_64 GNU/Linux ``` -- 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/issues/1171

2 3

Re: [sr-dev] [kamailio/kamailio] kamctl: added DBPORT option (18e3327)
by Joseph F. Berghof III 28 Jun '17

28 Jun '17

When DBENGINE=PGSQL and DBPORT is set in kamctlrc the DBHOST is used instead of DBPORT (typo in utils/kamctl/kamdbctl.pgsql lines 58-59) when issuing the 'psql' command. This introduces a bug that appears to be fixed in the master branch. -- 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/commit/18e3327bedc1647a5abe0d377b15b74…

1 0

[kamailio/kamailio] resolve an issue found by cppcheck (#1169)
by Ilya Shipitsin 28 Jun '17

28 Jun '17

[utils/db_berkeley/kambdb_recover.c:339] -> [utils/db_berkeley/kambdb_recover.c:341]: (warning) Either the condition '!tbc' is redundant or there is possible null pointer dereference: tbc. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1169 -- Commit Summary -- * resolve an issue found by cppcheck: -- File Changes -- M utils/db_berkeley/kambdb_recover.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1169.patch https://github.com/kamailio/kamailio/pull/1169.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/1169

3 7

git:master:5e8f84e9: .github: added pull request template
by Daniel-Constantin Mierla 28 Jun '17

28 Jun '17

Module: kamailio Branch: master Commit: 5e8f84e9c7d3ef792ea8b0520087ae3e933fda39 URL: https://github.com/kamailio/kamailio/commit/5e8f84e9c7d3ef792ea8b0520087ae3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-28T17:22:34+02:00 .github: added pull request template --- Added: .github/PULL_REQUEST_TEMPLATE.md --- Diff: https://github.com/kamailio/kamailio/commit/5e8f84e9c7d3ef792ea8b0520087ae3… Patch: https://github.com/kamailio/kamailio/commit/5e8f84e9c7d3ef792ea8b0520087ae3… --- diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000000..2ce2261892 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,37 @@ + + + + +#### Pre-Submission Checklist + + + +- [ ] Commit message has the format required by CONTRIBUTING guide +- [ ] Commits are split per component (core, individual modules, libs, utils, ...) +- [ ] Each component has a single commit (if not, squash them into one commit) +- [ ] No commits to README files for modules (changes must be done to docbook files +in `doc/` subfolder, the README file is autogenerated) + +#### Type Of Change +- [ ] Small bug fix (non-breaking change which fixes an issue) +- [ ] New feature (non-breaking change which adds new functionality) +- [ ] Breaking change (fix or feature that would change existing functionality) + +#### Checklist: + +- [ ] PR should be backported to stable branches +- [ ] Tested changes locally +- [ ] Related to issue #XXXX (replace XXXX with an open issue number) + +#### Description +

1 0

git:master:bbe03709: utils/db_berkeley: access variable after null pointer check
by Daniel-Constantin Mierla 28 Jun '17

28 Jun '17

Module: kamailio Branch: master Commit: bbe0370939ff8a14e931595389b6678817ff1056 URL: https://github.com/kamailio/kamailio/commit/bbe0370939ff8a14e931595389b6678… Author: Ilya Shipitsin <chipitsine(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-28T16:45:54+02:00 utils/db_berkeley: access variable after null pointer check --- Modified: utils/db_berkeley/kambdb_recover.c --- Diff: https://github.com/kamailio/kamailio/commit/bbe0370939ff8a14e931595389b6678… Patch: https://github.com/kamailio/kamailio/commit/bbe0370939ff8a14e931595389b6678… --- diff --git a/utils/db_berkeley/kambdb_recover.c b/utils/db_berkeley/kambdb_recover.c index 891cf2cfdc..30733a01ff 100644 --- a/utils/db_berkeley/kambdb_recover.c +++ b/utils/db_berkeley/kambdb_recover.c @@ -336,14 +336,14 @@ int recover(char* jfn) return 2; } - tp = tbc->dtp; - - if(!tbc || !tp) + if(!tbc || !tbc->dtp) { fprintf(stderr, "[recover]: FAILED to get find metadata for : %s.\n", tn); fclose(fp); return 3; } + + tp = tbc->dtp; while ( fgets(line , MAX_ROW_SIZE, fp) != NULL ) {

1 0

git:5.0:d5d15e6c: kazoo: add $kzRK to accdess routing key of the payload
by Luis Azedo 28 Jun '17

28 Jun '17

Module: kamailio Branch: 5.0 Commit: d5d15e6c9f67e5a64bb5c3ec6926b39dc8e3b779 URL: https://github.com/kamailio/kamailio/commit/d5d15e6c9f67e5a64bb5c3ec6926b39… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-06-28T12:11:20+01:00 kazoo: add $kzRK to accdess routing key of the payload (cherry picked from commit d5c602454a9af6ebce852f44dc88c4efa4bf036f) --- Modified: src/modules/kazoo/kazoo.c Modified: src/modules/kazoo/kz_amqp.c Modified: src/modules/kazoo/kz_amqp.h --- Diff: https://github.com/kamailio/kamailio/commit/d5d15e6c9f67e5a64bb5c3ec6926b39… Patch: https://github.com/kamailio/kamailio/commit/d5d15e6c9f67e5a64bb5c3ec6926b39…

1 0

git:5.0:2ccf97c2: kazoo: add json.count transformation
by Luis Azedo 28 Jun '17

28 Jun '17

Module: kamailio Branch: 5.0 Commit: 2ccf97c2932dcd5242f7997c3230427dfe6b4417 URL: https://github.com/kamailio/kamailio/commit/2ccf97c2932dcd5242f7997c3230427… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-06-28T12:11:42+01:00 kazoo: add json.count transformation (cherry picked from commit 551413f0952429c3a360b5ccdeaeac48ea15ff8a) --- Modified: src/modules/kazoo/kz_json.c Modified: src/modules/kazoo/kz_json.h Modified: src/modules/kazoo/kz_trans.c Modified: src/modules/kazoo/kz_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/2ccf97c2932dcd5242f7997c3230427… Patch: https://github.com/kamailio/kamailio/commit/2ccf97c2932dcd5242f7997c3230427…

1 0

git:5.0:3c6e9e02: kazoo: use hardcoded max size of routing key
by Luis Azedo 28 Jun '17

28 Jun '17

Module: kamailio Branch: 5.0 Commit: 3c6e9e02d124ceb1227c8481042ac221ff79bd8d URL: https://github.com/kamailio/kamailio/commit/3c6e9e02d124ceb1227c8481042ac22… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-06-28T12:10:52+01:00 kazoo: use hardcoded max size of routing key (cherry picked from commit f18da4c9d6cc8d1ab061d68cbd8e9d988ebf2be6) --- Modified: src/modules/kazoo/defs.h Modified: src/modules/kazoo/kazoo.c Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/3c6e9e02d124ceb1227c8481042ac22… Patch: https://github.com/kamailio/kamailio/commit/3c6e9e02d124ceb1227c8481042ac22…

1 0

git:5.0:e3f69bf1: kazoo: max size of routing key
by Luis Azedo 28 Jun '17

28 Jun '17

Module: kamailio Branch: 5.0 Commit: e3f69bf10c09c9817d3839bc58e2f17f8dbeaded URL: https://github.com/kamailio/kamailio/commit/e3f69bf10c09c9817d3839bc58e2f17… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-06-28T12:10:33+01:00 kazoo: max size of routing key (cherry picked from commit 56e07cf2bb281d0aa78517e919055de640468020) --- Modified: src/modules/kazoo/kazoo.c Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/e3f69bf10c09c9817d3839bc58e2f17… Patch: https://github.com/kamailio/kamailio/commit/e3f69bf10c09c9817d3839bc58e2f17…

1 0

[kamailio/kamailio] tls compiler warnings (#1075)
by juha-h 28 Jun '17

28 Jun '17

These warnings should be eliminated in order to make compilation readable: CC (gcc) [M tls.so] tls_locking.o tls_locking.c:98:13: warning: 'locking_f' defined but not used [-Wunused-function] static void locking_f(int mode, int n, const char* file, int line) ^~~~~~~~~ tls_locking.c:83:13: warning: 'dyn_destroy_f' defined but not used [-Wunused-function] static void dyn_destroy_f(struct CRYPTO_dynlock_value *l, ^~~~~~~~~~~~~ tls_locking.c:65:13: warning: 'dyn_lock_f' defined but not used [-Wunused-function] static void dyn_lock_f(int mode, struct CRYPTO_dynlock_value* l, ^~~~~~~~~~ tls_locking.c:42:37: warning: 'dyn_create_f' defined but not used [-Wunused-function] static struct CRYPTO_dynlock_value* dyn_create_f(const char* file, int line) ^~~~~~~~~~~~ CC (gcc) [M tls.so] tls_init.o tls_init.c: In function 'init_ssl_methods': tls_init.c:377:2: warning: 'TLSv1_client_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_cli - 1] = TLSv1_client_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1598:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_client_method(void)) /* TLSv1.0 */ ^ tls_init.c:378:2: warning: 'TLSv1_server_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_srv - 1] = TLSv1_server_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1597:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_server_method(void)) /* TLSv1.0 */ ^ tls_init.c:379:2: warning: 'TLSv1_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1 - 1] = TLSv1_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1596:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_method(void)) /* TLSv1.0 */ ^ tls_init.c:382:2: warning: 'TLSv1_1_client_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_1_cli - 1] = TLSv1_1_client_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1604:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_1_client_method(void)) /* TLSv1.1 */ ^ tls_init.c:383:2: warning: 'TLSv1_1_server_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_1_srv - 1] = TLSv1_1_server_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1603:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_1_server_method(void)) /* TLSv1.1 */ ^ tls_init.c:384:2: warning: 'TLSv1_1_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_1 - 1] = TLSv1_1_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1602:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_1_method(void)) /* TLSv1.1 */ ^ tls_init.c:388:2: warning: 'TLSv1_2_client_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_2_cli - 1] = TLSv1_2_client_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1610:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_2_client_method(void)) /* TLSv1.2 */ ^ tls_init.c:389:2: warning: 'TLSv1_2_server_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_2_srv - 1] = TLSv1_2_server_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1609:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_2_server_method(void)) /* TLSv1.2 */ ^ tls_init.c:390:2: warning: 'TLSv1_2_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_2 - 1] = TLSv1_2_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1608:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_2_method(void)) /* TLSv1.2 */ ^ -- 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/issues/1075

2 2

git:master:76efc9b7: tls: updated tls version selection for libssl 1.1.0 api
by Daniel-Constantin Mierla 28 Jun '17

28 Jun '17

Module: kamailio Branch: master Commit: 76efc9b7a1489007f9ff431e730ce4e86b446a6c URL: https://github.com/kamailio/kamailio/commit/76efc9b7a1489007f9ff431e730ce4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-28T11:41:15+02:00 tls: updated tls version selection for libssl 1.1.0 api - fixes compile warnings for deprecated TLSXY_method() functions --- Modified: src/modules/tls/tls_domain.c Modified: src/modules/tls/tls_domain.h Modified: src/modules/tls/tls_init.c Modified: src/modules/tls/tls_init.h --- Diff: https://github.com/kamailio/kamailio/commit/76efc9b7a1489007f9ff431e730ce4e… Patch: https://github.com/kamailio/kamailio/commit/76efc9b7a1489007f9ff431e730ce4e…

1 0

git:master:e7c03ce6: tls: dynamic locks not needed for openssl v1.1.0+
by Daniel-Constantin Mierla 28 Jun '17

28 Jun '17

Module: kamailio Branch: master Commit: e7c03ce6ce61119fbf5cb9f41b7abcd4c7138d58 URL: https://github.com/kamailio/kamailio/commit/e7c03ce6ce61119fbf5cb9f41b7abcd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-28T10:26:43+02:00 tls: dynamic locks not needed for openssl v1.1.0+ - openssl v1.1.0 is thread safe - fixes the compile warnings for libssl 1.1.0 --- Modified: src/modules/tls/tls_locking.c --- Diff: https://github.com/kamailio/kamailio/commit/e7c03ce6ce61119fbf5cb9f41b7abcd… Patch: https://github.com/kamailio/kamailio/commit/e7c03ce6ce61119fbf5cb9f41b7abcd… --- diff --git a/src/modules/tls/tls_locking.c b/src/modules/tls/tls_locking.c index 9d8e8acec5..38c028fd2f 100644 --- a/src/modules/tls/tls_locking.c +++ b/src/modules/tls/tls_locking.c @@ -32,6 +32,9 @@ static int n_static_locks=0; static gen_lock_set_t* static_locks=0; +/* OpenSSL is thread-safe since 1.1.0 */ +#if OPENSSL_VERSION_NUMBER < 0x10100000L + /* "dynamic" locks */ struct CRYPTO_dynlock_value{ @@ -61,7 +64,6 @@ static struct CRYPTO_dynlock_value* dyn_create_f(const char* file, int line) } - static void dyn_lock_f(int mode, struct CRYPTO_dynlock_value* l, const char* file, int line) { @@ -116,6 +118,7 @@ static void locking_f(int mode, int n, const char* file, int line) } } +#endif /* openssl < 0x10100000L (1.1.0) */ void tls_destroy_locks() @@ -163,10 +166,14 @@ int tls_init_locks() } CRYPTO_set_locking_callback(locking_f); } + +/* OpenSSL is thread-safe since 1.1.0 */ +#if OPENSSL_VERSION_NUMBER < 0x10100000L /* set "dynamic" locks callbacks */ CRYPTO_set_dynlock_create_callback(dyn_create_f); CRYPTO_set_dynlock_lock_callback(dyn_lock_f); CRYPTO_set_dynlock_destroy_callback(dyn_destroy_f); +#endif /* starting with v1.0.0 openssl does not use anymore getpid(), but address * of errno which can point to same virtual address in a multi-process

1 0

git:master:551413f0: kazoo: add json.count transformation
by lazedo 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: 551413f0952429c3a360b5ccdeaeac48ea15ff8a URL: https://github.com/kamailio/kamailio/commit/551413f0952429c3a360b5ccdeaeac4… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-06-27T23:01:37+01:00 kazoo: add json.count transformation --- Modified: src/modules/kazoo/kz_json.c Modified: src/modules/kazoo/kz_json.h Modified: src/modules/kazoo/kz_trans.c Modified: src/modules/kazoo/kz_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/551413f0952429c3a360b5ccdeaeac4… Patch: https://github.com/kamailio/kamailio/commit/551413f0952429c3a360b5ccdeaeac4…

1 0

git:master:d5c60245: kazoo: add $kzRK to accdess routing key of the payload
by lazedo 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: d5c602454a9af6ebce852f44dc88c4efa4bf036f URL: https://github.com/kamailio/kamailio/commit/d5c602454a9af6ebce852f44dc88c4e… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-06-27T23:00:43+01:00 kazoo: add $kzRK to accdess routing key of the payload --- Modified: src/modules/kazoo/kazoo.c Modified: src/modules/kazoo/kz_amqp.c Modified: src/modules/kazoo/kz_amqp.h --- Diff: https://github.com/kamailio/kamailio/commit/d5c602454a9af6ebce852f44dc88c4e… Patch: https://github.com/kamailio/kamailio/commit/d5c602454a9af6ebce852f44dc88c4e…

1 0

[kamailio/kamailio] dispatcher: runtime status access from script (#1166)
by lazedo 27 Jun '17

27 Jun '17

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1166 -- Commit Summary -- * dispatcher: runtime status access from script -- File Changes -- M src/modules/dispatcher/dispatch.c (94) M src/modules/dispatcher/dispatch.h (4) M src/modules/dispatcher/dispatcher.c (139) M src/modules/dispatcher/doc/dispatcher_admin.xml (98) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1166.patch https://github.com/kamailio/kamailio/pull/1166.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/1166

2 5

git:master:a1d64dea: modules: readme files regenerated - path ... [skip ci]
by Kamailio Dev 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: a1d64dea035c1b54c285c4d2d16add414db46795 URL: https://github.com/kamailio/kamailio/commit/a1d64dea035c1b54c285c4d2d16add4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-06-27T16:46:21+02:00 modules: readme files regenerated - path ... [skip ci] --- Modified: src/modules/path/README --- Diff: https://github.com/kamailio/kamailio/commit/a1d64dea035c1b54c285c4d2d16add4… Patch: https://github.com/kamailio/kamailio/commit/a1d64dea035c1b54c285c4d2d16add4… --- diff --git a/src/modules/path/README b/src/modules/path/README index d3e88f878e..d2e3d69398 100644 --- a/src/modules/path/README +++ b/src/modules/path/README @@ -49,7 +49,7 @@ Richard Fuchs 1.1. Add Supported header 1.2. Set use_received parameter 1.3. Set received_format parameter - 1.4. Set use_received parameter + 1.4. Set enable_r2 parameter 1.5. add_path usage 1.6. add_path(user) usage 1.7. add_path(user, parameters) usage @@ -208,9 +208,9 @@ modparam("path", "received_format", 1) Default value is 0. - Example 1.4. Set use_received parameter + Example 1.4. Set enable_r2 parameter ... -modparam("path", "use_received", 1) +modparam("path", "enable_r2", 1) ... 4. Functions

1 0

git:master:43f91aa7: path: fixed the name of the parameter in enable_r2 example
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: 43f91aa76fd293eb08442a710baa8cb63146e067 URL: https://github.com/kamailio/kamailio/commit/43f91aa76fd293eb08442a710baa8cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T16:43:38+02:00 path: fixed the name of the parameter in enable_r2 example --- Modified: src/modules/path/doc/path_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/43f91aa76fd293eb08442a710baa8cb… Patch: https://github.com/kamailio/kamailio/commit/43f91aa76fd293eb08442a710baa8cb… --- diff --git a/src/modules/path/doc/path_admin.xml b/src/modules/path/doc/path_admin.xml index 4712a09716..a623e55d95 100644 --- a/src/modules/path/doc/path_admin.xml +++ b/src/modules/path/doc/path_admin.xml @@ -192,10 +192,10 @@ modparam("path", "received_format", 1) </emphasis> </para> <example> - <title>Set <varname>use_received</varname> parameter</title> + <title>Set <varname>enable_r2</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("path", "use_received", 1) +modparam("path", "enable_r2", 1) ... </programlisting> </example>

1 0

git:master:7fc44593: modules: readme files regenerated - path ... [skip ci]
by Kamailio Dev 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: 7fc44593b6e2f7b554de7aa2acc9037b6da045e6 URL: https://github.com/kamailio/kamailio/commit/7fc44593b6e2f7b554de7aa2acc9037… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-06-27T16:31:28+02:00 modules: readme files regenerated - path ... [skip ci] --- Modified: src/modules/path/README Modified: src/modules/rr/README --- Diff: https://github.com/kamailio/kamailio/commit/7fc44593b6e2f7b554de7aa2acc9037… Patch: https://github.com/kamailio/kamailio/commit/7fc44593b6e2f7b554de7aa2acc9037…

1 0

git:master:e1df9208: pv: new variables - $RAu and $RAut
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: e1df92080a631b8c97c110d1e87f74fa1cd5ec9e URL: https://github.com/kamailio/kamailio/commit/e1df92080a631b8c97c110d1e87f74f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T16:15:43+02:00 pv: new variables - $RAu and $RAut - $RAu - URI format for local socket where the SIP message was received, without trasport parameter for UDP, using the advertised address if available - $RAut - URI format for local socket where the SIP message was received, always with transport parameter, using the advertised address if available --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/e1df92080a631b8c97c110d1e87f74f… Patch: https://github.com/kamailio/kamailio/commit/e1df92080a631b8c97c110d1e87f74f… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 4e4eddfecf..c85d2015eb 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -387,6 +387,12 @@ static pv_export_t mod_pvs[] = { {{"RAp", (sizeof("RAp")-1)}, /* */ PVT_OTHER, pv_get_rcv_advertised_port, 0, 0, 0, 0, 0}, + {{"RAu", (sizeof("RAu")-1)}, /* */ + PVT_OTHER, pv_get_rcvadv_uri, 0, + 0, 0, 0, 0}, + {{"RAut", (sizeof("RAut")-1)}, /* */ + PVT_OTHER, pv_get_rcvadv_uri_full, 0, + 0, 0, 0, 0}, {{"sf", (sizeof("sf")-1)}, /* */ PVT_OTHER, pv_get_sflags, pv_set_sflags, 0, 0, 0, 0}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index b49de912d7..34b03a411f 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -760,7 +760,7 @@ int pv_get_rcvaddr_uri_helper(struct sip_msg *msg, pv_param_t *param, if(msg==NULL) return -1; - if(get_rcv_socket_uri(msg, tmode, &uri)<0) + if(get_rcv_socket_uri(msg, tmode, &uri, 0)<0) return pv_get_null(msg, param, res); if (uri.len + 1 >= pv_get_buffer_size()) @@ -820,6 +820,62 @@ int pv_get_rcv_advertised_port(struct sip_msg *msg, pv_param_t *param, return pv_get_rcvport(msg, param, res); } +int pv_get_rcvadv_uri_helper(struct sip_msg *msg, pv_param_t *param, + int tmode, pv_value_t *res) +{ + str uri; + str sr; + + if(msg==NULL) + return -1; + + if(get_rcv_socket_uri(msg, tmode, &uri, 1)<0) + return pv_get_null(msg, param, res); + + if (uri.len + 1 >= pv_get_buffer_size()) + { + LM_ERR("local buffer size exceeded\n"); + return pv_get_null(msg, param, res); + } + + sr.s = pv_get_buffer(); + strncpy(sr.s, uri.s, uri.len); + sr.len = uri.len; + sr.s[sr.len] = '\0'; + + return pv_get_strval(msg, param, res, &sr); +} + +int pv_get_rcvadv_uri(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + if(msg==NULL) + return -1; + + if(msg->rcv.bind_address!=NULL + && (msg->rcv.bind_address->useinfo.address_str.len > 0 + || msg->rcv.bind_address->useinfo.port_no_str.len > 0)) { + return pv_get_rcvadv_uri_helper(msg, param, 0, res); + } + + return pv_get_rcvaddr_uri_helper(msg, param, 0, res); +} + +int pv_get_rcvadv_uri_full(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + if(msg==NULL) + return -1; + + if(msg->rcv.bind_address!=NULL + && (msg->rcv.bind_address->useinfo.address_str.len > 0 + || msg->rcv.bind_address->useinfo.port_no_str.len > 0)) { + return pv_get_rcvadv_uri_helper(msg, param, 1, res); + } + + return pv_get_rcvaddr_uri_helper(msg, param, 1, res); +} + /** * */ diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 81c86f02a8..ac36ef315a 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -157,6 +157,12 @@ int pv_get_rcv_advertised_ip(struct sip_msg *msg, pv_param_t *param, int pv_get_rcv_advertised_port(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_rcvadv_uri(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + +int pv_get_rcvadv_uri_full(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + int pv_get_force_sock(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

1 0

git:master:55b5b354: pv: $RAp returns also the int value for advertised port when available
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: 55b5b35430ccb7de904f6b1c48ff71e691344b9e URL: https://github.com/kamailio/kamailio/commit/55b5b35430ccb7de904f6b1c48ff71e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T16:00:08+02:00 pv: $RAp returns also the int value for advertised port when available --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/55b5b35430ccb7de904f6b1c48ff71e… Patch: https://github.com/kamailio/kamailio/commit/55b5b35430ccb7de904f6b1c48ff71e… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 8e0074fca4..b49de912d7 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -797,7 +797,8 @@ int pv_get_rcv_advertised_ip(struct sip_msg *msg, pv_param_t *param, if(msg->rcv.bind_address!=NULL && msg->rcv.bind_address->useinfo.address_str.len > 0) { - return pv_get_strval(msg, param, res, &msg->rcv.bind_address->useinfo.address_str); + return pv_get_strval(msg, param, res, + &msg->rcv.bind_address->useinfo.address_str); } return pv_get_rcvip(msg, param, res); @@ -811,7 +812,9 @@ int pv_get_rcv_advertised_port(struct sip_msg *msg, pv_param_t *param, if(msg->rcv.bind_address!=NULL && msg->rcv.bind_address->useinfo.port_no_str.len > 0) { - return pv_get_strval(msg, param, res, &msg->rcv.bind_address->useinfo.port_no_str); + return pv_get_intstrval(msg, param, res, + (int)msg->rcv.bind_address->useinfo.port_no, + &msg->rcv.bind_address->useinfo.port_no_str); } return pv_get_rcvport(msg, param, res);

1 0

git:master:aa9129b7: core: parser - get_rcv_socket_uri() with option to use advertised address
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: aa9129b71bb009176571a8cb5bde7221b2f92b75 URL: https://github.com/kamailio/kamailio/commit/aa9129b71bb009176571a8cb5bde722… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T16:14:52+02:00 core: parser - get_rcv_socket_uri() with option to use advertised address --- Modified: src/core/parser/msg_parser.c Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/aa9129b71bb009176571a8cb5bde722… Patch: https://github.com/kamailio/kamailio/commit/aa9129b71bb009176571a8cb5bde722… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index 84a7ba6ff5..be137652de 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -1105,8 +1105,9 @@ int get_src_uri(sip_msg_t *m, int tmode, str *uri) /** * get received-on-socket ip, port and protocol in SIP URI format * - tmode - 0: short format (transport=udp is not added, being default) + * - atype - 0: listen address; 1: advertised address */ -int get_rcv_socket_uri(sip_msg_t *m, int tmode, str *uri) +int get_rcv_socket_uri(sip_msg_t *m, int tmode, str *uri, int atype) { static char buf[MAX_URI_SIZE]; char* p; @@ -1139,11 +1140,21 @@ int get_rcv_socket_uri(sip_msg_t *m, int tmode, str *uri) } } - ip.s = m->rcv.bind_address->address_str.s; - ip.len = m->rcv.bind_address->address_str.len; + if(atype==0 || m->rcv.bind_address->useinfo.address_str.len<=0) { + ip.s = m->rcv.bind_address->address_str.s; + ip.len = m->rcv.bind_address->address_str.len; + } else { + ip.s = m->rcv.bind_address->useinfo.address_str.s; + ip.len = m->rcv.bind_address->useinfo.address_str.len; + } - port.s = m->rcv.bind_address->port_no_str.s; - port.len = m->rcv.bind_address->port_no_str.len; + if(atype==0|| m->rcv.bind_address->useinfo.port_no_str.len <= 0) { + port.s = m->rcv.bind_address->port_no_str.s; + port.len = m->rcv.bind_address->port_no_str.len; + } else { + port.s = m->rcv.bind_address->useinfo.port_no_str.s; + port.len = m->rcv.bind_address->useinfo.port_no_str.len; + } len = 4 + ip.len + 2*(m->rcv.src_ip.af==AF_INET6)+ 1 + port.len; if (proto.s) { diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index dd5f498a12..41e6deeb33 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -501,6 +501,6 @@ int get_src_uri(sip_msg_t *m, int tmode, str *uri); /** * get received-on-socket ip, port and protocol in SIP URI format */ -int get_rcv_socket_uri(sip_msg_t *m, int tmode, str *uri); +int get_rcv_socket_uri(sip_msg_t *m, int tmode, str *uri, int atype); #endif

1 0

git:master:adeab30b: pv: new variables - $Ru and $Rut
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: adeab30b6bd26b8c4eddd4eb070cb11417401521 URL: https://github.com/kamailio/kamailio/commit/adeab30b6bd26b8c4eddd4eb070cb11… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T15:54:55+02:00 pv: new variables - $Ru and $Rut - $Ru - URI format for local socket where the SIP message was received, without trasport parameter for UDP - $Rut - URI format for local socket where the SIP message was received, always with transport parameter --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/adeab30b6bd26b8c4eddd4eb070cb11… Patch: https://github.com/kamailio/kamailio/commit/adeab30b6bd26b8c4eddd4eb070cb11… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 483faa2d19..4e4eddfecf 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -375,6 +375,12 @@ static pv_export_t mod_pvs[] = { {{"Rp", (sizeof("Rp")-1)}, /* */ PVT_OTHER, pv_get_rcvport, 0, 0, 0, 0, 0}, + {{"Ru", (sizeof("Ru")-1)}, /* */ + PVT_OTHER, pv_get_rcvaddr_uri, 0, + 0, 0, 0, 0}, + {{"Rut", (sizeof("Rut")-1)}, /* */ + PVT_OTHER, pv_get_rcvaddr_uri_full, 0, + 0, 0, 0, 0}, {{"RAi", (sizeof("RAi")-1)}, /* */ PVT_OTHER, pv_get_rcv_advertised_ip, 0, 0, 0, 0, 0}, @@ -408,12 +414,12 @@ static pv_export_t mod_pvs[] = { {{"su", (sizeof("su")-1)}, /* */ PVT_OTHER, pv_get_srcaddr_uri, 0, 0, 0, 0, 0}, - {{"td", (sizeof("td")-1)}, /* */ - PVT_OTHER, pv_get_to_attr, pv_set_to_domain, - 0, 0, pv_init_iname, 3}, {{"sut", (sizeof("sut")-1)}, /* */ PVT_OTHER, pv_get_srcaddr_uri_full, 0, 0, 0, 0, 0}, + {{"td", (sizeof("td")-1)}, /* */ + PVT_OTHER, pv_get_to_attr, pv_set_to_domain, + 0, 0, pv_init_iname, 3}, {{"to.domain", (sizeof("to.domain")-1)}, /* */ PVT_OTHER, pv_get_to_attr, pv_set_to_domain, 0, 0, pv_init_iname, 3}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index acd9105cb2..8e0074fca4 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -751,6 +751,44 @@ int pv_get_rcvport(struct sip_msg *msg, pv_param_t *param, &msg->rcv.bind_address->port_no_str); } +int pv_get_rcvaddr_uri_helper(struct sip_msg *msg, pv_param_t *param, + int tmode, pv_value_t *res) +{ + str uri; + str sr; + + if(msg==NULL) + return -1; + + if(get_rcv_socket_uri(msg, tmode, &uri)<0) + return pv_get_null(msg, param, res); + + if (uri.len + 1 >= pv_get_buffer_size()) + { + LM_ERR("local buffer size exceeded\n"); + return pv_get_null(msg, param, res); + } + + sr.s = pv_get_buffer(); + strncpy(sr.s, uri.s, uri.len); + sr.len = uri.len; + sr.s[sr.len] = '\0'; + + return pv_get_strval(msg, param, res, &sr); +} + +int pv_get_rcvaddr_uri(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + return pv_get_rcvaddr_uri_helper(msg, param, 0, res); +} + +int pv_get_rcvaddr_uri_full(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + return pv_get_rcvaddr_uri_helper(msg, param, 1, res); +} + int pv_get_rcv_advertised_ip(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 905fc89db5..81c86f02a8 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -145,6 +145,12 @@ int pv_get_rcvip(struct sip_msg *msg, pv_param_t *param, int pv_get_rcvport(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_rcvaddr_uri(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + +int pv_get_rcvaddr_uri_full(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + int pv_get_rcv_advertised_ip(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

1 0

git:master:a6d405b1: path: fix for second path insert pointer
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: a6d405b16ba745497ba9890c60541ffdb6cadeab URL: https://github.com/kamailio/kamailio/commit/a6d405b16ba745497ba9890c60541ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T15:53:20+02:00 path: fix for second path insert pointer --- Modified: src/modules/path/path.c --- Diff: https://github.com/kamailio/kamailio/commit/a6d405b16ba745497ba9890c60541ff… Patch: https://github.com/kamailio/kamailio/commit/a6d405b16ba745497ba9890c60541ff… --- diff --git a/src/modules/path/path.c b/src/modules/path/path.c index ecfff280eb..274e6cfc7c 100644 --- a/src/modules/path/path.c +++ b/src/modules/path/path.c @@ -183,7 +183,7 @@ static int prepend_path(sip_msg_t* _m, str *user, path_param_t param, if (!l) goto out1; dp = path_strzdup(suffix, cp - suffix); if(dp==NULL) goto out1; - l = insert_new_lump_before(l, suffix, cp - suffix, 0); + l = insert_new_lump_before(l, dp, cp - suffix, 0); if (!l) goto out1; }

1 0

git:master:1984d4a0: core: parser - helper function to return URI format for local rcv socket
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: 1984d4a063a175803b2852c14dcadd8839b4ad83 URL: https://github.com/kamailio/kamailio/commit/1984d4a063a175803b2852c14dcadd8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T15:53:49+02:00 core: parser - helper function to return URI format for local rcv socket --- Modified: src/core/parser/msg_parser.c Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/1984d4a063a175803b2852c14dcadd8… Patch: https://github.com/kamailio/kamailio/commit/1984d4a063a175803b2852c14dcadd8… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index 2a4f2bb593..84a7ba6ff5 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -1102,6 +1102,91 @@ int get_src_uri(sip_msg_t *m, int tmode, str *uri) return 0; } +/** + * get received-on-socket ip, port and protocol in SIP URI format + * - tmode - 0: short format (transport=udp is not added, being default) + */ +int get_rcv_socket_uri(sip_msg_t *m, int tmode, str *uri) +{ + static char buf[MAX_URI_SIZE]; + char* p; + str ip, port; + int len; + str proto; + + if (!uri || !m || !m->rcv.bind_address) { + ERR("invalid parameter value\n"); + return -1; + } + + if(tmode==0) { + switch(m->rcv.proto) { + case PROTO_NONE: + case PROTO_UDP: + proto.s = 0; /* Do not add transport parameter, UDP is default */ + proto.len = 0; + break; + default: + if(get_valid_proto_string(m->rcv.proto, 1, 0, &proto)<0) { + ERR("unknown transport protocol\n"); + return -1; + } + } + } else { + if(get_valid_proto_string(m->rcv.proto, 1, 0, &proto)<0) { + ERR("unknown transport protocol\n"); + return -1; + } + } + + ip.s = m->rcv.bind_address->address_str.s; + ip.len = m->rcv.bind_address->address_str.len; + + port.s = m->rcv.bind_address->port_no_str.s; + port.len = m->rcv.bind_address->port_no_str.len; + + len = 4 + ip.len + 2*(m->rcv.src_ip.af==AF_INET6)+ 1 + port.len; + if (proto.s) { + len += TRANSPORT_PARAM_LEN; + len += proto.len; + } + + if (len > MAX_URI_SIZE) { + ERR("buffer too small\n"); + return -1; + } + + p = buf; + memcpy(p, "sip:", 4); + p += 4; + + if (m->rcv.src_ip.af==AF_INET6) + *p++ = '['; + memcpy(p, ip.s, ip.len); + p += ip.len; + if (m->rcv.src_ip.af==AF_INET6) + *p++ = ']'; + + *p++ = ':'; + + memcpy(p, port.s, port.len); + p += port.len; + + if (proto.s) { + memcpy(p, TRANSPORT_PARAM, TRANSPORT_PARAM_LEN); + p += TRANSPORT_PARAM_LEN; + + memcpy(p, proto.s, proto.len); + p += proto.len; + } + + uri->s = buf; + uri->len = len; + + return 0; +} + + /*! \brief returns a pointer to the begining of the msg's body */ char* get_body(sip_msg_t* const msg) diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 13a30d1570..dd5f498a12 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -498,4 +498,9 @@ void msg_ldata_reset(sip_msg_t*); */ int get_src_uri(sip_msg_t *m, int tmode, str *uri); +/** + * get received-on-socket ip, port and protocol in SIP URI format + */ +int get_rcv_socket_uri(sip_msg_t *m, int tmode, str *uri); + #endif

1 0

git:master:8f242cfb: path: documentation for enable_r2 and received_format parameters
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: 8f242cfb151bbe4fdf4101f4bde59083307e6f8a URL: https://github.com/kamailio/kamailio/commit/8f242cfb151bbe4fdf4101f4bde5908… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T15:52:54+02:00 path: documentation for enable_r2 and received_format parameters --- Modified: src/modules/path/doc/path_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8f242cfb151bbe4fdf4101f4bde5908… Patch: https://github.com/kamailio/kamailio/commit/8f242cfb151bbe4fdf4101f4bde5908… --- diff --git a/src/modules/path/doc/path_admin.xml b/src/modules/path/doc/path_admin.xml index 31b8a572d9..4712a09716 100644 --- a/src/modules/path/doc/path_admin.xml +++ b/src/modules/path/doc/path_admin.xml @@ -143,6 +143,63 @@ modparam("path", "use_received", 1) </programlisting> </example> </section> + <section id="path.p.received_format"> + <title><varname>received_format</varname> (int)</title> + <para> + If set to 0, the <quote>received</quote> parameter value will be + in the escaped SIP URI format. + </para> + <para> + If set to 1, the <quote>received</quote> parameter value will be + in the same format as the <quote>alias</quote> parameter added by + set_contact_alias() from <quote>nathelper</quote> module (i.e., + <quote>ip~port~protid</quote>). This is a solution with some + SIP applications that incorrectly match the transport from + received parameter instead of the one from the SIP URI. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>received_format</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("path", "received_format", 1) +... +</programlisting> + </example> + </section> + <section id="path.p.enable_r2"> + <title><varname>enable_r2</varname> (int)</title> + <para> + If set to 1, the module will add two Path headers, similar to the + double Record-Route done by rr module. One Path headers corresponds + to incoming network socket and the other to outgoing network socket. + The URIs in the Path headers will have the 'r2=on' parameter as well. + </para> + <para> + Note: if enabled, the module adds the two Path headers even when the + incoming socket is the same as outgoing socket. Improvements to skip + the second Path header in this case may be introduced in the future, + meanwhile, if you need to enable this parameter but also deal with + same socket routing, use 'insert_hf("Path: <$Ru>\r\n")'. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>use_received</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("path", "use_received", 1) +... +</programlisting> + </example> + </section> </section> <section>

1 0

git:master:e518e5e7: rr: small formatting adjustments to doc examples
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: e518e5e7a50be3510c896bd5f8a4cc38146631cc URL: https://github.com/kamailio/kamailio/commit/e518e5e7a50be3510c896bd5f8a4cc3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T15:09:18+02:00 rr: small formatting adjustments to doc examples --- Modified: src/modules/rr/doc/rr_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e518e5e7a50be3510c896bd5f8a4cc3… Patch: https://github.com/kamailio/kamailio/commit/e518e5e7a50be3510c896bd5f8a4cc3… --- diff --git a/src/modules/rr/doc/rr_admin.xml b/src/modules/rr/doc/rr_admin.xml index 3e7138ce05..b64930a665 100644 --- a/src/modules/rr/doc/rr_admin.xml +++ b/src/modules/rr/doc/rr_admin.xml @@ -60,7 +60,7 @@ <title>Dialog support in RR module</title> <programlisting format="linespecific"> - +... UAC &kamailio; PROXY UAS ---- INVITE ------> record_route() ----- INVITE ----> @@ -74,7 +74,7 @@ UAC &kamailio; PROXY UAS <------ BYE ------- loose_route() <----- BYE ------- check_route_param(";foo=true") - +... </programlisting> </example> </section> @@ -264,7 +264,6 @@ modparam("rr", "custom_user_avp", "$avp(RR_CUSTOMER_USER_AVP)") #usage in cfg file $avp(RR_CUSTOM_USER_AVP)="mo"; record_route(); - ... </programlisting> </example>

1 0

git:master:9c9da879: core: remove inline from implementation of functions declared without it
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: 9c9da87943ad86fd4ca3ba8b007cebfcb7d9bc61 URL: https://github.com/kamailio/kamailio/commit/9c9da87943ad86fd4ca3ba8b007cebf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T15:02:30+02:00 core: remove inline from implementation of functions declared without it --- Modified: src/core/parser/parse_uri.c Modified: src/core/parser/parse_uri.h --- Diff: https://github.com/kamailio/kamailio/commit/9c9da87943ad86fd4ca3ba8b007cebf… Patch: https://github.com/kamailio/kamailio/commit/9c9da87943ad86fd4ca3ba8b007cebf… --- diff --git a/src/core/parser/parse_uri.c b/src/core/parser/parse_uri.c index 71d56f55c9..0661ce4bfa 100644 --- a/src/core/parser/parse_uri.c +++ b/src/core/parser/parse_uri.c @@ -1305,7 +1305,7 @@ static inline int _parse_ruri(str *uri, if (*status) return 1; if (parse_uri(uri->s, uri->len, parsed_uri)<0) { - LOG(L_ERR, "ERROR: _parse_ruri: bad uri <%.*s>\n", + LOG(L_ERR, "ERROR: _parse_ruri: bad uri <%.*s>\n", uri->len, ZSW(uri->s)); *status=0; return -1; @@ -1347,7 +1347,8 @@ int parse_orig_ruri(struct sip_msg* msg) return ret; } -inline int normalize_tel_user(char* res, str* src) { +int normalize_tel_user(char* res, str* src) +{ int i, l; l=0; for (i=0; i<src->len; i++) { @@ -1360,7 +1361,7 @@ inline int normalize_tel_user(char* res, str* src) { default: res[l++]=src->s[i]; } - } + } return l; } @@ -1372,7 +1373,7 @@ str s_tels = STR_STATIC_INIT("tels"); str s_urn = STR_STATIC_INIT("urn"); static str s_null = STR_STATIC_INIT(""); -inline void uri_type_to_str(uri_type type, str *s) { +void uri_type_to_str(uri_type type, str *s) { switch (type) { case SIP_URI_T: *s = s_sip; @@ -1400,7 +1401,7 @@ static str s_tls = STR_STATIC_INIT("tls"); static str s_sctp = STR_STATIC_INIT("sctp"); static str s_ws = STR_STATIC_INIT("ws"); -inline void proto_type_to_str(unsigned short type, str *s) { +void proto_type_to_str(unsigned short type, str *s) { switch (type) { case PROTO_UDP: *s = s_udp; diff --git a/src/core/parser/parse_uri.h b/src/core/parser/parse_uri.h index 1638e264f5..a3c8c7142c 100644 --- a/src/core/parser/parse_uri.h +++ b/src/core/parser/parse_uri.h @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -39,7 +39,7 @@ extern str s_sip, s_sips, s_tel, s_tels, s_urn; /* buf= pointer to begining of uri (sip:x@foo.bar:5060;a=b?h=i) * len= len of uri - * returns: fills uri & returns <0 on error or 0 if ok + * returns: fills uri & returns <0 on error or 0 if ok */ int parse_uri(char *buf, int len, struct sip_uri* uri); int parse_sip_msg_uri(struct sip_msg* msg);

1 0

git:master:2c62b317: path: option to add two path headers and use alias like received value
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: 2c62b317065f36606cfb22822e65c00f129b4739 URL: https://github.com/kamailio/kamailio/commit/2c62b317065f36606cfb22822e65c00… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T15:04:31+02:00 path: option to add two path headers and use alias like received value - enable_r2 - add two path headers, one for incoming socket and one for outgoing socket - received_format - parameter to control if received value should be in sip uri (as so far) or in contact-alias param format --- Modified: src/modules/path/path.c Modified: src/modules/path/path.h Modified: src/modules/path/path_mod.c Modified: src/modules/path/path_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/2c62b317065f36606cfb22822e65c00… Patch: https://github.com/kamailio/kamailio/commit/2c62b317065f36606cfb22822e65c00…

1 0

git:master:a69a5135: core: mem/fm - replaced old log macros
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: a69a5135cd70919c2207a0a747b1d850fd48d35c URL: https://github.com/kamailio/kamailio/commit/a69a5135cd70919c2207a0a747b1d85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T09:50:00+02:00 core: mem/fm - replaced old log macros --- Modified: src/core/mem/f_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/a69a5135cd70919c2207a0a747b1d85… Patch: https://github.com/kamailio/kamailio/commit/a69a5135cd70919c2207a0a747b1d85…

1 0

git:5.0:d49131e0: presence: subsription double delete fix
by Juha Heinanen 26 Jun '17

26 Jun '17

Module: kamailio Branch: 5.0 Commit: d49131e05033a78585bebea1bce503e97274a24e URL: https://github.com/kamailio/kamailio/commit/d49131e05033a78585bebea1bce503e… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2017-06-26T18:06:39+03:00 presence: subsription double delete fix - if timeout_rm_subs parameter set to "1" and NOTIFY timeout about expired subsription (cherry picked from commit 8e185ddf8e81af8d6283a87ec95116965235752a) --- Modified: src/modules/presence/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/d49131e05033a78585bebea1bce503e… Patch: https://github.com/kamailio/kamailio/commit/d49131e05033a78585bebea1bce503e… --- diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c index e5cd1cdf42..63307c7e2e 100644 --- a/src/modules/presence/notify.c +++ b/src/modules/presence/notify.c @@ -1847,7 +1847,7 @@ void p_tm_callback( struct cell *t, int type, struct tmcb_params *ps) if(ps->code == 404 || ps->code == 481 - || (ps->code == 408 && timeout_rm_subs) + || (ps->code == 408 && timeout_rm_subs && subs->status != TERMINATED_STATUS) || pres_get_delete_sub()) { delete_subs(&subs->pres_uri, &subs->event->name, &subs->to_tag, &subs->from_tag, &subs->callid);

1 0

presence: subsription double delete fix
by Juha Heinanen 26 Jun '17

26 Jun '17

How about backporting this fix to 5.0? https://github.com/kamailio/kamailio/commit/8e185ddf8e81af8d6283a87ec951169… -- Juha

2 1

[kamailio/kamailio] htable race condition on expired keys (#1152)
by lazedo 26 Jun '17

26 Jun '17

related to https://github.com/kamailio/kamailio/commit/be46742ebe162a2c48ee5ce27e09497… the below patch solves it, but i'm not sure of the implications why not let the expire routine do its job instead of checking expiration when adding a value ? also moved the `ht_handle_expired_record` after the record is removed ``` diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index 1bbd079..92a9421 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -674,29 +674,29 @@ && strncmp(name->s, it->name.s, name->len)==0) { /* found */ - if(now>0 && it->expire!=0 && it->expire<now) { - /* entry has expired */ - ht_handle_expired_record(ht, it); - - if(ht->flags==PV_VAL_INT) { - /* initval is integer, use it to create a fresh entry */ - it->flags &= ~AVP_VAL_STR; - it->value.n = ht->initval.n; - /* increment will be done below */ - } else { - /* delete expired entry */ - if(it->prev==NULL) - ht->entries[idx].first = it->next; - else - it->prev->next = it->next; - if(it->next) - it->next->prev = it->prev; - ht->entries[idx].esize--; - if(mode) ht_slot_unlock(ht, idx); - ht_cell_free(it); - return NULL; - } - } +// if(now>0 && it->expire!=0 && it->expire<now) { +// /* entry has expired */ +// ht_handle_expired_record(ht, it); +// +// if(ht->flags==PV_VAL_INT) { +// /* initval is integer, use it to create a fresh entry */ +// it->flags &= ~AVP_VAL_STR; +// it->value.n = ht->initval.n; +// /* increment will be done below */ +// } else { +// /* delete expired entry */ +// if(it->prev==NULL) +// ht->entries[idx].first = it->next; +// else +// it->prev->next = it->next; +// if(it->next) +// it->next->prev = it->prev; +// ht->entries[idx].esize--; +// if(mode) ht_slot_unlock(ht, idx); +// ht_cell_free(it); +// return NULL; +// } +// } /* update value */ if(it->flags&AVP_VAL_STR) { @@ -803,21 +803,21 @@ && strncmp(name->s, it->name.s, name->len)==0) { /* found */ - if(ht->htexpire>0 && it->expire!=0 && it->expire<time(NULL)) { - /* entry has expired, delete it and return NULL */ - ht_handle_expired_record(ht, it); - - if(it->prev==NULL) - ht->entries[idx].first = it->next; - else - it->prev->next = it->next; - if(it->next) - it->next->prev = it->prev; - ht->entries[idx].esize--; - ht_slot_unlock(ht, idx); - ht_cell_free(it); - return NULL; - } +// if(ht->htexpire>0 && it->expire!=0 && it->expire<time(NULL)) { +// /* entry has expired, delete it and return NULL */ +// ht_handle_expired_record(ht, it); +// +// if(it->prev==NULL) +// ht->entries[idx].first = it->next; +// else +// it->prev->next = it->next; +// if(it->next) +// it->next->prev = it->prev; +// ht->entries[idx].esize--; +// ht_slot_unlock(ht, idx); +// ht_cell_free(it); +// return NULL; +// } if(old!=NULL) { if(old->msize>=it->msize) @@ -1056,7 +1056,6 @@ if(it->expire!=0 && it->expire<now) { /* expired */ - ht_handle_expired_record(ht, it); if(it->prev==NULL) ht->entries[i].first = it->next; else @@ -1064,6 +1063,7 @@ if(it->next) it->next->prev = it->prev; ht->entries[i].esize--; + ht_handle_expired_record(ht, it); ht_cell_free(it); } it = it0; ``` -- 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/issues/1152

2 10

git:5.0:8038327f: htable: do not call expired event route on get/add operations
by Daniel-Constantin Mierla 26 Jun '17

26 Jun '17

Module: kamailio Branch: 5.0 Commit: 8038327f7c0c6e64899072f1c778699f040b2a0a URL: https://github.com/kamailio/kamailio/commit/8038327f7c0c6e64899072f1c778699… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-26T14:02:34+02:00 htable: do not call expired event route on get/add operations - have consistent behaviour with set operation - avoid accessing the same (expired) item twice, second after being removed if the item is accessed in the event route - reported by GH #1152 (cherry picked from commit 4514c91883d67ee062582aed7b414633609cf6ac) --- Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_var.c --- Diff: https://github.com/kamailio/kamailio/commit/8038327f7c0c6e64899072f1c778699… Patch: https://github.com/kamailio/kamailio/commit/8038327f7c0c6e64899072f1c778699… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index 4c4ba5315b..a6e9c0eba6 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -676,7 +676,6 @@ ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, /* found */ if(now>0 && it->expire!=0 && it->expire<now) { /* entry has expired */ - ht_handle_expired_record(ht, it); if(ht->flags==PV_VAL_INT) { /* initval is integer, use it to create a fresh entry */ @@ -684,16 +683,7 @@ ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, it->value.n = ht->initval.n; /* increment will be done below */ } else { - /* delete expired entry */ - if(it->prev==NULL) - ht->entries[idx].first = it->next; - else - it->prev->next = it->next; - if(it->next) - it->next->prev = it->prev; - ht->entries[idx].esize--; if(mode) ht_slot_unlock(ht, idx); - ht_cell_free(it); return NULL; } } @@ -804,18 +794,8 @@ ht_cell_t* ht_cell_pkg_copy(ht_t *ht, str *name, ht_cell_t *old) { /* found */ if(ht->htexpire>0 && it->expire!=0 && it->expire<time(NULL)) { - /* entry has expired, delete it and return NULL */ - ht_handle_expired_record(ht, it); - - if(it->prev==NULL) - ht->entries[idx].first = it->next; - else - it->prev->next = it->next; - if(it->next) - it->next->prev = it->prev; - ht->entries[idx].esize--; + /* entry has expired, return NULL */ ht_slot_unlock(ht, idx); - ht_cell_free(it); return NULL; } if(old!=NULL) diff --git a/src/modules/htable/ht_var.c b/src/modules/htable/ht_var.c index 522811da58..c928bf1b49 100644 --- a/src/modules/htable/ht_var.c +++ b/src/modules/htable/ht_var.c @@ -91,7 +91,9 @@ int pv_set_ht_cell(struct sip_msg* msg, pv_param_t *param, if((val==NULL) || (val->flags&PV_VAL_NULL)) { /* delete it */ - if (hpv->ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_DEL_CELL, &hpv->htname, &htname, 0, NULL, 0)!=0) { + if (hpv->ht->dmqreplicate>0 + && ht_dmq_replicate_action(HT_DMQ_DEL_CELL, &hpv->htname, + &htname, 0, NULL, 0)!=0) { LM_ERR("dmq relication failed\n"); } ht_del_cell(hpv->ht, &htname); @@ -101,7 +103,9 @@ int pv_set_ht_cell(struct sip_msg* msg, pv_param_t *param, if(val->flags&PV_TYPE_INT) { isval.n = val->ri; - if (hpv->ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_SET_CELL, &hpv->htname, &htname, 0, &isval, 1)!=0) { + if (hpv->ht->dmqreplicate>0 + && ht_dmq_replicate_action(HT_DMQ_SET_CELL, &hpv->htname, + &htname, 0, &isval, 1)!=0) { LM_ERR("dmq relication failed\n"); } if(ht_set_cell(hpv->ht, &htname, 0, &isval, 1)!=0) @@ -111,7 +115,9 @@ int pv_set_ht_cell(struct sip_msg* msg, pv_param_t *param, } } else { isval.s = val->rs; - if (hpv->ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_SET_CELL, &hpv->htname, &htname, AVP_VAL_STR, &isval, 1)!=0) { + if (hpv->ht->dmqreplicate>0 + && ht_dmq_replicate_action(HT_DMQ_SET_CELL, &hpv->htname, + &htname, AVP_VAL_STR, &isval, 1)!=0) { LM_ERR("dmq relication failed\n"); } if(ht_set_cell(hpv->ht, &htname, AVP_VAL_STR, &isval, 1)!=0)

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev