sr-dev February 2019

sr-dev@lists.kamailio.org

23 participants
336 discussions

git:master:73d29ddd: siputils: Return true if options_reply() succeeds

by Henning Westerholt

Module: kamailio Branch: master Commit: 73d29ddde2b38cfea2c9ca4a84f4b8a246b7da50 URL: https://github.com/kamailio/kamailio/commit/73d29ddde2b38cfea2c9ca4a84f4b8a… Author: Alex Hermann <alex(a)hexla.nl> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-02-05T21:11:03+01:00 siputils: Return true if options_reply() succeeds --- Modified: src/modules/siputils/options.c --- Diff: https://github.com/kamailio/kamailio/commit/73d29ddde2b38cfea2c9ca4a84f4b8a… Patch: https://github.com/kamailio/kamailio/commit/73d29ddde2b38cfea2c9ca4a84f4b8a… --- diff --git a/src/modules/siputils/options.c b/src/modules/siputils/options.c index 67cf07856d..484c65f75f 100644 --- a/src/modules/siputils/options.c +++ b/src/modules/siputils/options.c @@ -112,7 +112,7 @@ int opt_reply(struct sip_msg* _msg, char* _foo, char* _bar) { return -1; } else - return 0; + return 1; } else { pkg_free(rpl_hf.s); LM_ERR("add_lump_rpl failed\n"); @@ -124,6 +124,6 @@ int opt_reply(struct sip_msg* _msg, char* _foo, char* _bar) { return -1; } else - return 0; + return 1; }

5 years, 9 months

git:master:0125c1c8: jansson: Fix reverse logic for JSON boolean

by Henning Westerholt

Module: kamailio Branch: master Commit: 0125c1c8d8c1179670def9dc4b3e66d6a8e58360 URL: https://github.com/kamailio/kamailio/commit/0125c1c8d8c1179670def9dc4b3e66d… Author: Alex Hermann <alex(a)hexla.nl> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-02-05T21:11:03+01:00 jansson: Fix reverse logic for JSON boolean --- Modified: src/modules/jansson/jansson_utils.c --- Diff: https://github.com/kamailio/kamailio/commit/0125c1c8d8c1179670def9dc4b3e66d… Patch: https://github.com/kamailio/kamailio/commit/0125c1c8d8c1179670def9dc4b3e66d… --- diff --git a/src/modules/jansson/jansson_utils.c b/src/modules/jansson/jansson_utils.c index 29ffc306f6..ae2040bc7c 100644 --- a/src/modules/jansson/jansson_utils.c +++ b/src/modules/jansson/jansson_utils.c @@ -45,7 +45,7 @@ int jansson_to_val(pv_value_t* val, char** freeme, json_t* v) { val->rs.len = strlen(value); val->flags = PV_VAL_STR; }else if(json_is_boolean(v)) { - val->ri = json_is_true(v) ? 0 : 1; + val->ri = json_is_true(v) ? 1 : 0; val->flags = PV_TYPE_INT|PV_VAL_INT; }else if(json_is_real(v)) { char* value = NULL;

5 years, 9 months

git:master:684da612: dispatcher: remove duplicate code in ds_load_remove()

by Henning Westerholt

Module: kamailio Branch: master Commit: 684da61208bcf5a3077a931b2808563d4d71e0e8 URL: https://github.com/kamailio/kamailio/commit/684da61208bcf5a3077a931b2808563… Author: Alex Hermann <alex(a)hexla.nl> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-02-05T21:11:03+01:00 dispatcher: remove duplicate code in ds_load_remove() --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/684da61208bcf5a3077a931b2808563… Patch: https://github.com/kamailio/kamailio/commit/684da61208bcf5a3077a931b2808563… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 727dbe0cc0..9255e9eae6 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -1613,83 +1613,57 @@ int ds_load_replace(struct sip_msg *msg, str *duid) /** * */ -int ds_load_remove(struct sip_msg *msg) +int ds_load_remove_byid(int set, str *duid) { - ds_cell_t *it; - int set; int olddst; ds_set_t *idx = NULL; int i; - if((it = ds_get_cell(_dsht_load, &msg->callid->body)) == NULL) { - LM_ERR("cannot find load for (%.*s)\n", msg->callid->body.len, - msg->callid->body.s); - return -1; - } - set = it->dset; /* get the index of the set */ if(ds_get_index(set, *crt_idx, &idx) != 0) { - ds_unlock_cell(_dsht_load, &msg->callid->body); LM_ERR("destination set [%d] not found\n", set); return -1; } olddst = -1; for(i = 0; i < idx->nr; i++) { - if(idx->dlist[i].attrs.duid.len == it->duid.len - && strncasecmp( - idx->dlist[i].attrs.duid.s, it->duid.s, it->duid.len) + if(idx->dlist[i].attrs.duid.len == duid->len + && strncasecmp(idx->dlist[i].attrs.duid.s, duid->s, duid->len) == 0) { olddst = i; break; } } if(olddst == -1) { - ds_unlock_cell(_dsht_load, &msg->callid->body); LM_ERR("old destination address not found for [%d, %.*s]\n", set, - it->duid.len, it->duid.s); + duid->len, duid->s); return -1; } - ds_unlock_cell(_dsht_load, &msg->callid->body); - ds_del_cell(_dsht_load, &msg->callid->body); if(idx->dlist[olddst].dload > 0) idx->dlist[olddst].dload--; return 0; } - /** * */ -int ds_load_remove_byid(int set, str *duid) +int ds_load_remove(struct sip_msg *msg) { - int olddst; - ds_set_t *idx = NULL; - int i; + ds_cell_t *it; - /* get the index of the set */ - if(ds_get_index(set, *crt_idx, &idx) != 0) { - LM_ERR("destination set [%d] not found\n", set); + if((it = ds_get_cell(_dsht_load, &msg->callid->body)) == NULL) { + LM_ERR("cannot find load for (%.*s)\n", msg->callid->body.len, + msg->callid->body.s); return -1; } - olddst = -1; - for(i = 0; i < idx->nr; i++) { - if(idx->dlist[i].attrs.duid.len == duid->len - && strncasecmp(idx->dlist[i].attrs.duid.s, duid->s, duid->len) - == 0) { - olddst = i; - break; - } - } - if(olddst == -1) { - LM_ERR("old destination address not found for [%d, %.*s]\n", set, - duid->len, duid->s); + + if (ds_load_remove_byid(it->dset, &it->duid) < 0) { + ds_unlock_cell(_dsht_load, &msg->callid->body); return -1; } - - if(idx->dlist[olddst].dload > 0) - idx->dlist[olddst].dload--; + ds_unlock_cell(_dsht_load, &msg->callid->body); + ds_del_cell(_dsht_load, &msg->callid->body); return 0; }

5 years, 9 months

git:master:7a66f445: dispatcher: Stop searching if entry is found

by Henning Westerholt

Module: kamailio Branch: master Commit: 7a66f44506e4897fef68b5ff927cf276678d3473 URL: https://github.com/kamailio/kamailio/commit/7a66f44506e4897fef68b5ff927cf27… Author: Alex Hermann <alex(a)hexla.nl> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-02-05T21:11:03+01:00 dispatcher: Stop searching if entry is found --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/7a66f44506e4897fef68b5ff927cf27… Patch: https://github.com/kamailio/kamailio/commit/7a66f44506e4897fef68b5ff927cf27… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 072869010e..727dbe0cc0 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2590,7 +2590,6 @@ int ds_update_latency(int group, str *address, int code) int ds_get_state(int group, str *address) { int i = 0; - int state = 0; ds_set_t *idx = NULL; if(_ds_list == NULL || _ds_list_nr <= 0) { @@ -2609,11 +2608,11 @@ int ds_get_state(int group, str *address) && strncasecmp(idx->dlist[i].uri.s, address->s, address->len) == 0) { /* destination address found */ - state = idx->dlist[i].flags; + return idx->dlist[i].flags; } i++; } - return state; + return 0; } /**

5 years, 9 months

git:master:614b6b05: dispatcher: Fix memleak in destination attributes

by Henning Westerholt

Module: kamailio Branch: master Commit: 614b6b05028ea8d364f7acb95a6367f7c9ea1a6d URL: https://github.com/kamailio/kamailio/commit/614b6b05028ea8d364f7acb95a6367f… Author: Alex Hermann <alex(a)hexla.nl> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-02-05T21:11:03+01:00 dispatcher: Fix memleak in destination attributes --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/614b6b05028ea8d364f7acb95a6367f… Patch: https://github.com/kamailio/kamailio/commit/614b6b05028ea8d364f7acb95a6367f… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 4956623cc7..072869010e 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -461,6 +461,8 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs) if(dp != NULL) { if(dp->uri.s != NULL) shm_free(dp->uri.s); + if(dp->attrs.body.s != NULL) + shm_free(dp->attrs.body.s); shm_free(dp); } @@ -517,6 +519,8 @@ int add_dest2list(int id, str uri, int flags, int priority, str *attrs, if(dp != NULL) { if(dp->uri.s != NULL) shm_free(dp->uri.s); + if(dp->attrs.body.s != NULL) + shm_free(dp->attrs.body.s); shm_free(dp); } @@ -3306,6 +3310,10 @@ void ds_avl_destroy(ds_set_t **node_ptr) shm_free(dest->uri.s); dest->uri.s = NULL; } + if (dest->attrs.body.s != NULL) { + shm_free(dest->attrs.body.s); + dest->attrs.body.s = NULL; + } } if(node->dlist != NULL) shm_free(node->dlist);

5 years, 9 months

git:master:499c45fd: Merge pull request #1835 from ycaner06/patch-13

by GitHub

Module: kamailio Branch: master Commit: 499c45fd8cb8dbf7afcf34d938d48e289422a3af URL: https://github.com/kamailio/kamailio/commit/499c45fd8cb8dbf7afcf34d938d48e2… Author: ng-voice GmbH <info(a)ng-voice.com> Committer: GitHub <noreply(a)github.com> Date: 2019-02-05T07:53:19+01:00 Merge pull request #1835 from ycaner06/patch-13 ims_usrloc_scscf : documentation is added --- Added: src/modules/ims_usrloc_scscf/doc/Makefile Added: src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf.xml Added: src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_admin.xml Added: src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_faq.xml Modified: src/modules/ims_registrar_scscf/config.c Removed: src/modules/ims_registrar_scscf/screensharing.log Removed: src/modules/ims_usrloc_scscf/NewFile.xml --- Diff: https://github.com/kamailio/kamailio/commit/499c45fd8cb8dbf7afcf34d938d48e2… Patch: https://github.com/kamailio/kamailio/commit/499c45fd8cb8dbf7afcf34d938d48e2…

5 years, 9 months

git:master:44049e9a: ims_usrloc_scscf: doc is added

by Yasin CANER

Module: kamailio Branch: master Commit: 44049e9a9793824a8ef09759813b3cc8b5864103 URL: https://github.com/kamailio/kamailio/commit/44049e9a9793824a8ef09759813b3cc… Author: Yasin CANER <caner_yaso(a)hotmail.com> Committer: Yasin CANER <caner_yaso(a)hotmail.com> Date: 2019-02-04T21:09:24+03:00 ims_usrloc_scscf: doc is added documentation is added for ims_usrloc_scscf --- Added: src/modules/ims_usrloc_scscf/doc/Makefile Added: src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf.xml Added: src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_admin.xml Added: src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_faq.xml --- Diff: https://github.com/kamailio/kamailio/commit/44049e9a9793824a8ef09759813b3cc… Patch: https://github.com/kamailio/kamailio/commit/44049e9a9793824a8ef09759813b3cc…

5 years, 9 months

git:master:e5fb74f6: ims_usrloc_scscf: removed NewFile.xml file

by Yasin CANER

Module: kamailio Branch: master Commit: e5fb74f6d37b3168c7b6b1c58ce783e453b40a88 URL: https://github.com/kamailio/kamailio/commit/e5fb74f6d37b3168c7b6b1c58ce783e… Author: Yasin CANER <caner_yaso(a)hotmail.com> Committer: Yasin CANER <caner_yaso(a)hotmail.com> Date: 2019-02-03T16:48:17+03:00 ims_usrloc_scscf: removed NewFile.xml file --- Removed: src/modules/ims_usrloc_scscf/NewFile.xml --- Diff: https://github.com/kamailio/kamailio/commit/e5fb74f6d37b3168c7b6b1c58ce783e… Patch: https://github.com/kamailio/kamailio/commit/e5fb74f6d37b3168c7b6b1c58ce783e… --- diff --git a/src/modules/ims_usrloc_scscf/NewFile.xml b/src/modules/ims_usrloc_scscf/NewFile.xml deleted file mode 100644 index 4cf67f074c..0000000000 --- a/src/modules/ims_usrloc_scscf/NewFile.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0"?> -<methodResponse> -<params> -<param> -<value><struct><member><name>Domain</name><value><string>location</string></value></member><member><name>Size</name><value><int>512</int></value></member><member><name>IMPUs</name><value><struct><member><name>IMPU</name><value><struct><member><name>IMPU</name><value><string>sip:123456789012345@ims.smilecoms.com</string></value></member><member><name>IMPI/Subscription</name><value><string>123456789012345(a)private.ims.smilecoms.com</string></value></member><member><name>State</name><value><string>registered</string></value></member><member><name>Barred</name><value><int>1</int></value></member><member><name>ccf1</name><value><string>aaa://priccfaddress:1234</string></value></member><member><name>ecf1</name><value><string></string></value></member><member><name>ccf2</name><value><string></string></value></member><member><name>ecf2</name><value><string></string></value></member></struct></value></member><member><name>IMPU</name><value><struct><member><name>IMPU</name><value><string>sip:27832837000@ims.smilecoms.com</string></value></member><member><name>IMPI/Subscription</name><value><string>123456789012345(a)private.ims.smilecoms.com</string></value></member><member><name>State</name><value><string>registered</string></value></member><member><name>Barred</name><value><int>0</int></value></member><member><name>ccf1</name><value><string>aaa://priccfaddress:1234</string></value></member><member><name>ecf1</name><value><string></string></value></member><member><name>ccf2</name><value><string></string></value></member><member><name>ecf2</name><value><string></string></value></member></struct></value></member></struct></value></member><member><name>Stats</name><value><struct><member><name>Records</name><value><int>2</int></value></member><member><name>Max-Slots</name><value><int>1</int></value></member></struct></value></member></struct> -</value> -</param> -</params> -</methodResponse> \ No newline at end of file

5 years, 9 months

git:master:03c9259d: ims_registrar_scscf: removed screensharing log file.

by Yasin CANER

Module: kamailio Branch: master Commit: 03c9259d87275e63cc8ea8fbc1406ef95f04d186 URL: https://github.com/kamailio/kamailio/commit/03c9259d87275e63cc8ea8fbc1406ef… Author: Yasin CANER <caner_yaso(a)hotmail.com> Committer: Yasin CANER <caner_yaso(a)hotmail.com> Date: 2019-02-03T16:46:00+03:00 ims_registrar_scscf: removed screensharing log file. unnecessary log file removed --- Removed: src/modules/ims_registrar_scscf/screensharing.log --- Diff: https://github.com/kamailio/kamailio/commit/03c9259d87275e63cc8ea8fbc1406ef… Patch: https://github.com/kamailio/kamailio/commit/03c9259d87275e63cc8ea8fbc1406ef…

5 years, 9 months

git:master:7f217aa5: ims_registrar_scscf : fixed wrong comment for emergency register

by GitHub

Module: kamailio Branch: master Commit: 7f217aa53262a4d4d9c99239eda335b954d08179 URL: https://github.com/kamailio/kamailio/commit/7f217aa53262a4d4d9c99239eda335b… Author: Yasin CANER <caner_yaso(a)hotmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-02-03T16:42:08+03:00 ims_registrar_scscf : fixed wrong comment for emergency register ims_registrar_scscf : fixed wrong comment for emergency register --- Modified: src/modules/ims_registrar_scscf/config.c --- Diff: https://github.com/kamailio/kamailio/commit/7f217aa53262a4d4d9c99239eda335b… Patch: https://github.com/kamailio/kamailio/commit/7f217aa53262a4d4d9c99239eda335b… --- diff --git a/src/modules/ims_registrar_scscf/config.c b/src/modules/ims_registrar_scscf/config.c index c81114f48c..0c55f11100 100644 --- a/src/modules/ims_registrar_scscf/config.c +++ b/src/modules/ims_registrar_scscf/config.c @@ -36,8 +36,8 @@ struct cfg_group_registrar default_registrar_cfg = { 60, /* min_expires */ 0, /* max_expires */ 3600, /* emergency contact default expires */ - 60, /* emergency contact min expires */ - 0, /* emergency contact max expires */ + 60, /* emergency contact max expires */ + 0, /* emergency contact min expires */ 0, /* max_contacts */ 0, /* retry_after */ 0, /* case_sensitive */

5 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2019