- sr-dev - kamailio.org

git:master:4038a604: jansson: Log column on parse error
by Henning Westerholt 05 Feb '19

05 Feb '19

Module: kamailio Branch: master Commit: 4038a6046bc34c92313817549c93a9f16e993032 URL: https://github.com/kamailio/kamailio/commit/4038a6046bc34c92313817549c93a9f… 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: Log column on parse error --- Modified: src/modules/jansson/jansson_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/4038a6046bc34c92313817549c93a9f… Patch: https://github.com/kamailio/kamailio/commit/4038a6046bc34c92313817549c93a9f… --- diff --git a/src/modules/jansson/jansson_funcs.c b/src/modules/jansson/jansson_funcs.c index 012f1aba40..7eceae4e96 100644 --- a/src/modules/jansson/jansson_funcs.c +++ b/src/modules/jansson/jansson_funcs.c @@ -41,9 +41,9 @@ int janssonmod_get_helper(sip_msg_t* msg, str *path_s, str *src_s, pv_spec_t *ds json = json_loads(src_s->s, JSON_REJECT_DUPLICATES, &parsing_error); if(!json) { - ERR("failed to parse: %.*s\n", src_s->len, src_s->s); - ERR("json error at line %d: %s\n", - parsing_error.line, parsing_error.text); + ERR("failed to parse json: %.*s\n", src_s->len, src_s->s); + ERR("json error at line %d, col %d: %s\n", + parsing_error.line, parsing_error.column, parsing_error.text); goto fail; }

1 0

git:master:0125c1c8: jansson: Fix reverse logic for JSON boolean
by Henning Westerholt 05 Feb '19

05 Feb '19

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;

1 0

git:master:73d29ddd: siputils: Return true if options_reply() succeeds
by Henning Westerholt 05 Feb '19

05 Feb '19

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; }

1 0

git:master:7a66f445: dispatcher: Stop searching if entry is found
by Henning Westerholt 05 Feb '19

05 Feb '19

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; } /**

1 0

git:master:684da612: dispatcher: remove duplicate code in ds_load_remove()
by Henning Westerholt 05 Feb '19

05 Feb '19

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; }

1 0

git:master:614b6b05: dispatcher: Fix memleak in destination attributes
by Henning Westerholt 05 Feb '19

05 Feb '19

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);

1 0

git:master:499c45fd: Merge pull request #1835 from ycaner06/patch-13
by GitHub 05 Feb '19

05 Feb '19

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…

1 0

git:master:e5fb74f6: ims_usrloc_scscf: removed NewFile.xml file
by Yasin CANER 05 Feb '19

05 Feb '19

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

1 0

git:master:44049e9a: ims_usrloc_scscf: doc is added
by Yasin CANER 05 Feb '19

05 Feb '19

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…

1 0

git:master:7f217aa5: ims_registrar_scscf : fixed wrong comment for emergency register
by GitHub 05 Feb '19

05 Feb '19

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 */

1 0

git:master:03c9259d: ims_registrar_scscf: removed screensharing log file.
by Yasin CANER 05 Feb '19

05 Feb '19

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…

1 0

git:master:065b1d64: mqueue: added missing license header, removed svn ids
by Daniel-Constantin Mierla 04 Feb '19

04 Feb '19

Module: kamailio Branch: master Commit: 065b1d64453d8b5709069f50cfd705901206feb3 URL: https://github.com/kamailio/kamailio/commit/065b1d64453d8b5709069f50cfd7059… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-02-04T18:09:47+01:00 mqueue: added missing license header, removed svn ids --- Modified: src/modules/mqueue/api.h Modified: src/modules/mqueue/mqueue_api.c Modified: src/modules/mqueue/mqueue_api.h --- Diff: https://github.com/kamailio/kamailio/commit/065b1d64453d8b5709069f50cfd7059… Patch: https://github.com/kamailio/kamailio/commit/065b1d64453d8b5709069f50cfd7059… --- diff --git a/src/modules/mqueue/api.h b/src/modules/mqueue/api.h index 3c67f2fdbd..e00b474c92 100644 --- a/src/modules/mqueue/api.h +++ b/src/modules/mqueue/api.h @@ -1,3 +1,25 @@ +/** + * Copyright (C) 2010 Elena-Ramona Modroiu (asipto.com) + * + * This file is part of Kamailio, a free SIP server. + * + * This file is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * 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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + + #ifndef _MQUEUE_EXT_API_H_ #define _MQUEUE_EXT_API_H_ diff --git a/src/modules/mqueue/mqueue_api.c b/src/modules/mqueue/mqueue_api.c index d83c3ce6ce..55833790f8 100644 --- a/src/modules/mqueue/mqueue_api.c +++ b/src/modules/mqueue/mqueue_api.c @@ -1,6 +1,4 @@ /** - * $Id$ - * * Copyright (C) 2010 Elena-Ramona Modroiu (asipto.com) * * This file is part of Kamailio, a free SIP server. diff --git a/src/modules/mqueue/mqueue_api.h b/src/modules/mqueue/mqueue_api.h index 79996805f7..bc976b6ff7 100644 --- a/src/modules/mqueue/mqueue_api.h +++ b/src/modules/mqueue/mqueue_api.h @@ -1,6 +1,4 @@ /** - * $Id$ - * * Copyright (C) 2010 Elena-Ramona Modroiu (asipto.com) * * This file is part of Kamailio, a free SIP server.

1 0

git:master:25173335: misc/examples: exec.cfg updated for latest releases
by Daniel-Constantin Mierla 04 Feb '19

04 Feb '19

Module: kamailio Branch: master Commit: 25173335dda3142e01243f209d24ba571d61578d URL: https://github.com/kamailio/kamailio/commit/25173335dda3142e01243f209d24ba5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-02-03T07:35:08+01:00 misc/examples: exec.cfg updated for latest releases --- Modified: misc/examples/exec/exec.cfg --- Diff: https://github.com/kamailio/kamailio/commit/25173335dda3142e01243f209d24ba5… Patch: https://github.com/kamailio/kamailio/commit/25173335dda3142e01243f209d24ba5… --- diff --git a/misc/examples/exec/exec.cfg b/misc/examples/exec/exec.cfg index b0cfe43eaa..30a3a6ed8b 100644 --- a/misc/examples/exec/exec.cfg +++ b/misc/examples/exec/exec.cfg @@ -1,5 +1,4 @@ -# -# $Id$ +#!KAMAILIO # # this example shows use of ser as stateless redirect server # which rewrites URIs using an exernal utility @@ -7,17 +6,18 @@ # ------------------ module loading ---------------------------------- -loadmodule "modules/exec/exec.so" -loadmodule "modules/sl/sl.so" +loadmodule "exec.so" +loadmodule "sl.so" +loadmodule "xlog.so" # ------------------------- request routing logic ------------------- # main routing logic -route{ +request_route { # for testing purposes, simply okay all REGISTERs if (method=="REGISTER") { - log("REGISTER"); + xlog("REGISTER"); sl_send_reply("200", "ok"); break; }; @@ -30,7 +30,7 @@ route{ sl_send_reply("300", "Redirect"); } else { sl_reply_error(); - log(1, "alas, rewriting failed\n"); + xlog("rewriting failed\n"); }; }

1 0

Planning Fosdem 2019
by Daniel-Constantin Mierla 02 Feb '19

02 Feb '19

Hello, Fosdem 2019 is approaching, so I am writing to see if any of you plans to go to the event. If there is interest, we can try to organize again a dinner on Saturday evening, a tradition for our project at the past 10 editions or even more. Henning Westerholt will give a presentation about Kamailio in the RTC Devroom, I will be around as well. I know few more developers that plan to go to the event, so let's see who else from the community wants to join us. As usual, at Fosdem will be developers from other VoIP projects, like Asterisk, Janus, CGRates, Homer, Jitsi, ... At the past editions we typically had two "kamailio" events: 1) an "ad-hoc" developers meeting in the cantina (or other available room around) to discuss about short term plans for Kamailio -- time and place being decided as we meet there between us (expected in the afternoon of Saturday or during Sunday). 2) a dinner at a place nearby, with other VoIP folks joining us Reply if you plan to go to Fosdem and say if you want to join for a dinner. Just be aware that you have to pay for your food and drinks at the dinner, unless we are going to be surprised again by a generous sponsor that covers partially or completely to dinner. If you need more details about Fosdem, the website is: - https://fosdem.org Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - May 6-8, 2019 -- www.kamailioworld.com Kamailio Advanced Training - Mar 4-6, 2019 in Berlin; Mar 25-27, 2019, in Washington, DC, USA -- www.asipto.com

4 6

[kamailio/kamailio] ims_isc : fixed P-associated-uri header constructing (#1825)
by Yasin CANER 01 Feb '19

01 Feb '19

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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 - [x] 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  fixed P-associated-uri header construncting. it now creates sip and tel uri and appending them to P-header You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1825 -- Commit Summary -- * ims_isc : fixed memory leak * ims_isc : fixed P-associated-uri header constructing -- File Changes -- M src/modules/ims_isc/third_party_reg.c (61) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1825.patch https://github.com/kamailio/kamailio/pull/1825.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/1825

2 3

git:master:18835e0d: Merge pull request #1825 from ycaner06/patch-11
by GitHub 01 Feb '19

01 Feb '19

Module: kamailio Branch: master Commit: 18835e0d8bfc55dd63b1a07faa9bde8dfafa8b70 URL: https://github.com/kamailio/kamailio/commit/18835e0d8bfc55dd63b1a07faa9bde8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-02-01T19:59:35+01:00 Merge pull request #1825 from ycaner06/patch-11 ims_isc : fixed P-associated-uri header constructing --- Modified: src/modules/ims_isc/third_party_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/18835e0d8bfc55dd63b1a07faa9bde8… Patch: https://github.com/kamailio/kamailio/commit/18835e0d8bfc55dd63b1a07faa9bde8…

1 0

git:master:414bceec: ims_isc : fixed memory leak
by GitHub 01 Feb '19

01 Feb '19

Module: kamailio Branch: master Commit: 414bceec25ba7cbfdd5ef607f772e7d2a8335d34 URL: https://github.com/kamailio/kamailio/commit/414bceec25ba7cbfdd5ef607f772e7d… Author: Yasin CANER <caner_yaso(a)hotmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-01-30T07:24:05+03:00 ims_isc : fixed memory leak fixed memory leak for third_part_registration body value. --- Modified: src/modules/ims_isc/third_party_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/414bceec25ba7cbfdd5ef607f772e7d… Patch: https://github.com/kamailio/kamailio/commit/414bceec25ba7cbfdd5ef607f772e7d… --- diff --git a/src/modules/ims_isc/third_party_reg.c b/src/modules/ims_isc/third_party_reg.c index b54d4e07d4..62cac53f54 100644 --- a/src/modules/ims_isc/third_party_reg.c +++ b/src/modules/ims_isc/third_party_reg.c @@ -403,9 +403,9 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) { } if (r->cv.len) { - STR_APPEND(h, p_charging_vector_s); - STR_APPEND(h, r->cv); - STR_APPEND(h, p_charging_vector_e); + STR_APPEND(h, p_charging_vector_s); + STR_APPEND(h, r->cv); + STR_APPEND(h, p_charging_vector_e); } if (p_associated_uri.data_len > 0) { @@ -436,11 +436,15 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) { } if (h.s) pkg_free(h.s); + if (b.s) + pkg_free(b.s); return 1; error: if (h.s) pkg_free(h.s); + if (b.s) + pkg_free(b.s); return 0; }

1 0

git:master:91408caf: ims_isc : fixed P-associated-uri header constructing
by Yasin CANER 01 Feb '19

01 Feb '19

Module: kamailio Branch: master Commit: 91408cafec655f98a7f5915fbee33be27ec299fa URL: https://github.com/kamailio/kamailio/commit/91408cafec655f98a7f5915fbee33be… Author: Yasin CANER <caner_yaso(a)hotmail.com> Committer: Yasin CANER <caner_yaso(a)hotmail.com> Date: 2019-01-30T07:47:17+03:00 ims_isc : fixed P-associated-uri header constructing fixed P-associated-uri header construncting. it now creates sip and tel uri and appending to header. --- Modified: src/modules/ims_isc/third_party_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/91408cafec655f98a7f5915fbee33be… Patch: https://github.com/kamailio/kamailio/commit/91408cafec655f98a7f5915fbee33be…

1 0

git:master:a704f7d6: ims_isc : fixed wrong type for memcpy
by Yasin CANER 01 Feb '19

01 Feb '19

Module: kamailio Branch: master Commit: a704f7d68dddfaa9719acb7b04f4058a1cdf5673 URL: https://github.com/kamailio/kamailio/commit/a704f7d68dddfaa9719acb7b04f4058… Author: Yasin CANER <caner_yaso(a)hotmail.com> Committer: Yasin CANER <caner_yaso(a)hotmail.com> Date: 2019-01-30T07:59:32+03:00 ims_isc : fixed wrong type for memcpy fixed wrong type for memcpy --- Modified: src/modules/ims_isc/third_party_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/a704f7d68dddfaa9719acb7b04f4058… Patch: https://github.com/kamailio/kamailio/commit/a704f7d68dddfaa9719acb7b04f4058… --- diff --git a/src/modules/ims_isc/third_party_reg.c b/src/modules/ims_isc/third_party_reg.c index f5c780feed..b07773efa8 100644 --- a/src/modules/ims_isc/third_party_reg.c +++ b/src/modules/ims_isc/third_party_reg.c @@ -173,7 +173,7 @@ int build_p_associated_uri(ims_subscription* s) { if (cnt == 0 && cnttel == 0){ *p++ = '<'; } else if(cnttel != 0 && cnt == 0){ - memcpy(p, ", <", 2); + memcpy(p, ", <", 3); p += 3; } else { memcpy(p, ">, <", 4);

1 0

[kamailio/kamailio] core: dns slow queries reporting (#1824)
by Julien Chavanton 01 Feb '19

01 Feb '19

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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) - [x] 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description I remember there was some discussion about adding DNS statistics, I think I remember a discussion involving @ngvoice Carsten ? This is adding a parameter to the core `dns_slow_query_ms` Example: ``` dns_slow_query_ms=100 ``` When using the internal resolver any query taking more than `dns_slow_query_ms` will be lodged as a warning : ``` dns_slow_query_ms=10 (example with 10ms) 5(5960) WARNING: <core> [core/resolve.c:752]: get_record(): res_search[35][us-west-wa.sip.flowroute.com]elapsed[12ms] 5(5960) WARNING: <core> [core/resolve.c:752]: get_record(): res_search[1][ep-us-west-wa-01.flowroute.com]elapsed[12ms] ``` and a statistic counter will be incremented : ``` kamcmd stats.fetch dns:slow_dns_request { dns.slow_dns_request: 1 } ``` I think this will be a good start to monitor the impact of slow DNS queries on Kamailio. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1824 -- Commit Summary -- * core: dns slow queries reporting -- File Changes -- M src/core/cfg.lex (3) M src/core/cfg.y (3) M src/core/cfg_core.c (3) M src/core/cfg_core.h (1) M src/core/resolve.c (17) M src/core/resolve.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1824.patch https://github.com/kamailio/kamailio/pull/1824.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/1824

2 4

git:master:4d775faf: Merge pull request #1824 from jchavanton/dns_slow_query
by GitHub 01 Feb '19

01 Feb '19

Module: kamailio Branch: master Commit: 4d775fafa9f2dba6630fc0318616f26f7b72886e URL: https://github.com/kamailio/kamailio/commit/4d775fafa9f2dba6630fc0318616f26… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-02-01T19:59:00+01:00 Merge pull request #1824 from jchavanton/dns_slow_query core: dns slow queries reporting --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/cfg_core.c Modified: src/core/cfg_core.h Modified: src/core/resolve.c Modified: src/core/resolve.h --- Diff: https://github.com/kamailio/kamailio/commit/4d775fafa9f2dba6630fc0318616f26… Patch: https://github.com/kamailio/kamailio/commit/4d775fafa9f2dba6630fc0318616f26…

1 0

git:master:9a69321c: core: dns slow queries reporting
by Julien Chavanton 01 Feb '19

01 Feb '19

Module: kamailio Branch: master Commit: 9a69321c5cc1f69b1c62d0d0190d6e79a41647e3 URL: https://github.com/kamailio/kamailio/commit/9a69321c5cc1f69b1c62d0d0190d6e7… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2019-01-31T20:39:08Z core: dns slow queries reporting --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/cfg_core.c Modified: src/core/cfg_core.h Modified: src/core/resolve.c Modified: src/core/resolve.h --- Diff: https://github.com/kamailio/kamailio/commit/9a69321c5cc1f69b1c62d0d0190d6e7… Patch: https://github.com/kamailio/kamailio/commit/9a69321c5cc1f69b1c62d0d0190d6e7…

1 0

Re: [sr-dev] [kamailio/kamailio] dialog: do not require dlg_flag parameter to be set (404f403)
by PICCORO Lenz McKAY 01 Feb '19

01 Feb '19

this fix are need by 5.1 and 5.2 to property wrok the BLF feature... -- 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/404f403786478a917637186446bb285…

1 0

git:5.1:82aad65c: Merge pull request #1826 from sergey-safarov/5.1
by GitHub 01 Feb '19

01 Feb '19

Module: kamailio Branch: 5.1 Commit: 82aad65cb991c4690076ad44df5449662a2b683a URL: https://github.com/kamailio/kamailio/commit/82aad65cb991c4690076ad44df54496… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-02-01T19:42:18+01:00 Merge pull request #1826 from sergey-safarov/5.1 [5.1] set of cherry-pick to properly package on alpine dists --- Modified: pkg/docker Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/alpine/kamailio.initd Removed: pkg/kamailio/alpine/0004-src_core_tcp_read_c.patch Removed: pkg/kamailio/alpine/kamctl_build.patch --- Diff: https://github.com/kamailio/kamailio/commit/82aad65cb991c4690076ad44df54496… Patch: https://github.com/kamailio/kamailio/commit/82aad65cb991c4690076ad44df54496…

1 0

git:5.1:889b9295: pkg/docker: Alpine switched to use openssl. Updated rules for alpine docker container
by Sergey Safarov 01 Feb '19

01 Feb '19

Module: kamailio Branch: 5.1 Commit: 889b929539a2fe2e44bc61f82c8fd407e8eae643 URL: https://github.com/kamailio/kamailio/commit/889b929539a2fe2e44bc61f82c8fd40… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-01-31T15:01:52+03:00 pkg/docker: Alpine switched to use openssl. Updated rules for alpine docker container (cherry picked from commit 37bff4588803a70873babdb483804e3734b42900) --- Modified: pkg/kamailio/alpine/APKBUILD Removed: pkg/kamailio/alpine/0004-src_core_tcp_read_c.patch --- Diff: https://github.com/kamailio/kamailio/commit/889b929539a2fe2e44bc61f82c8fd40… Patch: https://github.com/kamailio/kamailio/commit/889b929539a2fe2e44bc61f82c8fd40… --- diff --git a/pkg/kamailio/alpine/0004-src_core_tcp_read_c.patch b/pkg/kamailio/alpine/0004-src_core_tcp_read_c.patch deleted file mode 100644 index 08308f77b1..0000000000 --- a/pkg/kamailio/alpine/0004-src_core_tcp_read_c.patch +++ /dev/null @@ -1,20 +0,0 @@ -$OpenBSD: patch-src_core_tcp_read_c,v 1.1 2017/07/03 22:14:20 sthen Exp $ - -Index: a/src/core/tcp_read.c ---- a/src/core/tcp_read.c.orig -+++ a/src/core/tcp_read.c -@@ -1497,6 +1497,14 @@ void release_tcpconn(struct tcp_connection* c, long st - ip_addr2a(&c->rcv.src_ip), c->rcv.src_port, - ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port); - LM_DBG("extra_data %p\n", c->extra_data); -+ -+ /* experimental fix tls crash with libressl */ -+ /* add cleanup SSL structure in child process, in parent process SSL structure is empty */ -+ if ((c->type==PROTO_TLS || c->type==PROTO_WSS) && (c->extra_data) && c->fd != -1) { -+ tls_close(c, c->fd); -+ tls_tcpconn_clean(c); -+ } -+ - /* release req & signal the parent */ - c->reader_pid=0; /* reset it */ - if (c->fd!=-1){ diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 9d1497b3f9..5e2b11d035 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -27,7 +27,7 @@ depends="gawk" options="!check" makedepends="bison db-dev flex freeradius-client-dev expat-dev lksctp-tools-dev perl-dev postgresql-dev python2-dev pcre-dev mariadb-dev libxml2-dev curl-dev unixodbc-dev confuse-dev ncurses-dev sqlite-dev - lua-dev openldap-dev libressl-dev net-snmp-dev libuuid libev-dev + lua-dev openldap-dev openssl-dev net-snmp-dev libuuid libev-dev jansson-dev json-c-dev libevent-dev linux-headers libmemcached-dev rabbitmq-c-dev hiredis-dev libmaxminddb-dev libunistring-dev" install="$pkgname.pre-install $pkgname.pre-upgrade" @@ -250,7 +250,7 @@ for _i in db postgres sqlite dbtext mysql \ done source="${pkgname}-${pkgver}${_suffix}.tar.gz::https://github.com/kamailio/$pkgname/archive/$_gitcommit.tar.gz - 0004-src_core_tcp_read_c.patch + 0001-kamdbctl.base.patch kamailio.initd " @@ -549,5 +549,5 @@ sipdump() { } sha512sums="51ea5fccd27a9d3d1783cfc5596eb28ab27e34faeec3268600363f43c48a3634c3c584c479ba874fdb53b85766a0ce8fe7df0e20954c9c6514b1d9d41d9237e6 kamailio-5.1.0.20171125-991fe9b.tar.gz -af8362201957eae6b66baf7368c9ca884024209a396d77c5c52180c9aabe13772e9c6513e59721d39503e5bb7a8c1030f5c10301ea9055bddafb7f01ee2f3076 0004-src_core_tcp_read_c.patch +6badfb611c02ffcb4c2e9937731162ea1a4b737f042ed52120e2f96ebb80b5b7d240b5612c9ca565e693eec9b8c52c1ee5db04dfc47d204501021f984b4b11db 0001-kamdbctl.base.patch 321b1b160434150bcde3c0ad7f47ddf259791b68d4ce74ba4c35034026421a2bc6f5e86f26f393f5fcdb523d8cd75f944709473065553ce860b0ea06b3dc2a1b kamailio.initd"

1 0

git:5.1:78e948d9: kamdbctl: Merged patch from alpine packaging (#1786)
by Sergey Safarov 01 Feb '19

01 Feb '19

Module: kamailio Branch: 5.1 Commit: 78e948d9e8003c716ed67ff82cf8c7803e35e7df URL: https://github.com/kamailio/kamailio/commit/78e948d9e8003c716ed67ff82cf8c78… Author: sergey-safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-01-31T16:19:03+03:00 kamdbctl: Merged patch from alpine packaging (#1786) - kamdbctl: Merged patch from alpine packaging (#1786) - add proper quoting for DB table and module definitions (cherry picked from commit c6e62f932495af188c89bf06b468d1bb19579267) --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/78e948d9e8003c716ed67ff82cf8c78… Patch: https://github.com/kamailio/kamailio/commit/78e948d9e8003c716ed67ff82cf8c78… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 5e2b11d035..acf61eb249 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -250,7 +250,6 @@ for _i in db postgres sqlite dbtext mysql \ done source="${pkgname}-${pkgver}${_suffix}.tar.gz::https://github.com/kamailio/$pkgname/archive/$_gitcommit.tar.gz - 0001-kamdbctl.base.patch kamailio.initd " @@ -549,5 +548,4 @@ sipdump() { } sha512sums="51ea5fccd27a9d3d1783cfc5596eb28ab27e34faeec3268600363f43c48a3634c3c584c479ba874fdb53b85766a0ce8fe7df0e20954c9c6514b1d9d41d9237e6 kamailio-5.1.0.20171125-991fe9b.tar.gz -6badfb611c02ffcb4c2e9937731162ea1a4b737f042ed52120e2f96ebb80b5b7d240b5612c9ca565e693eec9b8c52c1ee5db04dfc47d204501021f984b4b11db 0001-kamdbctl.base.patch 321b1b160434150bcde3c0ad7f47ddf259791b68d4ce74ba4c35034026421a2bc6f5e86f26f393f5fcdb523d8cd75f944709473065553ce860b0ea06b3dc2a1b kamailio.initd"

1 0

[kamailio/kamailio] [5.1] set of cherry-pick to properly package on alpine dists (#1826)
by sergey-safarov 01 Feb '19

01 Feb '19

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1826 -- Commit Summary -- * pkg/docker: Updated submodule * pkg/kamailio/alpine: Update APKBUILD * pkg/docker: Alpine switched to use openssl. Updated rules for alpine docker container * kamdbctl: Merged patch from alpine packaging (#1786) -- File Changes -- M pkg/docker (2) D pkg/kamailio/alpine/0004-src_core_tcp_read_c.patch (20) M pkg/kamailio/alpine/APKBUILD (12) M pkg/kamailio/alpine/kamailio.initd (2) D pkg/kamailio/alpine/kamctl_build.patch (236) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1826.patch https://github.com/kamailio/kamailio/pull/1826.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/1826

2 4

git:5.1:08161fe7: pkg/docker: Updated submodule
by Sergey Safarov 01 Feb '19

01 Feb '19

Module: kamailio Branch: 5.1 Commit: 08161fe70a0dc25d7aaf377f7c362f81984ce068 URL: https://github.com/kamailio/kamailio/commit/08161fe70a0dc25d7aaf377f7c362f8… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-01-31T14:55:03+03:00 pkg/docker: Updated submodule --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/08161fe70a0dc25d7aaf377f7c362f8… Patch: https://github.com/kamailio/kamailio/commit/08161fe70a0dc25d7aaf377f7c362f8… --- diff --git a/pkg/docker b/pkg/docker index 3c8a156abe..b92a1c899b 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 3c8a156abef2a034d9a21df5bf73f4b5cc4d3e05 +Subproject commit b92a1c899b8c474afadd0cf29dd7cb4ea01a3466

1 0

git:5.1:d56615e7: pkg/kamailio/alpine: Update APKBUILD
by Sergey Safarov 01 Feb '19

01 Feb '19

Module: kamailio Branch: 5.1 Commit: d56615e76622c428985d6fc9a3d31bf9e4943543 URL: https://github.com/kamailio/kamailio/commit/d56615e76622c428985d6fc9a3d31bf… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-01-31T14:59:20+03:00 pkg/kamailio/alpine: Update APKBUILD (cherry picked from commit 6aca6c0ddc201882d1ab75e662299450f578aa32) --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/alpine/kamailio.initd Removed: pkg/kamailio/alpine/kamctl_build.patch --- Diff: https://github.com/kamailio/kamailio/commit/d56615e76622c428985d6fc9a3d31bf… Patch: https://github.com/kamailio/kamailio/commit/d56615e76622c428985d6fc9a3d31bf…

1 0

git:master:ec993297: modules: readme files regenerated - rr ... [skip ci]
by Kamailio Dev 01 Feb '19

01 Feb '19

Module: kamailio Branch: master Commit: ec993297b38b5d90e88d838f7d126317d6ab4641 URL: https://github.com/kamailio/kamailio/commit/ec993297b38b5d90e88d838f7d12631… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-02-01T19:31:45+01:00 modules: readme files regenerated - rr ... [skip ci] --- Modified: src/modules/rr/README --- Diff: https://github.com/kamailio/kamailio/commit/ec993297b38b5d90e88d838f7d12631… Patch: https://github.com/kamailio/kamailio/commit/ec993297b38b5d90e88d838f7d12631… --- diff --git a/src/modules/rr/README b/src/modules/rr/README index 9feab35738..4fe696ee3a 100644 --- a/src/modules/rr/README +++ b/src/modules/rr/README @@ -408,6 +408,7 @@ modparam("rr", "ignore_sips", 1) * 2 - route calculation based on flow-token has been successful * -1 - route calculation has been unsuccessful * -2 - outbound flow-token shows evidence of tampering + * -3 - next hop is taken from a preloaded route set This function can be used from REQUEST_ROUTE.

1 0

git:master:98056258: Merge pull request #1830 from gaaf/rr-lr-retval
by GitHub 01 Feb '19

01 Feb '19

Module: kamailio Branch: master Commit: 98056258b7ebdc65c8147d9d057bc350a38e55f8 URL: https://github.com/kamailio/kamailio/commit/98056258b7ebdc65c8147d9d057bc35… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-02-01T19:25:34+01:00 Merge pull request #1830 from gaaf/rr-lr-retval rr: Add new return value for preloaded route set to loose_route() --- Modified: src/modules/rr/doc/rr_admin.xml Modified: src/modules/rr/loose.c --- Diff: https://github.com/kamailio/kamailio/commit/98056258b7ebdc65c8147d9d057bc35… Patch: https://github.com/kamailio/kamailio/commit/98056258b7ebdc65c8147d9d057bc35… --- diff --git a/src/modules/rr/doc/rr_admin.xml b/src/modules/rr/doc/rr_admin.xml index 7dd1868e2a..74e59abe82 100644 --- a/src/modules/rr/doc/rr_admin.xml +++ b/src/modules/rr/doc/rr_admin.xml @@ -364,7 +364,7 @@ modparam("rr", "ignore_sips", 1) <listitem> <para><emphasis>2</emphasis> - route calculation based on - flow-token has been successful</para> + flow-token has been successful</para> </listitem> <listitem> @@ -376,6 +376,11 @@ modparam("rr", "ignore_sips", 1) <para><emphasis>-2</emphasis> - outbound flow-token shows evidence of tampering</para> </listitem> + + <listitem> + <para><emphasis>-3</emphasis> - next hop is taken from + a preloaded route set</para> + </listitem> </itemizedlist> <para>This function can be used from REQUEST_ROUTE.</para> diff --git a/src/modules/rr/loose.c b/src/modules/rr/loose.c index 6e9e888a2b..efe428a1cd 100644 --- a/src/modules/rr/loose.c +++ b/src/modules/rr/loose.c @@ -48,6 +48,7 @@ #define RR_OB_DRIVEN 2 /*!< The next hop is determined from the route set based on flow-token */ #define NOT_RR_DRIVEN -1 /*!< The next hop is not determined from the route set */ #define FLOW_TOKEN_BROKEN -2 /*!< Outbound flow-token shows evidence of tampering */ +#define RR_PRELOADED -3 /*!< The next hop is determined from a preloaded route set */ #define RR_ROUTE_PREFIX ROUTE_PREFIX "<" #define RR_ROUTE_PREFIX_LEN (sizeof(RR_ROUTE_PREFIX)-1) @@ -840,7 +841,7 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) } if (res > 0) { /* No next route found */ LM_DBG("No next URI found\n"); - status = (preloaded ? NOT_RR_DRIVEN : RR_DRIVEN); + status = (preloaded ? RR_PRELOADED : RR_DRIVEN); goto done; } rt = (rr_t*)hdr->parsed; @@ -873,7 +874,7 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) } if (res > 0) { /* No next route found */ LM_DBG("no next URI found\n"); - status = (preloaded ? NOT_RR_DRIVEN : RR_DRIVEN); + status = (preloaded ? RR_PRELOADED : RR_DRIVEN); goto done; } rt = (rr_t*)hdr->parsed;

1 0

[kamailio/kamailio] rr: Add new return value for preloaded route set to loose_route() (#1830)
by Alex Hermann 01 Feb '19

01 Feb '19

Instead of returning just -1 (error), return a dedicated value. Now it is possible to detect from the script if a preloaded Route header was removed that pointed at the local proxy. The new return code is kept negative, so all code checking for failure response keeps working.   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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) - [x] 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1830 -- Commit Summary -- * rr: Add new return value for preloaded route set to loose_route() -- File Changes -- M src/modules/rr/doc/rr_admin.xml (7) M src/modules/rr/loose.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1830.patch https://github.com/kamailio/kamailio/pull/1830.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/1830

2 2

git:master:c5b8e5b3: rr: Add new return value for preloaded route set to loose_route()
by Alex Hermann 01 Feb '19

01 Feb '19

Module: kamailio Branch: master Commit: c5b8e5b3a82ac0f61a059f69921866952405ffe5 URL: https://github.com/kamailio/kamailio/commit/c5b8e5b3a82ac0f61a059f699218669… Author: Alex Hermann <alex(a)hexla.nl> Committer: Alex Hermann <alex(a)hexla.nl> Date: 2019-02-01T11:14:10+01:00 rr: Add new return value for preloaded route set to loose_route() Instead of returning just -1 (error), return a dedicated value. Now it is possible to detect from the script if a preloaded Route header was removed that pointed at the local proxy. The new return code is kept negative, so all code checking for failure response keeps working. --- Modified: src/modules/rr/doc/rr_admin.xml Modified: src/modules/rr/loose.c --- Diff: https://github.com/kamailio/kamailio/commit/c5b8e5b3a82ac0f61a059f699218669… Patch: https://github.com/kamailio/kamailio/commit/c5b8e5b3a82ac0f61a059f699218669… --- diff --git a/src/modules/rr/doc/rr_admin.xml b/src/modules/rr/doc/rr_admin.xml index 7dd1868e2a..74e59abe82 100644 --- a/src/modules/rr/doc/rr_admin.xml +++ b/src/modules/rr/doc/rr_admin.xml @@ -364,7 +364,7 @@ modparam("rr", "ignore_sips", 1) <listitem> <para><emphasis>2</emphasis> - route calculation based on - flow-token has been successful</para> + flow-token has been successful</para> </listitem> <listitem> @@ -376,6 +376,11 @@ modparam("rr", "ignore_sips", 1) <para><emphasis>-2</emphasis> - outbound flow-token shows evidence of tampering</para> </listitem> + + <listitem> + <para><emphasis>-3</emphasis> - next hop is taken from + a preloaded route set</para> + </listitem> </itemizedlist> <para>This function can be used from REQUEST_ROUTE.</para> diff --git a/src/modules/rr/loose.c b/src/modules/rr/loose.c index 6e9e888a2b..efe428a1cd 100644 --- a/src/modules/rr/loose.c +++ b/src/modules/rr/loose.c @@ -48,6 +48,7 @@ #define RR_OB_DRIVEN 2 /*!< The next hop is determined from the route set based on flow-token */ #define NOT_RR_DRIVEN -1 /*!< The next hop is not determined from the route set */ #define FLOW_TOKEN_BROKEN -2 /*!< Outbound flow-token shows evidence of tampering */ +#define RR_PRELOADED -3 /*!< The next hop is determined from a preloaded route set */ #define RR_ROUTE_PREFIX ROUTE_PREFIX "<" #define RR_ROUTE_PREFIX_LEN (sizeof(RR_ROUTE_PREFIX)-1) @@ -840,7 +841,7 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) } if (res > 0) { /* No next route found */ LM_DBG("No next URI found\n"); - status = (preloaded ? NOT_RR_DRIVEN : RR_DRIVEN); + status = (preloaded ? RR_PRELOADED : RR_DRIVEN); goto done; } rt = (rr_t*)hdr->parsed; @@ -873,7 +874,7 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) } if (res > 0) { /* No next route found */ LM_DBG("no next URI found\n"); - status = (preloaded ? NOT_RR_DRIVEN : RR_DRIVEN); + status = (preloaded ? RR_PRELOADED : RR_DRIVEN); goto done; } rt = (rr_t*)hdr->parsed;

1 0

git:master:9f9ec197: src/Makefile: added target to install files for systemd on Centos 7 (#1831)
by Daniel-Constantin Mierla 01 Feb '19

01 Feb '19

Module: kamailio Branch: master Commit: 9f9ec197e029dca44ac57575b214a32916c838cb URL: https://github.com/kamailio/kamailio/commit/9f9ec197e029dca44ac57575b214a32… Author: Yasin CANER <caner_yaso(a)hotmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-02-01T19:23:56+01:00 src/Makefile: added target to install files for systemd on Centos 7 (#1831) * src/Makefile: added target to install files for systemd on Centos 7 added target to install systemd and sysconfig files for systemd service installation method : make install-systemd-centos * src/makefile : add --system parameter for user src/makefile : add --system parameter for user after rebooting , /run/kamailio folder is survived. --- Modified: src/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/9f9ec197e029dca44ac57575b214a32… Patch: https://github.com/kamailio/kamailio/commit/9f9ec197e029dca44ac57575b214a32… --- diff --git a/src/Makefile b/src/Makefile index 593da28166..cd772c877b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1041,6 +1041,28 @@ install_systemd_debian install-systemd-debian: @echo "* to enable kamailio service run:" @echo " systemctl enable kamailio" @echo " systemctl daemon-reload" +.PHONY: install_systemd_centos install-systemd-centos +install_systemd_centos install-systemd-centos: + sed -e "s#ExecStart=/usr/sbin/kamailio#ExecStart=$(bin_prefix)/$(bin_dir)$(NAME)#g" \ + -e "s#Description=Kamailio#Description=$(NAME)#g" \ + -e "s#/var/run/kamailio/kamailio.pid#/var/run/$(NAME)/$(NAME).pid#g" \ + -e "s#EnvironmentFile=-/etc/sysconfig/kamailio#EnvironmentFile=-/etc/sysconfig/$(NAME)#g" \ + -e "s#CFGFILE=/etc/kamailio/kamailio.cfg#CFGFILE=$(cfg_prefix)/$(cfg_dir)$(NAME).cfg#g" \ + < ../pkg/kamailio/obs/kamailio.service \ + > /etc/systemd/system/$(NAME).service + cp ../pkg/kamailio/obs/kamailio.sysconfig \ + /etc/sysconfig/$(NAME) + mkdir -p /var/run/$(NAME) + chmod 0700 /var/run/$(NAME) + groupadd --system $(NAME) + useradd $(NAME) --system --shell /sbin/nologin -g $(NAME) --home /var/run/$(NAME) + chown $(NAME):$(NAME) /var/run/$(NAME) + echo "D /run/$(NAME) 0700 $(NAME) $(NAME) -" > /etc/tmpfiles.d/$(NAME).conf + @echo + @echo "* to enable kamailio service run:" + @echo " systemctl daemon-reload" + @echo " systemctl enable kamailio" + @echo " systemctl start kamailio" .PHONY: dbschema dbschema:

1 0

[kamailio/kamailio] src/Makefile: added target to install files for systemd on Centos 7 (#1831)
by Yasin CANER 01 Feb '19

01 Feb '19

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x ] 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) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  added target to install systemd and sysconfig files for systemd service installation method : make install-systemd-centos You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1831 -- Commit Summary -- * src/Makefile: added target to install files for systemd on Centos 7 -- File Changes -- M src/Makefile (21) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1831.patch https://github.com/kamailio/kamailio/pull/1831.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/1831

2 4

[kamailio/kamailio] bug: RPCFIFOPATH / DEFINE_FIFO_NAME invalid acces due changed to root at run (#1827)
by PICCORO Lenz McKAY 01 Feb '19

01 Feb '19

### Description the /var/run/kamailio directory for the fifo and crtl files are denied for acces to the service as i can see directory are owed byt root and only ower and group have access kamailio 4.4 backported by me for Debian jessie have this: `drwxr-xr-x 2 kamailio kamailio 100 Aug 15 17:33 kamailio` kamailio 5.2 installed on buster/testing build from sources: `drwxr-x--- 2 root root 120 Jan 30 09:35 kamailio` **NOTE** no definiton are setup, and surprise if i defined some, the only working dir are /tmp !!! ### Troubleshooting kamailio 4.4 backported by me for Debian jessie have this: `drwxr-xr-x 2 kamailio kamailio 100 Aug 15 17:33 kamailio` kamailio 5.2 installed on buster/testing build from sources: `drwxr-x--- 2 root root 120 Jan 30 09:35 kamailio` due that several issues are happened if we started using some modules due unable to manage the socket control: ``` Jan 31 15:35:51 venenux-debian kamailio[16861]: 17(16889) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(7, 0x7f6ed6f88d88, 0, 5000): Invalid argument [22] Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) ERROR: ctl [ctl.c:390]: mod_destroy(): ERROR: ctl: could not delete unix socket /var/run/kamailio//kamailio_ctl: Permission denied (13) Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) DEBUG: <core> [db_pool.c:100]: pool_remove(): removing connection from the pool Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) DEBUG: tm [t_funcs.c:85]: tm_shutdown(): start Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) DEBUG: tm [t_funcs.c:88]: tm_shutdown(): emptying hash table Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) DEBUG: tm [t_funcs.c:90]: tm_shutdown(): removing semaphores Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) DEBUG: tm [t_funcs.c:92]: tm_shutdown(): destroying tmcb lists Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) DEBUG: tm [t_funcs.c:95]: tm_shutdown(): done Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) ERROR: jsonrpcs [jsonrpcs_fifo.c:599]: jsonrpc_fifo_destroy(): FIFO stat failed: Permission denied Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) ERROR: jsonrpcs [jsonrpcs_sock.c:516]: jsonrpc_dgram_destroy(): socket stat failed: Permission denied ``` #### Reproduction build from sources with default values enable dialog, blf support and asterisk and start service.. when try to control using socket kamailio cannot comunicate with itselft! very ironic! #### Log Messages ``` Jan 31 15:35:51 venenux-debian kamailio[16861]: 17(16889) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(7, 0x7f6ed6f88d88, 0, 5000): Invalid argument [22] Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) ERROR: ctl [ctl.c:390]: mod_destroy(): ERROR: ctl: could not delete unix socket /var/run/kamailio//kamailio_ctl: Permission denied (13) Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) DEBUG: <core> [db_pool.c:100]: pool_remove(): removing connection from the pool Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) DEBUG: tm [t_funcs.c:85]: tm_shutdown(): start Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) DEBUG: tm [t_funcs.c:88]: tm_shutdown(): emptying hash table Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) DEBUG: tm [t_funcs.c:90]: tm_shutdown(): removing semaphores Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) DEBUG: tm [t_funcs.c:92]: tm_shutdown(): destroying tmcb lists Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) DEBUG: tm [t_funcs.c:95]: tm_shutdown(): done Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) ERROR: jsonrpcs [jsonrpcs_fifo.c:599]: jsonrpc_fifo_destroy(): FIFO stat failed: Permission denied Jan 31 15:35:51 venenux-debian kamailio[16861]: 0(16863) ERROR: jsonrpcs [jsonrpcs_sock.c:516]: jsonrpc_dgram_destroy(): socket stat failed: Permission denied ``` #### SIP Traffic NOT RELATED ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.1 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, 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_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 buster/testing ``` -- 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/1827

2 2

git:5.2:9ead1778: src/Makefile: added target to install files for systemd on debian
by Daniel-Constantin Mierla 01 Feb '19

01 Feb '19

Module: kamailio Branch: 5.2 Commit: 9ead1778f6df817192b9cbf805169895bb647035 URL: https://github.com/kamailio/kamailio/commit/9ead1778f6df817192b9cbf80516989… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-02-01T08:17:53+01:00 src/Makefile: added target to install files for systemd on debian * make install-systemd-debian (cherry picked from commit ddbf18352f189b8aa1ae5e5f1d83d42db6fcc0d2) --- Modified: src/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/9ead1778f6df817192b9cbf80516989… Patch: https://github.com/kamailio/kamailio/commit/9ead1778f6df817192b9cbf80516989… --- diff --git a/src/Makefile b/src/Makefile index 5b67d7ad67..593da28166 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1019,6 +1019,29 @@ install_initd_centos install-initd-centos: -d /var/run/$(NAME) $(NAME) chown $(NAME):$(NAME) /var/run/$(NAME) +.PHONY: install_systemd_debian install-systemd-debian +install_systemd_debian install-systemd-debian: + sed -e "s#ExecStart=/usr/sbin/kamailio#ExecStart=$(bin_prefix)/$(bin_dir)$(NAME)#g" \ + -e "s#Description=Kamailio#Description=$(NAME)#g" \ + -e "s#/var/run/kamailio/kamailio.pid#/var/run/$(NAME)/$(NAME).pid#g" \ + -e "s#EnvironmentFile=-/etc/default/kamailio#EnvironmentFile=-/etc/default/$(NAME)#g" \ + -e "s#CFGFILE=/etc/kamailio/kamailio.cfg#CFGFILE=$(cfg_prefix)/$(cfg_dir)$(NAME).cfg#g" \ + < ../pkg/kamailio/deb/debian/kamailio.service \ + > /etc/systemd/system/$(NAME).service + sed -e "s#RUN_KAMAILIO=no#RUN_KAMAILIO=yes#g" \ + < ../pkg/kamailio/deb/debian/kamailio.default \ + > /etc/default/$(NAME) + mkdir -p /var/run/$(NAME) + adduser --quiet --system --group --disabled-password \ + --shell /bin/false --gecos "$(NAME)" \ + --home /var/run/$(NAME) $(NAME) + chown $(NAME):$(NAME) /var/run/$(NAME) + echo "D /run/$(NAME) 0700 $(NAME) $(NAME) -" > /etc/tmpfiles.d/$(NAME).conf + @echo + @echo "* to enable kamailio service run:" + @echo " systemctl enable kamailio" + @echo " systemctl daemon-reload" + .PHONY: dbschema dbschema: -@echo "Build database schemas"

1 0

git:master:ddbf1835: src/Makefile: added target to install files for systemd on debian
by Daniel-Constantin Mierla 31 Jan '19

31 Jan '19

Module: kamailio Branch: master Commit: ddbf18352f189b8aa1ae5e5f1d83d42db6fcc0d2 URL: https://github.com/kamailio/kamailio/commit/ddbf18352f189b8aa1ae5e5f1d83d42… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-31T20:02:26+01:00 src/Makefile: added target to install files for systemd on debian * make install-systemd-debian --- Modified: src/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/ddbf18352f189b8aa1ae5e5f1d83d42… Patch: https://github.com/kamailio/kamailio/commit/ddbf18352f189b8aa1ae5e5f1d83d42… --- diff --git a/src/Makefile b/src/Makefile index 5b67d7ad67..593da28166 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1019,6 +1019,29 @@ install_initd_centos install-initd-centos: -d /var/run/$(NAME) $(NAME) chown $(NAME):$(NAME) /var/run/$(NAME) +.PHONY: install_systemd_debian install-systemd-debian +install_systemd_debian install-systemd-debian: + sed -e "s#ExecStart=/usr/sbin/kamailio#ExecStart=$(bin_prefix)/$(bin_dir)$(NAME)#g" \ + -e "s#Description=Kamailio#Description=$(NAME)#g" \ + -e "s#/var/run/kamailio/kamailio.pid#/var/run/$(NAME)/$(NAME).pid#g" \ + -e "s#EnvironmentFile=-/etc/default/kamailio#EnvironmentFile=-/etc/default/$(NAME)#g" \ + -e "s#CFGFILE=/etc/kamailio/kamailio.cfg#CFGFILE=$(cfg_prefix)/$(cfg_dir)$(NAME).cfg#g" \ + < ../pkg/kamailio/deb/debian/kamailio.service \ + > /etc/systemd/system/$(NAME).service + sed -e "s#RUN_KAMAILIO=no#RUN_KAMAILIO=yes#g" \ + < ../pkg/kamailio/deb/debian/kamailio.default \ + > /etc/default/$(NAME) + mkdir -p /var/run/$(NAME) + adduser --quiet --system --group --disabled-password \ + --shell /bin/false --gecos "$(NAME)" \ + --home /var/run/$(NAME) $(NAME) + chown $(NAME):$(NAME) /var/run/$(NAME) + echo "D /run/$(NAME) 0700 $(NAME) $(NAME) -" > /etc/tmpfiles.d/$(NAME).conf + @echo + @echo "* to enable kamailio service run:" + @echo " systemctl enable kamailio" + @echo " systemctl daemon-reload" + .PHONY: dbschema dbschema: -@echo "Build database schemas"

1 0

git:master:870de70c: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 31 Jan '19

31 Jan '19

Module: kamailio Branch: master Commit: 870de70cb574ab0b0b902529fdcd469c95af80d2 URL: https://github.com/kamailio/kamailio/commit/870de70cb574ab0b0b902529fdcd469… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-31T20:01:34+01:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/870de70cb574ab0b0b902529fdcd469… Patch: https://github.com/kamailio/kamailio/commit/870de70cb574ab0b0b902529fdcd469… --- diff --git a/src/modules/htable/README b/src/modules/htable/README index c003e524b2..cb9a9e761a 100644 --- a/src/modules/htable/README +++ b/src/modules/htable/README @@ -82,8 +82,9 @@ Ovidiu Sas 6.4. htable.seti htable key value 6.5. htable.dump htable 6.6. htable.reload htable - 6.7. htable.listTables - 6.8. htable.stats + 6.7. htable.flush htable + 6.8. htable.listTables + 6.9. htable.stats 7. Event routes @@ -182,8 +183,9 @@ Chapter 1. Admin Guide 6.4. htable.seti htable key value 6.5. htable.dump htable 6.6. htable.reload htable - 6.7. htable.listTables - 6.8. htable.stats + 6.7. htable.flush htable + 6.8. htable.listTables + 6.9. htable.stats 7. Event routes @@ -960,8 +962,9 @@ if(sht_has_str_value("ha", "eq", "alice")) { 6.4. htable.seti htable key value 6.5. htable.dump htable 6.6. htable.reload htable - 6.7. htable.listTables - 6.8. htable.stats + 6.7. htable.flush htable + 6.8. htable.listTables + 6.9. htable.stats 6.1. htable.get htable key @@ -1069,7 +1072,21 @@ kamcmd htable.dump ipban kamcmd htable.reload ipban ... -6.7. htable.listTables +6.7. htable.flush htable + + Empty the hash table + + Name: htable.flush + + Parameters: + * htable : Name of the hash table to flush + + Example: +... +kamcmd htable.flush ipban +... + +6.8. htable.listTables Lists all defined tables @@ -1083,7 +1100,7 @@ kamcmd htable.reload ipban kamcmd htable.listTables ... -6.8. htable.stats +6.9. htable.stats Get statistics for hash tables - name, number of slots, number of items, max number of items per slot, min number of items per slot.

1 0

git:master:4fe81fe0: Merge pull request #1828 from gaaf/htable-flush
by GitHub 31 Jan '19

31 Jan '19

Module: kamailio Branch: master Commit: 4fe81fe0c31f2578659c3fe02079eadc3af36f46 URL: https://github.com/kamailio/kamailio/commit/4fe81fe0c31f2578659c3fe02079ead… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-01-31T19:59:01+01:00 Merge pull request #1828 from gaaf/htable-flush htable: Add RPC htable.flush <htable> --- Modified: src/modules/htable/doc/htable_admin.xml Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/4fe81fe0c31f2578659c3fe02079ead… Patch: https://github.com/kamailio/kamailio/commit/4fe81fe0c31f2578659c3fe02079ead… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 708973a045..859f7787ca 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -1390,6 +1390,29 @@ kamcmd htable.dump ipban ... kamcmd htable.reload ipban ... +</programlisting> + </section> + <section id="htable.rpc.flush"> + <title> + <function moreinfo="none">htable.flush htable</function> + </title> + <para> + Empty the hash table + </para> + <para> + Name: <emphasis>htable.flush</emphasis> + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para>htable : Name of the hash table to flush</para></listitem> + </itemizedlist> + <para> + Example: + </para> +<programlisting format="linespecific"> +... +kamcmd htable.flush ipban +... </programlisting> </section> <section id="htable.rpc.listTables"> diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 1da1ba7928..580e3bc881 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1123,6 +1123,10 @@ static const char* htable_stats_doc[2] = { "Statistics about htables.", 0 }; +static const char* htable_flush_doc[2] = { + "Flush hash table.", + 0 +}; static const char* htable_reload_doc[2] = { "Reload hash table.", 0 @@ -1474,6 +1478,25 @@ static void htable_rpc_stats(rpc_t* rpc, void* c) return; } +/*! \brief RPC htable.flush command to empty a hash table */ +static void htable_rpc_flush(rpc_t* rpc, void* c) +{ + str htname; + ht_t *ht; + + if (rpc->scan(c, "S", &htname) < 1) + { + rpc->fault(c, 500, "No htable name given"); + return; + } + ht = ht_get_table(&htname); + if(ht==NULL) + { + rpc->fault(c, 500, "No such htable"); + return; + } + ht_reset_content(ht); +} /*! \brief RPC htable.reload command to reload content of a hash table */ static void htable_rpc_reload(rpc_t* rpc, void* c) @@ -1583,6 +1606,7 @@ rpc_export_t htable_rpc[] = { {"htable.listTables", htable_rpc_list, htable_list_doc, RET_ARRAY}, {"htable.reload", htable_rpc_reload, htable_reload_doc, 0}, {"htable.stats", htable_rpc_stats, htable_stats_doc, RET_ARRAY}, + {"htable.flush", htable_rpc_flush, htable_flush_doc, 0}, {0, 0, 0, 0} };

1 0

[kamailio/kamailio] htable: Add RPC htable.flush <htable> (#1828)
by Alex Hermann 31 Jan '19

31 Jan '19

Empties the entire specified hash table   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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) - [x] 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Add a new RPC comand to flush (empty) a htable. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1828 -- Commit Summary -- * htable: Add RPC htable.flush <htable> -- File Changes -- M src/modules/htable/doc/htable_admin.xml (23) M src/modules/htable/htable.c (24) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1828.patch https://github.com/kamailio/kamailio/pull/1828.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/1828

2 2

git:master:19d25bac: htable: Add RPC htable.flush <htable>
by Alex Hermann 31 Jan '19

31 Jan '19

Module: kamailio Branch: master Commit: 19d25bacb8d15473e0e9f11a50484ba669430e0c URL: https://github.com/kamailio/kamailio/commit/19d25bacb8d15473e0e9f11a50484ba… Author: Alex Hermann <alex(a)hexla.nl> Committer: Alex Hermann <alex(a)hexla.nl> Date: 2019-01-31T19:08:28+01:00 htable: Add RPC htable.flush <htable> Empties the entire specified hash table --- Modified: src/modules/htable/doc/htable_admin.xml Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/19d25bacb8d15473e0e9f11a50484ba… Patch: https://github.com/kamailio/kamailio/commit/19d25bacb8d15473e0e9f11a50484ba… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 708973a045..859f7787ca 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -1390,6 +1390,29 @@ kamcmd htable.dump ipban ... kamcmd htable.reload ipban ... +</programlisting> + </section> + <section id="htable.rpc.flush"> + <title> + <function moreinfo="none">htable.flush htable</function> + </title> + <para> + Empty the hash table + </para> + <para> + Name: <emphasis>htable.flush</emphasis> + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para>htable : Name of the hash table to flush</para></listitem> + </itemizedlist> + <para> + Example: + </para> +<programlisting format="linespecific"> +... +kamcmd htable.flush ipban +... </programlisting> </section> <section id="htable.rpc.listTables"> diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 1da1ba7928..580e3bc881 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1123,6 +1123,10 @@ static const char* htable_stats_doc[2] = { "Statistics about htables.", 0 }; +static const char* htable_flush_doc[2] = { + "Flush hash table.", + 0 +}; static const char* htable_reload_doc[2] = { "Reload hash table.", 0 @@ -1474,6 +1478,25 @@ static void htable_rpc_stats(rpc_t* rpc, void* c) return; } +/*! \brief RPC htable.flush command to empty a hash table */ +static void htable_rpc_flush(rpc_t* rpc, void* c) +{ + str htname; + ht_t *ht; + + if (rpc->scan(c, "S", &htname) < 1) + { + rpc->fault(c, 500, "No htable name given"); + return; + } + ht = ht_get_table(&htname); + if(ht==NULL) + { + rpc->fault(c, 500, "No such htable"); + return; + } + ht_reset_content(ht); +} /*! \brief RPC htable.reload command to reload content of a hash table */ static void htable_rpc_reload(rpc_t* rpc, void* c) @@ -1583,6 +1606,7 @@ rpc_export_t htable_rpc[] = { {"htable.listTables", htable_rpc_list, htable_list_doc, RET_ARRAY}, {"htable.reload", htable_rpc_reload, htable_reload_doc, 0}, {"htable.stats", htable_rpc_stats, htable_stats_doc, RET_ARRAY}, + {"htable.flush", htable_rpc_flush, htable_flush_doc, 0}, {0, 0, 0, 0} };

1 0

git:master:43d49848: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 31 Jan '19

31 Jan '19

Module: kamailio Branch: master Commit: 43d49848c33360484ac57719bd09740326754b69 URL: https://github.com/kamailio/kamailio/commit/43d49848c33360484ac57719bd09740… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-31T16:16:50+01:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/43d49848c33360484ac57719bd09740… Patch: https://github.com/kamailio/kamailio/commit/43d49848c33360484ac57719bd09740… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index fa1554dde6..766e639c6f 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1131,7 +1131,7 @@ if(ds_select("1", "$var(a)")) { destination URI; '1', 'r' or 'R' to push the address in R-URI; '2', 'x' or 'X' to push the address only in the XAVP when failure rerouting is enabled. Note that only first character of the - parameter matters, therefore once case use a more meaningful value + parameter matters, therefore one can use a more meaningful value such as 'ruri' instead of 'r'. The parameter can contain pseudo variables. * limit - a positive integer value to restrict the number of selected

1 0

git:master:bcb92740: dispatcher: docs - fixed typos
by Daniel-Constantin Mierla 31 Jan '19

31 Jan '19

Module: kamailio Branch: master Commit: bcb92740f043dce7c5145070cb298de5f7d02c6e URL: https://github.com/kamailio/kamailio/commit/bcb92740f043dce7c5145070cb298de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-31T16:05:13+01:00 dispatcher: docs - fixed typos --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bcb92740f043dce7c5145070cb298de… Patch: https://github.com/kamailio/kamailio/commit/bcb92740f043dce7c5145070cb298de… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 5173dffdb9..493332ab28 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1308,7 +1308,7 @@ if(ds_select("1", "$var(a)")) { the address in destination URI; '1', 'r' or 'R' to push the address in R-URI; '2', 'x' or 'X' to push the address only in the XAVP when failure rerouting is enabled. Note that only first character of the - parameter matters, therefore once case use a more meaningful value + parameter matters, therefore one can use a more meaningful value such as 'ruri' instead of 'r'. The parameter can contain pseudo variables. </para>

1 0

Kamailio v5.1.7 Released
by Daniel-Constantin Mierla 31 Jan '19

31 Jan '19

Hello, Kamailio SIP Server v5.1.7 stable release is out. This is a maintenance release of the previous stable branch, 5.1, that includes fixes since the release of v5.1.6. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.1.x. Deployments running previous v5.1.x versions are strongly recommended to be upgraded to v5.1.7 or to v5.2.x series. For more details about version 5.1.7 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2019/01/kamailio-v5-1-7-released/ RPM, Debian/Ubuntu packages will be available soon as well. Note: the branch 5.1 is the previous stable branch. The latest stable branch is 5.2, at this time with v5.2.1 being released out of it. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - May 6-8, 2019 -- www.kamailioworld.com Kamailio Advanced Training - Mar 4-6, 2019 in Berlin; Mar 25-27, 2019, in Washington, DC, USA -- www.asipto.com

1 0

git:5.1:5c51f702: Makefile.defs: version set to 5.1.7
by Daniel-Constantin Mierla 31 Jan '19

31 Jan '19

Module: kamailio Branch: 5.1 Commit: 5c51f70229b193abbf4fe00515cbc67e3fe9e245 URL: https://github.com/kamailio/kamailio/commit/5c51f70229b193abbf4fe00515cbc67… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-31T10:24:10+01:00 Makefile.defs: version set to 5.1.7 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/5c51f70229b193abbf4fe00515cbc67… Patch: https://github.com/kamailio/kamailio/commit/5c51f70229b193abbf4fe00515cbc67… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 7c1c409884..35b6b0233b 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 1 -SUBLEVEL = 6 +SUBLEVEL = 7 EXTRAVERSION = # memory manager switcher

1 0

git:5.1:567df37f: ChangeLog: content updated for v5.1.7
by Daniel-Constantin Mierla 31 Jan '19

31 Jan '19

Module: kamailio Branch: 5.1 Commit: 567df37f5844528daf4697c95566ee39555c57d6 URL: https://github.com/kamailio/kamailio/commit/567df37f5844528daf4697c95566ee3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-31T10:32:06+01:00 ChangeLog: content updated for v5.1.7 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/567df37f5844528daf4697c95566ee3… Patch: https://github.com/kamailio/kamailio/commit/567df37f5844528daf4697c95566ee3…

1 0

git:5.1:745bfe69: pkg/kamailio/deb: version set to 5.1.7
by Victor Seva 31 Jan '19

31 Jan '19

Module: kamailio Branch: 5.1 Commit: 745bfe69a6f42ee882f4dcd37fef7c78a02120e8 URL: https://github.com/kamailio/kamailio/commit/745bfe69a6f42ee882f4dcd37fef7c7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-01-31T10:17:26+01:00 pkg/kamailio/deb: version set to 5.1.7 --- Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/745bfe69a6f42ee882f4dcd37fef7c7… Patch: https://github.com/kamailio/kamailio/commit/745bfe69a6f42ee882f4dcd37fef7c7… --- diff --git a/pkg/kamailio/deb/buster/changelog b/pkg/kamailio/deb/buster/changelog index 1bf0e11ca1..ba5d29653d 100644 --- a/pkg/kamailio/deb/buster/changelog +++ b/pkg/kamailio/deb/buster/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.7) unstable; urgency=medium + + * version set to 5.1.7 + + -- Victor Seva <vseva(a)debian.org> Thu, 31 Jan 2019 10:15:30 +0100 + kamailio (5.1.6) unstable; urgency=medium * version set to 5.1.6 diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index 1bf0e11ca1..ba5d29653d 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.7) unstable; urgency=medium + + * version set to 5.1.7 + + -- Victor Seva <vseva(a)debian.org> Thu, 31 Jan 2019 10:15:30 +0100 + kamailio (5.1.6) unstable; urgency=medium * version set to 5.1.6 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index 1bf0e11ca1..ba5d29653d 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.7) unstable; urgency=medium + + * version set to 5.1.7 + + -- Victor Seva <vseva(a)debian.org> Thu, 31 Jan 2019 10:15:30 +0100 + kamailio (5.1.6) unstable; urgency=medium * version set to 5.1.6 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index 1bf0e11ca1..ba5d29653d 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.7) unstable; urgency=medium + + * version set to 5.1.7 + + -- Victor Seva <vseva(a)debian.org> Thu, 31 Jan 2019 10:15:30 +0100 + kamailio (5.1.6) unstable; urgency=medium * version set to 5.1.6 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index 1bf0e11ca1..ba5d29653d 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.7) unstable; urgency=medium + + * version set to 5.1.7 + + -- Victor Seva <vseva(a)debian.org> Thu, 31 Jan 2019 10:15:30 +0100 + kamailio (5.1.6) unstable; urgency=medium * version set to 5.1.6 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index 1bf0e11ca1..ba5d29653d 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.7) unstable; urgency=medium + + * version set to 5.1.7 + + -- Victor Seva <vseva(a)debian.org> Thu, 31 Jan 2019 10:15:30 +0100 + kamailio (5.1.6) unstable; urgency=medium * version set to 5.1.6 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index 1bf0e11ca1..ba5d29653d 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.7) unstable; urgency=medium + + * version set to 5.1.7 + + -- Victor Seva <vseva(a)debian.org> Thu, 31 Jan 2019 10:15:30 +0100 + kamailio (5.1.6) unstable; urgency=medium * version set to 5.1.6 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index 1bf0e11ca1..ba5d29653d 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.7) unstable; urgency=medium + + * version set to 5.1.7 + + -- Victor Seva <vseva(a)debian.org> Thu, 31 Jan 2019 10:15:30 +0100 + kamailio (5.1.6) unstable; urgency=medium * version set to 5.1.6 diff --git a/pkg/kamailio/deb/xenial/changelog b/pkg/kamailio/deb/xenial/changelog index 1bf0e11ca1..ba5d29653d 100644 --- a/pkg/kamailio/deb/xenial/changelog +++ b/pkg/kamailio/deb/xenial/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.7) unstable; urgency=medium + + * version set to 5.1.7 + + -- Victor Seva <vseva(a)debian.org> Thu, 31 Jan 2019 10:15:30 +0100 + kamailio (5.1.6) unstable; urgency=medium * version set to 5.1.6

1 0

git:5.1:295a2e86: pkg: version set to 5.1.7 for rpm and other specs
by Daniel-Constantin Mierla 31 Jan '19

31 Jan '19

Module: kamailio Branch: 5.1 Commit: 295a2e86a7339d5bf07077cbfb0269bae3a0bcfb URL: https://github.com/kamailio/kamailio/commit/295a2e86a7339d5bf07077cbfb0269b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-31T10:15:04+01:00 pkg: version set to 5.1.7 for rpm and other specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/centos/6/kamailio.spec Modified: pkg/kamailio/centos/7/kamailio.spec Modified: pkg/kamailio/fedora/17/kamailio.spec Modified: pkg/kamailio/freebsd/Makefile Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/openbsd/Makefile Modified: pkg/kamailio/oracle/el6/kamailio.spec Modified: pkg/kamailio/oracle/el7/kamailio.spec Modified: pkg/kamailio/rpm/kamailio.spec-4.1 Modified: pkg/kamailio/rpm/kamailio.spec.CenOS Modified: pkg/kamailio/rpm/kamailio.spec.SuSE Modified: pkg/kamailio/solaris/pkginfo --- Diff: https://github.com/kamailio/kamailio/commit/295a2e86a7339d5bf07077cbfb0269b… Patch: https://github.com/kamailio/kamailio/commit/295a2e86a7339d5bf07077cbfb0269b…

1 0

git:5.1:eb29671e: websocket: put the ws connection after keepalive
by Daniel-Constantin Mierla 31 Jan '19

31 Jan '19

Module: kamailio Branch: 5.1 Commit: eb29671e9b68fafdeea0849b6f7340e88beb0949 URL: https://github.com/kamailio/kamailio/commit/eb29671e9b68fafdeea0849b6f7340e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-31T09:34:34+01:00 websocket: put the ws connection after keepalive - c&p error of last commits resulted in doing get op instead (cherry picked from commit a975bca1702ea2f3db47f834f7e4da2786ced201) (cherry picked from commit b3567878dd8b43f22bd7ce88db7611cf6ca029ff) --- Modified: src/modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/eb29671e9b68fafdeea0849b6f7340e… Patch: https://github.com/kamailio/kamailio/commit/eb29671e9b68fafdeea0849b6f7340e… --- diff --git a/src/modules/websocket/ws_frame.c b/src/modules/websocket/ws_frame.c index 94004cb2f2..840125a041 100644 --- a/src/modules/websocket/ws_frame.c +++ b/src/modules/websocket/ws_frame.c @@ -820,7 +820,7 @@ void ws_keepalive(unsigned int ticks, void *param) } } if(wsc) { - wsconn_get(list_head[i].id); + wsconn_put_id(list_head[i].id); } i++;

1 0

git:5.2:b3567878: websocket: put the ws connection after keepalive
by Daniel-Constantin Mierla 31 Jan '19

31 Jan '19

Module: kamailio Branch: 5.2 Commit: b3567878dd8b43f22bd7ce88db7611cf6ca029ff URL: https://github.com/kamailio/kamailio/commit/b3567878dd8b43f22bd7ce88db7611c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-31T09:32:12+01:00 websocket: put the ws connection after keepalive - c&p error of last commits resulted in doing get op instead (cherry picked from commit a975bca1702ea2f3db47f834f7e4da2786ced201) --- Modified: src/modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/b3567878dd8b43f22bd7ce88db7611c… Patch: https://github.com/kamailio/kamailio/commit/b3567878dd8b43f22bd7ce88db7611c… --- diff --git a/src/modules/websocket/ws_frame.c b/src/modules/websocket/ws_frame.c index 94004cb2f2..840125a041 100644 --- a/src/modules/websocket/ws_frame.c +++ b/src/modules/websocket/ws_frame.c @@ -820,7 +820,7 @@ void ws_keepalive(unsigned int ticks, void *param) } } if(wsc) { - wsconn_get(list_head[i].id); + wsconn_put_id(list_head[i].id); } i++;

1 0

git:master:a975bca1: websocket: put the ws connection after keepalive
by Daniel-Constantin Mierla 31 Jan '19

31 Jan '19

Module: kamailio Branch: master Commit: a975bca1702ea2f3db47f834f7e4da2786ced201 URL: https://github.com/kamailio/kamailio/commit/a975bca1702ea2f3db47f834f7e4da2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-31T09:25:28+01:00 websocket: put the ws connection after keepalive - c&p error of last commits resulted in doing get op instead --- Modified: src/modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/a975bca1702ea2f3db47f834f7e4da2… Patch: https://github.com/kamailio/kamailio/commit/a975bca1702ea2f3db47f834f7e4da2… --- diff --git a/src/modules/websocket/ws_frame.c b/src/modules/websocket/ws_frame.c index 94004cb2f2..840125a041 100644 --- a/src/modules/websocket/ws_frame.c +++ b/src/modules/websocket/ws_frame.c @@ -820,7 +820,7 @@ void ws_keepalive(unsigned int ticks, void *param) } } if(wsc) { - wsconn_get(list_head[i].id); + wsconn_put_id(list_head[i].id); } i++;

1 0

Planing the release of Kamailio v5.1.7
by Daniel-Constantin Mierla 31 Jan '19

31 Jan '19

Hello, I am considering to release Kamailio v5.1.7 later this week, likely on Thursday, January 31, 2019. As usual, here come the notice to report any issue that you are aware of and not yet registered on the bug tracker in order to give them a chance to be analyzed and eventually fixed before the release. Also, take a look at the branch 5.1 in git and check if there are any missing commits from those you expected to be backported. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - May 6-8, 2019 -- www.kamailioworld.com Kamailio Advanced Training - Mar 4-6, 2019 in Berlin; Mar 25-27, 2019, in Washington, DC, USA -- www.asipto.com

1 1

git:master:d61b570c: core: added command line option --alias=val
by Daniel-Constantin Mierla 30 Jan '19

30 Jan '19

Module: kamailio Branch: master Commit: d61b570c21200bb90cb00d8203f62997c6035bdb URL: https://github.com/kamailio/kamailio/commit/d61b570c21200bb90cb00d8203f6299… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-30T13:39:04+01:00 core: added command line option --alias=val * set an alias from command line * example: kamailio --alias=udp:kamailio.org:5060 ... --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/d61b570c21200bb90cb00d8203f6299… Patch: https://github.com/kamailio/kamailio/commit/d61b570c21200bb90cb00d8203f6299… --- diff --git a/src/main.c b/src/main.c index f1a26359f6..4e3b9112e4 100644 --- a/src/main.c +++ b/src/main.c @@ -155,6 +155,8 @@ Usage: " NAME " [options]\n\ Options:\n\ -a mode Auto aliases mode: enable with yes or on,\n\ disable with no or off\n\ + --alias=val Add an alias, the value has to be '[proto:]hostname[:port]'\n\ + (like for 'alias' global parameter)\n\ -A define Add config pre-processor define (e.g., -A WITH_AUTH)\n\ -b nr Maximum receive buffer size which will not be exceeded by\n\ auto-probing procedure even if OS allows\n\ @@ -170,7 +172,7 @@ Options:\n\ -g gid Change gid (group id)\n\ -G file Create a pgid file\n\ -h This help message\n\ - --help Same as `-h`\n\ + --help Long option for `-h`\n\ -I Print more internal compile flags and options\n\ -K Turn on \"via:\" host checking when forwarding replies\n\ -l address Listen on the specified address/interface (multiple -l\n\ @@ -209,8 +211,9 @@ Options:\n\ " -T Disable tcp\n" #endif " -u uid Change uid (user id)\n\ - -v (-V) Version number\n\ - --version Same as `-v`\n\ + -v Version number\n\ + --version Long option for `-v`\n\ + -V Alternative for `-v`\n\ -x name Specify internal manager for shared memory (shm)\n\ - can be: fm, qm or tlsf\n\ -X name Specify internal manager for private memory (pkg)\n\ @@ -1878,9 +1881,13 @@ int main(int argc, char** argv) int option_index = 0; +#define KARGOPTVAL 1024 static struct option long_options[] = { + /* long options with short variant */ {"help", no_argument, 0, 'h'}, {"version", no_argument, 0, 'v'}, + /* long options without short variant */ + {"alias", required_argument, 0, KARGOPTVAL}, {0, 0, 0, 0 } }; @@ -2101,6 +2108,21 @@ int main(int argc, char** argv) case 's': case 'Y': break; + + /* long options */ + case KARGOPTVAL: + if(parse_phostport(optarg, &tmp, &tmp_len, + &port, &proto)!=0) { + fprintf(stderr, "Invalid alias value '%s'\n", optarg); + goto error; + } + if(add_alias(tmp, tmp_len, port, proto)<0) { + fprintf(stderr, "Failed to add alias value '%s'\n", optarg); + goto error; + } + break; + + /* special cases */ case '?': if (isprint(optopt)) { fprintf(stderr, "Unknown option '-%c'." @@ -2122,6 +2144,7 @@ int main(int argc, char** argv) optopt, option_index); } goto error; + default: fprintf(stderr, "Invalid option code '0x%x'", c); return -1;

1 0

git:master:adb599f0: core: better order for command line options in help message
by Daniel-Constantin Mierla 30 Jan '19

30 Jan '19

Module: kamailio Branch: master Commit: adb599f0c7c91c4d21f491eaa81c23694fb65655 URL: https://github.com/kamailio/kamailio/commit/adb599f0c7c91c4d21f491eaa81c236… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-30T09:06:45+01:00 core: better order for command line options in help message --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/adb599f0c7c91c4d21f491eaa81c236… Patch: https://github.com/kamailio/kamailio/commit/adb599f0c7c91c4d21f491eaa81c236…

1 0

git:master:60f13ffe: core: added long command line options
by Daniel-Constantin Mierla 30 Jan '19

30 Jan '19

Module: kamailio Branch: master Commit: 60f13ffe2b97d21841335361ccadfa3061c0c3db URL: https://github.com/kamailio/kamailio/commit/60f13ffe2b97d21841335361ccadfa3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-30T13:14:06+01:00 core: added long command line options * --help - print help message * --version - print version string --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/60f13ffe2b97d21841335361ccadfa3… Patch: https://github.com/kamailio/kamailio/commit/60f13ffe2b97d21841335361ccadfa3… --- diff --git a/src/main.c b/src/main.c index 44b9f8399d..f1a26359f6 100644 --- a/src/main.c +++ b/src/main.c @@ -35,6 +35,7 @@ #include <errno.h> #include <ctype.h> #include <string.h> +#include <getopt.h> #include <netdb.h> #include <unistd.h> #include <sys/types.h> @@ -169,6 +170,7 @@ Options:\n\ -g gid Change gid (group id)\n\ -G file Create a pgid file\n\ -h This help message\n\ + --help Same as `-h`\n\ -I Print more internal compile flags and options\n\ -K Turn on \"via:\" host checking when forwarding replies\n\ -l address Listen on the specified address/interface (multiple -l\n\ @@ -208,6 +210,7 @@ Options:\n\ #endif " -u uid Change uid (user id)\n\ -v (-V) Version number\n\ + --version Same as `-v`\n\ -x name Specify internal manager for shared memory (shm)\n\ - can be: fm, qm or tlsf\n\ -X name Specify internal manager for private memory (pkg)\n\ @@ -1873,6 +1876,14 @@ int main(int argc, char** argv) char *p; struct stat st = {0}; + int option_index = 0; + + static struct option long_options[] = { + {"help", no_argument, 0, 'h'}, + {"version", no_argument, 0, 'v'}, + {0, 0, 0, 0 } + }; + /*init*/ time(&up_since); creator_pid = getpid(); @@ -1901,7 +1912,8 @@ int main(int argc, char** argv) * later */ opterr = 0; - while((c=getopt(argc,argv,options))!=-1) { + option_index = 0; + while((c=getopt_long(argc, argv, options, long_options, &option_index))!=-1) { switch(c) { case 'd': debug_flag = 1; @@ -1977,9 +1989,10 @@ int main(int argc, char** argv) pp_define_core(); /* process command line (cfg. file path etc) */ - optind = 1; /* reset getopt */ + optind = 1; /* reset getopt index */ + option_index = 0; /* switches required before script processing */ - while((c=getopt(argc,argv,options))!=-1) { + while((c=getopt_long(argc, argv, options, long_options, &option_index))!=-1) { switch(c) { case 'M': case 'x': @@ -2090,21 +2103,28 @@ int main(int argc, char** argv) break; case '?': if (isprint(optopt)) { - fprintf(stderr, "Unknown option `-%c'." + fprintf(stderr, "Unknown option '-%c'." " Use -h for help.\n", optopt); } else { - fprintf(stderr, "Unknown option character `\\x%x'." + fprintf(stderr, "Unknown option code '0x%x' (%d)." " Use -h for help.\n", - optopt); + optopt, option_index); } goto error; case ':': - fprintf(stderr, "Option `-%c' requires an argument." + if (isprint(optopt)) { + fprintf(stderr, "Option '-%c' requires an argument." " Use -h for help.\n", - optopt); + optopt); + } else { + fprintf(stderr, "Option code '0x%x' (%d) requires an argument." + " Use -h for help.\n", + optopt, option_index); + } goto error; default: - abort(); + fprintf(stderr, "Invalid option code '0x%x'", c); + return -1; } } if (shm_mem_size == 0) { @@ -2186,8 +2206,9 @@ int main(int argc, char** argv) goto error; } /* options with higher priority than cfg file */ - optind = 1; /* reset getopt */ - while((c=getopt(argc,argv,options))!=-1) { + optind = 1; /* reset getopt index */ + option_index = 0; + while((c=getopt_long(argc, argv, options, long_options, &option_index))!=-1) { switch(c) { case 'f': case 'c':

1 0

[kamailio/kamailio] BLOG conversion (#1255)
by sergey-safarov 30 Jan '19

30 Jan '19

### Description I use kazoo and postgres modules on my host. I found that many database operation generates error like ``` 19(150) exec: *** cfgtrace:request_route=[kazoo:consumer-event-presence-dialog-update] c=[//etc/kamailio/presence-role.cfg] l=270 a=32 n=kazoo_pua_publish_presence 17(148) exec: *** cfgtrace:request_route=[kazoo:consumer-event-presence-dialog-update] c=[//etc/kamailio/presence-role.cfg] l=271 a=27 n=pres_refresh_watchers Entity: line 1: parser error : Start tag expected, '<' not found \x3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d38223f3e3c ^ 17(148) ERROR: presence_xml [notify_body.c:551]: agregate_xmls(): while parsing xml body message 17(148) ERROR: presence_xml [notify_body.c:156]: pres_agg_nbody(): while aggregating body 19(150) exec: *** cfgtrace:request_route=[kazoo:consumer-event-presence-dialog-update] c=[//etc/kamailio/presence-role.cfg] l=271 a=27 n=pres_refresh_watchers Entity: line 1: parser error : Start tag expected, '<' not found \x3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d38223f3e3c ^ 19(150) ERROR: presence_xml [notify_body.c:551]: agregate_xmls(): while parsing xml body message 19(150) ERROR: presence_xml [notify_body.c:156]: pres_agg_nbody(): while aggregating body 18(149) exec: *** cfgtrace:request_route=[kazoo:consumer-event-nodes-advertise] c=[//etc/kamailio/nodes-role.cfg] l=66 a=63 n=assign 18(149) exec: *** cfgtrace:request_route=[kazoo:consumer-event-nodes-advertise] c=[//etc/kamailio/nodes-role.cfg] l=74 a=16 n=if 18(149) exec: *** cfgtrace:request_route=[kazoo:consumer-event-nodes-advertise] c=[//etc/kamailio/nodes-role.cfg] l=74 a=16 n=if 18(149) exec: *** cfgtrace:request_route=[kazoo:consumer-event-nodes-advertise] c=[//etc/kamailio/nodes-role.cfg] l=75 a=27 n=mq_add Entity: line 1: parser error : Start tag expected, '<' not found \x3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d38223f3e3c ^ 17(148) ERROR: presence_xml [notify_body.c:551]: agregate_xmls(): while parsing xml body message 17(148) ERROR: presence_xml [notify_body.c:156]: pres_agg_nbody(): while aggregating body Entity: line 1: parser error : Start tag expected, '<' not found \x3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d38223f3e3c ^ 19(150) ERROR: presence_xml [notify_body.c:551]: agregate_xmls(): while parsing xml body message 19(150) ERROR: presence_xml [notify_body.c:156]: pres_agg_nbody(): while aggregating body Entity: line 1: parser error : Start tag expected, '<' not found \x3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d38223f3e3c ^ 17(148) ERROR: presence_xml [notify_body.c:551]: agregate_xmls(): while parsing xml body message 17(148) ERROR: presence_xml [notify_body.c:156]: pres_agg_nbody(): while aggregating body 17(148) exec: *** cfgtrace:request_route=[kazoo:consumer-event-presence-dialog-update] c=[//etc/kamailio/presence-role.cfg] l=276 a=26 n=xlog 17(148) INFO: <script>: 3O75Qw3gqR3ZNla5RfCgQLVW0-8KKbrT|log|finished processing dialog update for sip:2496@rcsnet.ru state confirmed from sip:217.12.247.98:11000 at 1506632313/1506632313/1506632313 Entity: line 1: parser error : Start tag expected, '<' not found \x3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d38223f3e3c ^ ``` After some debugging i found that kamailio wants save to database xml string like this as BLOB object ``` <?xml version="1.0" encoding="UTF-8"?><presence xmlns="urn:ietf:params:xml:ns:pidf" xmlns:dm="urn:ietf:params:xml:ns:pidf:data-model" xmlns:rpid="urn:ietf:params:xml:ns:pidf:rpid" xmlns:c="urn:ietf:params:xml:ns:pidf:cipid" entity="2496"> <tuple xmlns="urn:ietf:params:xml:ns:pidf" id="t8No1hQnp65U33jS1oqFMgxbIRPq-iFP"><status><basic>open</basic></status></tuple><note xmlns="urn:ietf:params:xml:ns:pidf">On the Phone</note><dm:person xmlns:dm="urn:ietf:params:xml:ns:pidf:data-model" xmlns:rpid="urn:ietf:params:xml:ns:pidf:rpid" id="1"><rpid:activities><rpid:on-the-phone/></rpid:activities><dm:note>On the Phone</dm:note></dm:person></presence> ``` And later tries to read. But when this XML read reverse conversion of BLOB to string is not take place. And late used BLOB as is. This breaks presentation logic completely. #### Reproduction Configure kamailio on kazoo cluster to use PostgreSQL database On phone create subscribe to second >From second phone create new call. #### Operating System CentOS 7 Linux node2.docker.rcsnet.ru 3.10.0-514.16.1.el7.x86_64 #1 SMP Wed Apr 12 15:04:24 UTC 2017 x86_64 x86_64 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/1255

5 20

git:master:a0552144: pike: init head list and safety check
by Daniel-Constantin Mierla 29 Jan '19

29 Jan '19

Module: kamailio Branch: master Commit: a055214404b86d6418b7b6797e789773f1f42adb URL: https://github.com/kamailio/kamailio/commit/a055214404b86d6418b7b6797e78977… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-29T14:24:34+01:00 pike: init head list and safety check - related to GH #1822 --- Modified: src/modules/pike/pike_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/a055214404b86d6418b7b6797e78977… Patch: https://github.com/kamailio/kamailio/commit/a055214404b86d6418b7b6797e78977… --- diff --git a/src/modules/pike/pike_funcs.c b/src/modules/pike/pike_funcs.c index 6567ed59ef..2405090680 100644 --- a/src/modules/pike/pike_funcs.c +++ b/src/modules/pike/pike_funcs.c @@ -178,6 +178,7 @@ void clean_routine(unsigned int ticks , void *param) * be at least one element removed */ if (timer==0 || is_list_empty( timer )) return; /* quick exit */ + memset(&head, 0, sizeof(struct list_link)); /* get the expired elements */ lock_get( timer_lock ); /* check again for empty list */ @@ -201,7 +202,7 @@ void clean_routine(unsigned int ticks , void *param) continue; lock_tree_branch( i ); - for( ll=head.next ; ll!=&head ; ) { + for( ll=head.next; ll!=&head && ll!=NULL; ) { node = ll2ipnode( ll ); ll = ll->next; /* skip nodes from a different branch */

1 0

git:master:f26f3a2b: modules: readme files regenerated - tsilo ... [skip ci]
by Kamailio Dev 28 Jan '19

28 Jan '19

Module: kamailio Branch: master Commit: f26f3a2bdc33bc8329e0dbdfe26d1d93c8447ecb URL: https://github.com/kamailio/kamailio/commit/f26f3a2bdc33bc8329e0dbdfe26d1d9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-28T21:01:54+01:00 modules: readme files regenerated - tsilo ... [skip ci] --- Modified: src/modules/tsilo/README --- Diff: https://github.com/kamailio/kamailio/commit/f26f3a2bdc33bc8329e0dbdfe26d1d9… Patch: https://github.com/kamailio/kamailio/commit/f26f3a2bdc33bc8329e0dbdfe26d1d9… --- diff --git a/src/modules/tsilo/README b/src/modules/tsilo/README index 453a9a7e4e..47c14ce1bb 100644 --- a/src/modules/tsilo/README +++ b/src/modules/tsilo/README @@ -196,7 +196,7 @@ if (is_method("INVITE")) { Example 1.4. ts_append usage ... if (is_method("REGISTER")) { - ts_append("location", "$tU"); + ts_append("location", "$tu"); } ...

1 0

git:5.2:cd25830e: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 28 Jan '19

28 Jan '19

Module: kamailio Branch: 5.2 Commit: cd25830eb881b1dd667544f68a94efdf195a7cea URL: https://github.com/kamailio/kamailio/commit/cd25830eb881b1dd667544f68a94efd… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-28T21:01:40+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tsilo/README --- Diff: https://github.com/kamailio/kamailio/commit/cd25830eb881b1dd667544f68a94efd… Patch: https://github.com/kamailio/kamailio/commit/cd25830eb881b1dd667544f68a94efd… --- diff --git a/src/modules/tsilo/README b/src/modules/tsilo/README index 453a9a7e4e..47c14ce1bb 100644 --- a/src/modules/tsilo/README +++ b/src/modules/tsilo/README @@ -196,7 +196,7 @@ if (is_method("INVITE")) { Example 1.4. ts_append usage ... if (is_method("REGISTER")) { - ts_append("location", "$tU"); + ts_append("location", "$tu"); } ...

1 0

git:5.1:e131f95f: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 28 Jan '19

28 Jan '19

Module: kamailio Branch: 5.1 Commit: e131f95f234ce0e4e7dc7752f796e7c42620ce82 URL: https://github.com/kamailio/kamailio/commit/e131f95f234ce0e4e7dc7752f796e7c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-28T21:01:28+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tsilo/README --- Diff: https://github.com/kamailio/kamailio/commit/e131f95f234ce0e4e7dc7752f796e7c… Patch: https://github.com/kamailio/kamailio/commit/e131f95f234ce0e4e7dc7752f796e7c… --- diff --git a/src/modules/tsilo/README b/src/modules/tsilo/README index a60594a044..979e604241 100644 --- a/src/modules/tsilo/README +++ b/src/modules/tsilo/README @@ -196,7 +196,7 @@ if (is_method("INVITE")) { Example 1.4. ts_append usage ... if (is_method("REGISTER")) { - ts_append("location", "$tU"); + ts_append("location", "$tu"); } ...

1 0

git:5.1:f727b05a: tsilo: fixed ts_append example in the doc
by Federico Cabiddu 28 Jan '19

28 Jan '19

Module: kamailio Branch: 5.1 Commit: f727b05ad76c1b22ddba8b3aed311084c260c588 URL: https://github.com/kamailio/kamailio/commit/f727b05ad76c1b22ddba8b3aed31108… Author: Federico Cabiddu <fcabiddu(a)libon.com> Committer: Federico Cabiddu <fcabiddu(a)libon.com> Date: 2019-01-28T20:58:58+01:00 tsilo: fixed ts_append example in the doc (cherry picked from commit 18ef9da4c029fefd5089aed484cd8f32ddb0fb17) --- Modified: src/modules/tsilo/doc/tsilo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f727b05ad76c1b22ddba8b3aed31108… Patch: https://github.com/kamailio/kamailio/commit/f727b05ad76c1b22ddba8b3aed31108… --- diff --git a/src/modules/tsilo/doc/tsilo_admin.xml b/src/modules/tsilo/doc/tsilo_admin.xml index e6cfe9b155..7c79994d38 100644 --- a/src/modules/tsilo/doc/tsilo_admin.xml +++ b/src/modules/tsilo/doc/tsilo_admin.xml @@ -178,7 +178,7 @@ if (is_method("INVITE")) { <programlisting format="linespecific"> ... if (is_method("REGISTER")) { - ts_append("location", "$tU"); + ts_append("location", "$tu"); } ... </programlisting>

1 0

git:5.2:bb9661c5: tsilo: fixed ts_append example in the doc
by Federico Cabiddu 28 Jan '19

28 Jan '19

Module: kamailio Branch: 5.2 Commit: bb9661c595201ab6ce69e34e6084630be7faa307 URL: https://github.com/kamailio/kamailio/commit/bb9661c595201ab6ce69e34e6084630… Author: Federico Cabiddu <fcabiddu(a)libon.com> Committer: Federico Cabiddu <fcabiddu(a)libon.com> Date: 2019-01-28T20:58:35+01:00 tsilo: fixed ts_append example in the doc (cherry picked from commit 18ef9da4c029fefd5089aed484cd8f32ddb0fb17) --- Modified: src/modules/tsilo/doc/tsilo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bb9661c595201ab6ce69e34e6084630… Patch: https://github.com/kamailio/kamailio/commit/bb9661c595201ab6ce69e34e6084630… --- diff --git a/src/modules/tsilo/doc/tsilo_admin.xml b/src/modules/tsilo/doc/tsilo_admin.xml index f1ab297da5..c294e7c282 100644 --- a/src/modules/tsilo/doc/tsilo_admin.xml +++ b/src/modules/tsilo/doc/tsilo_admin.xml @@ -178,7 +178,7 @@ if (is_method("INVITE")) { <programlisting format="linespecific"> ... if (is_method("REGISTER")) { - ts_append("location", "$tU"); + ts_append("location", "$tu"); } ... </programlisting>

1 0

git:master:18ef9da4: tsilo: fixed ts_append example in the doc
by Federico Cabiddu 28 Jan '19

28 Jan '19

Module: kamailio Branch: master Commit: 18ef9da4c029fefd5089aed484cd8f32ddb0fb17 URL: https://github.com/kamailio/kamailio/commit/18ef9da4c029fefd5089aed484cd8f3… Author: Federico Cabiddu <fcabiddu(a)libon.com> Committer: Federico Cabiddu <fcabiddu(a)libon.com> Date: 2019-01-28T20:56:55+01:00 tsilo: fixed ts_append example in the doc --- Modified: src/modules/tsilo/doc/tsilo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/18ef9da4c029fefd5089aed484cd8f3… Patch: https://github.com/kamailio/kamailio/commit/18ef9da4c029fefd5089aed484cd8f3… --- diff --git a/src/modules/tsilo/doc/tsilo_admin.xml b/src/modules/tsilo/doc/tsilo_admin.xml index f1ab297da5..c294e7c282 100644 --- a/src/modules/tsilo/doc/tsilo_admin.xml +++ b/src/modules/tsilo/doc/tsilo_admin.xml @@ -178,7 +178,7 @@ if (is_method("INVITE")) { <programlisting format="linespecific"> ... if (is_method("REGISTER")) { - ts_append("location", "$tU"); + ts_append("location", "$tu"); } ... </programlisting>

1 0

[kamailio/kamailio] modules: fix hiredis handling (#1816)
by micmac1 28 Jan '19

28 Jan '19

The define WITH_HIREDIS_PATH causes the source files to include "<hiredis/hiredis.h>". But the Makefiles check HIREDISDEFS for the string "hiredis" and set WITH_HIREDIS_PATH if not found. Which is exactly the opposite of what is needed. This commit corrects the logic. Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net>   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1816 -- Commit Summary -- * modules: fix hiredis handling -- File Changes -- M src/modules/db_redis/Makefile (2) M src/modules/ndb_redis/Makefile (2) M src/modules/topos_redis/Makefile (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1816.patch https://github.com/kamailio/kamailio/pull/1816.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/1816

2 3

git:5.1:505884a9: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 28 Jan '19

28 Jan '19

Module: kamailio Branch: 5.1 Commit: 505884a9ad1575e7fea88ff026641442822688fb URL: https://github.com/kamailio/kamailio/commit/505884a9ad1575e7fea88ff02664144… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-28T15:01:35+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/dialog/README Modified: src/modules/websocket/README --- Diff: https://github.com/kamailio/kamailio/commit/505884a9ad1575e7fea88ff02664144… Patch: https://github.com/kamailio/kamailio/commit/505884a9ad1575e7fea88ff02664144…

1 0

git: new commits in branch 5.1
by Daniel-Constantin Mierla 28 Jan '19

28 Jan '19

- URL: https://github.com/kamailio/kamailio/commit/3bf230b75b181dd213b08a7cc133fe1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-28T12:47:45+01:00 lib/srdb1: memset db connection structure earlier in db_bind_mod() (cherry picked from commit 1b014d65e26a99f9f5d4aea1b27949776f083c2d) (cherry picked from commit 1133f818461cf2ed6c8bd755543f93b366a02683) - URL: https://github.com/kamailio/kamailio/commit/26173d8999d31c8847d915cd26d164c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-28T12:47:55+01:00 tm: reply_received() - simplify locking for processing sip response - leverage the recursive mutex and skip several zones of unlock/lock, which can lead to races on delayed processing or fast reply retransmissions - related to GH #1613 #1744 (cherry picked from commit 39b89a18a8c357151a173ab02dc95dff1f02715d) (cherry picked from commit cc51d6c7170ad289c8f521a05470a2eacd05f565) - URL: https://github.com/kamailio/kamailio/commit/3e6f951c070291b0b2e9df6cde3f287… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-28T12:48:11+01:00 auth_xkeys: clone value before inserting the lump inside auth_xkeys_add() (cherry picked from commit 01f5ecbc45c236daea62d6638a02c168720c8479) (cherry picked from commit 3a2d9921dc8a3c8133e7e3bacfba94468f9bbeb6) - URL: https://github.com/kamailio/kamailio/commit/67657f5ceef6528fab2371bfea386d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-28T12:49:16+01:00 dialog: store call-id, r-uri, f-uri and t-uri with 0-ending char - can simplify matching with standard string comparison and regexp (cherry picked from commit f1ab32ee4a0bf64017a0b05f2013b81d37d50208) (cherry picked from commit 2e81abf1262784e390eb31efa95c5f437bd7051e) - URL: https://github.com/kamailio/kamailio/commit/e3eb15272e5940222ceb40c0119e1f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-28T12:49:36+01:00 pv: {param.count} accept static string "," as delimiter (cherry picked from commit 80b3c37557d446bfe9ca5a5f469a42af60648280) (cherry picked from commit cb98198e595c776ccbf2cd8777e178eb81e85b58) - URL: https://github.com/kamailio/kamailio/commit/4942d5cecc310f516d20594f58bc7b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-28T12:49:50+01:00 tm: error log message about new final reply made info - can happen due to races of packets on the network (cherry picked from commit 3d43f546ddff613c50068c9d47521a15b42f1c7b) (cherry picked from commit 9ccbcc089e70001dd94136eadb68d2711669142f) - URL: https://github.com/kamailio/kamailio/commit/0d62a374cef1f21ca87d2e2d9ca6b25… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-28T12:50:09+01:00 regex: init var to avoid compile warning (cherry picked from commit dfb872b311cd0acd4a40c810f612c8a23e7c9aca) (cherry picked from commit fc6232f7f9d1c65f436e7ca0db505c6e1114145d) - URL: https://github.com/kamailio/kamailio/commit/44666e217420dda4bda31ae7ffb46ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-28T12:50:21+01:00 cplc: init var to avoid compile warning (cherry picked from commit 0f1b970ae7f47478649b61a8dc43fe42714b2a95) (cherry picked from commit 2dc84951b8f0e2503ee4c551b8693de36b36ef77) - URL: https://github.com/kamailio/kamailio/commit/ab850a6ad3373dea409eed96fe87da3… Author: Balajee <balajee(a)Balajees-MacBook-Air.local> Date: 2019-01-28T12:50:42+01:00 topoh: fixed unmask route issue, if maksing fails for one of the routes (cherry picked from commit d57f70127c44fd74c459aefc8d2655978b9cb48b) (cherry picked from commit 4fe56123b424638a5967832f4ac05d3e63a13577) - URL: https://github.com/kamailio/kamailio/commit/91763e1661c575db1f0ffb1916188a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-28T12:50:54+01:00 topoh: aded debug message for knowing the reason of no decoding rr (cherry picked from commit cee4941daf56985d9734263c4b99c33f9ef3a149) (cherry picked from commit 3a78d068a3678471efe0a7e7f4ea0e7c9bc18675) - URL: https://github.com/kamailio/kamailio/commit/206cdd921b3fcce9e89691a3c5b9154… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-28T12:51:06+01:00 websocket: use the list with ids for ws connections to do ping-pong - avoid using pointers to ws connections, they can get closed (cherry picked from commit b5253b62090feb70f08885fb530d894d0bd6ad90) (cherry picked from commit e25b66962ba51e2749a093f96e0cdaac8df33a4f) - URL: https://github.com/kamailio/kamailio/commit/9059f23474bf9ec35e7001f715860ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-28T12:51:17+01:00 websocket: fetch ws connections based on keepalive process index - get the ones with id that matches the index when doing modulo over the number of keepalive process in order to spread the load of doing the ping-pong (cherry picked from commit 71517152e7de26d6c47fd037c25dc854aa37734f) (cherry picked from commit 049473bce13cc6994cbde1080d75bb25565ad5bc) - URL: https://github.com/kamailio/kamailio/commit/f85e6bada0ebd2597cd016111f96c9f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-28T12:51:30+01:00 websocket: destroy ws connections in dedicated timer process - avoid races/invalid access when sending data failed and the connection was removed - added parameter to control the timer process: interval or running and delay interval for removing (cherry picked from commit af09e224dba0c57c23fd58a7f83a24d2ffbaa07c) (cherry picked from commit 281d6fa15abc3b5f60c9dfc7cab272fca4e50d44) - URL: https://github.com/kamailio/kamailio/commit/89cc9d794ca867de1b60d2239e990d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-28T12:51:41+01:00 websocket: docs for timer_interval and rm_delay_interval params (cherry picked from commit 3a20bb1ad27b8a85ec932975e14bcec12237437b) (cherry picked from commit bc602ee8662a440d0fec47a5ec6b66021a13d4fa) - URL: https://github.com/kamailio/kamailio/commit/6d28f85378eed7a7da05079be68139c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-01-28T12:52:34+01:00 cnxcc: fix compilation warnings > warning: field precision should have type 'int', but argument has type 'size_t' (aka 'unsigned long') [-Wformat] (cherry picked from commit 89e89e023d923d2dbec694509b9f958bbed6d3ad) (cherry picked from commit 92d7bec4b5dddad2d08b6434ab6b561b230ee466) - URL: https://github.com/kamailio/kamailio/commit/19f585b4a32673ee15a9fe50f2edc12… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-28T12:52:44+01:00 dialog: only write debug messages in case cseq or contact fields are empty (cherry picked from commit ae4087ef615c1de5b67c8406eab8316300282d8b) (cherry picked from commit 5067fe22cc16af943126ea88a9ddd35281ca8636) - URL: https://github.com/kamailio/kamailio/commit/16e8c6856cfa0f6af426fc337798435… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-28T12:52:54+01:00 websocket: removed static from declaration of ws_rm_delay_interval - it is used as external in another source file - GH #1771 (cherry picked from commit d5e40d5f05795f3902e5ae51bf4c57345e945a9c) (cherry picked from commit 42821df5cf64d71b9b837e2e5c55b2d91392a250) - URL: https://github.com/kamailio/kamailio/commit/d2459f195398199b3968351d9edabae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-28T12:53:08+01:00 cdp: init pointer to avoid warning on uninitialized use (cherry picked from commit 7873a653a43070f891dc6cde5c188c81bf5de25d) (cherry picked from commit 5bb811d8d7c09c7792206831326c8f650eb30f66) - URL: https://github.com/kamailio/kamailio/commit/d498c3ca48ad2e0538d29e13eb283f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-28T12:53:28+01:00 auth_db: print db table name when version check fails (cherry picked from commit a8de371e90ddc8a6921b5bf7464961865804cc06) (cherry picked from commit f62c3cb67c9c2be10393bdeec684eb3dc9325dd6) - URL: https://github.com/kamailio/kamailio/commit/6d7a6e1ccebf57cd8be791d44d797c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-28T12:53:43+01:00 ims_isc: free variable in case of errors (cherry picked from commit e7d684ad22d17f3aca58dd66c555e43877d9320a) (cherry picked from commit 83597d2fc2922921e66edeca184b3d59354407cf) - URL: https://github.com/kamailio/kamailio/commit/aadd286fe15ddd121580f2770c3c29f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-28T12:54:41+01:00 dialog: docs - more info about using the flag and dlg_manage() (cherry picked from commit e4dfe3587943d69d556b15df3492cf38c3b21a5f) (cherry picked from commit 3dd154faeead29f54145843d14367c5b28a4fb7b) - URL: https://github.com/kamailio/kamailio/commit/3720283674cc783bceb64987ec8f27a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-28T12:54:50+01:00 dialog: do not require dlg_flag parameter to be set - using dlg_manage() should be enough for tracking dialogs (cherry picked from commit 404f403786478a917637186446bb285e8e32cc59) (cherry picked from commit 563f1d6af3123485ed25cc58bb3badd68e7793a4) - URL: https://github.com/kamailio/kamailio/commit/f9e7ea0a35d4115f2437d285a8e27ac… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-01-28T12:55:04+01:00 tsilo: add check for empty aor Fix: #1775 (cherry picked from commit 5a5d742eb459249995114eb6a3642f99c6770496) (cherry picked from commit 23a5c07e924a2feb5f09b727f4ad0faf6c5af349)

1 0

git:master:1fe6605e: Merge pull request #1812 from ycaner06/patch-10
by GitHub 28 Jan '19

28 Jan '19

Module: kamailio Branch: master Commit: 1fe6605e8dfbc5b376b0cdc54200bd6c23c63ba6 URL: https://github.com/kamailio/kamailio/commit/1fe6605e8dfbc5b376b0cdc54200bd6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-01-28T12:30:30+01:00 Merge pull request #1812 from ycaner06/patch-10 ims_registrar_pcscf : added a condition for subscribiton about sos param --- Modified: src/modules/ims_registrar_pcscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/1fe6605e8dfbc5b376b0cdc54200bd6… Patch: https://github.com/kamailio/kamailio/commit/1fe6605e8dfbc5b376b0cdc54200bd6… --- diff --git a/src/modules/ims_registrar_pcscf/save.c b/src/modules/ims_registrar_pcscf/save.c index 39dfe4d589..0789a52bfb 100644 --- a/src/modules/ims_registrar_pcscf/save.c +++ b/src/modules/ims_registrar_pcscf/save.c @@ -387,7 +387,9 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags) { str *service_routes=0; int num_service_routes = 0; pv_elem_t *presentity_uri_pv; - + int contact_has_sos=-1; + contact_t* chi; //contact header information + struct hdr_field* h; //get request from reply req = get_request_from_reply(_m); if (!req) { @@ -395,11 +397,34 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags) { goto error; } expires_hdr = cscf_get_expires_hdr(_m, 0); - cb = cscf_parse_contacts(_m); + + if((parse_headers(_m, HDR_CONTACT_F, 0) == -1) || !_m->contact) { + LM_ERR("cannot get the Contact header from the SIP message in saving action in PCSCF\n"); + goto error; + } + + if(!_m->contact->parsed && parse_contact(_m->contact) < 0) { + LM_ERR("Couldn t parse Contact Header \n"); + goto error; + } + + cb = ((contact_body_t *)_m->contact->parsed); if (!cb || (!cb->contacts && !cb->star)) { LM_DBG("No contact headers and not *\n"); goto error; } + + for (h = _m->contact; h; h = h->next) { + if (h->type == HDR_CONTACT_T && h->parsed) { + for (chi = ((contact_body_t*) h->parsed)->contacts; chi; chi = chi->next) { + contact_has_sos = cscf_get_sos_uri_param(chi->uri); + if(contact_has_sos!=-1){ + break; + } + } + } + } + cscf_get_p_associated_uri(_m, &public_ids, &num_public_ids, 1); service_routes = cscf_get_service_route(_m, &num_service_routes, 1); @@ -409,7 +434,7 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags) { goto error; } - if(subscribe_to_reginfo == 1){ + if(subscribe_to_reginfo == 1 && contact_has_sos < 1){ //use the first p_associated_uri - i.e. the default IMPU LM_DBG("Subscribe to reg event for primary p_associated_uri");

1 0

[kamailio/kamailio] ims_registrar_pcscf : added a condition for subscribiton about sos param (#1812)
by Yasin CANER 28 Jan '19

28 Jan '19

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x ] 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 - [x] 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  if there is a sos parameter on Contact header on saving state in P-CSCF ,P-CSCF dont subscribe to S-CSCF for reg-events. 3GPP TS 24.229 5.2.10.1 Upon receiving the 200 (OK) response to the REGISTER request that completes the emergency registration, as identified by the presence of the "sos" SIP URI parameter in the Contact header field of the 200 (OK) response, the P-CSCF shall not subscribe to the registration event package for any emergency public user identity specified in the REGISTER request. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1812 -- Commit Summary -- * ims_registrar_pcscf : added a condition for subscribiton about sos param -- File Changes -- M src/modules/ims_registrar_pcscf/save.c (31) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1812.patch https://github.com/kamailio/kamailio/pull/1812.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/1812

2 2

git:master:a1148307: ims_registrar_pcscf : added a condition for subscribiton about sos param
by GitHub 28 Jan '19

28 Jan '19

Module: kamailio Branch: master Commit: a1148307a5155c8a6806ae94c0c982200d052dc5 URL: https://github.com/kamailio/kamailio/commit/a1148307a5155c8a6806ae94c0c9822… Author: Yasin CANER <caner_yaso(a)hotmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-01-17T10:56:31+03:00 ims_registrar_pcscf : added a condition for subscribiton about sos param if there is a sos parameter on Contact header on saving state in P-CSCF ,P-CSCF dont subscribe to S-CSCF for reg-events. 3GPP TS 24.229 5.2.10.1 Upon receiving the 200 (OK) response to the REGISTER request that completes the emergency registration, as identified by the presence of the "sos" SIP URI parameter in the Contact header field of the 200 (OK) response, the P-CSCF shall not subscribe to the registration event package for any emergency public user identity specified in the REGISTER request. --- Modified: src/modules/ims_registrar_pcscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/a1148307a5155c8a6806ae94c0c9822… Patch: https://github.com/kamailio/kamailio/commit/a1148307a5155c8a6806ae94c0c9822… --- diff --git a/src/modules/ims_registrar_pcscf/save.c b/src/modules/ims_registrar_pcscf/save.c index 39dfe4d589..0789a52bfb 100644 --- a/src/modules/ims_registrar_pcscf/save.c +++ b/src/modules/ims_registrar_pcscf/save.c @@ -387,7 +387,9 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags) { str *service_routes=0; int num_service_routes = 0; pv_elem_t *presentity_uri_pv; - + int contact_has_sos=-1; + contact_t* chi; //contact header information + struct hdr_field* h; //get request from reply req = get_request_from_reply(_m); if (!req) { @@ -395,11 +397,34 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags) { goto error; } expires_hdr = cscf_get_expires_hdr(_m, 0); - cb = cscf_parse_contacts(_m); + + if((parse_headers(_m, HDR_CONTACT_F, 0) == -1) || !_m->contact) { + LM_ERR("cannot get the Contact header from the SIP message in saving action in PCSCF\n"); + goto error; + } + + if(!_m->contact->parsed && parse_contact(_m->contact) < 0) { + LM_ERR("Couldn t parse Contact Header \n"); + goto error; + } + + cb = ((contact_body_t *)_m->contact->parsed); if (!cb || (!cb->contacts && !cb->star)) { LM_DBG("No contact headers and not *\n"); goto error; } + + for (h = _m->contact; h; h = h->next) { + if (h->type == HDR_CONTACT_T && h->parsed) { + for (chi = ((contact_body_t*) h->parsed)->contacts; chi; chi = chi->next) { + contact_has_sos = cscf_get_sos_uri_param(chi->uri); + if(contact_has_sos!=-1){ + break; + } + } + } + } + cscf_get_p_associated_uri(_m, &public_ids, &num_public_ids, 1); service_routes = cscf_get_service_route(_m, &num_service_routes, 1); @@ -409,7 +434,7 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags) { goto error; } - if(subscribe_to_reginfo == 1){ + if(subscribe_to_reginfo == 1 && contact_has_sos < 1){ //use the first p_associated_uri - i.e. the default IMPU LM_DBG("Subscribe to reg event for primary p_associated_uri");

1 0

git:master:60399b42: modules: readme files regenerated - exec ... [skip ci]
by Kamailio Dev 28 Jan '19

28 Jan '19

Module: kamailio Branch: master Commit: 60399b423f288c7b28756e480413475793e7ae11 URL: https://github.com/kamailio/kamailio/commit/60399b423f288c7b28756e480413475… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-28T08:31:37+01:00 modules: readme files regenerated - exec ... [skip ci] --- Modified: src/modules/exec/README --- Diff: https://github.com/kamailio/kamailio/commit/60399b423f288c7b28756e480413475… Patch: https://github.com/kamailio/kamailio/commit/60399b423f288c7b28756e480413475… --- diff --git a/src/modules/exec/README b/src/modules/exec/README index 2e9c2bcd2a..b63a8b27a1 100644 --- a/src/modules/exec/README +++ b/src/modules/exec/README @@ -35,6 +35,7 @@ Jan Janak 4.1. exec_dset(command) 4.2. exec_msg(command) 4.3. exec_avp(command [, avplist]) + 4.4. exec_cmd(command) 5. Known Issues @@ -45,6 +46,7 @@ Jan Janak 1.3. exec_dset usage 1.4. exec_msg usage 1.5. exec_avp usage + 1.6. exec_cmd usage Chapter 1. Admin Guide @@ -66,6 +68,7 @@ Chapter 1. Admin Guide 4.1. exec_dset(command) 4.2. exec_msg(command) 4.3. exec_avp(command [, avplist]) + 4.4. exec_cmd(command) 5. Known Issues @@ -144,6 +147,7 @@ modparam("exec", "time_to_kill", 20) 4.1. exec_dset(command) 4.2. exec_msg(command) 4.3. exec_avp(command [, avplist]) + 4.4. exec_cmd(command) 4.1. exec_dset(command) @@ -213,6 +217,27 @@ exec_avp("echo TEST"); exec_avp("echo TEST", "$avp(s:test)"); ... +4.4. exec_cmd(command) + + Executes an external command. It is a lightweight version, which does + not pass the SIP message as parameter, does not set the environment + variables and it does not use the output of the command. + + Meaning of the parameters is as follows: + * command - Command to be executed. It can include pseudo-variables. + + WARNING: if the var you are passing out has a bash special character in + it, the var needs to be placed inside quotes, for example: + exec_msg("print-contact.sh '$ct'"); + + This function can be used from ANY_ROUTE. + + Example 1.6. exec_cmd usage +... +exec_cmd("echo TEST > /tmp/test.txt"); +exec_cmd("echo TEST > /tmp/$rU.txt"); +... + 5. Known Issues There is currently no guarantee that scripts ever return and stop

1 0

git:master:385fdc71: exec: docs for exec_cmd() function
by Daniel-Constantin Mierla 28 Jan '19

28 Jan '19

Module: kamailio Branch: master Commit: 385fdc71abd0b4f8349f725273bccd483d859088 URL: https://github.com/kamailio/kamailio/commit/385fdc71abd0b4f8349f725273bccd4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-28T08:20:32+01:00 exec: docs for exec_cmd() function --- Modified: src/modules/exec/doc/exec_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/385fdc71abd0b4f8349f725273bccd4… Patch: https://github.com/kamailio/kamailio/commit/385fdc71abd0b4f8349f725273bccd4… --- diff --git a/src/modules/exec/doc/exec_admin.xml b/src/modules/exec/doc/exec_admin.xml index 51667fb60d..12249d5104 100644 --- a/src/modules/exec/doc/exec_admin.xml +++ b/src/modules/exec/doc/exec_admin.xml @@ -267,6 +267,41 @@ exec_msg("echo TEST > /tmp/$rU.txt"); exec_avp("echo TEST"); exec_avp("echo TEST", "$avp(s:test)"); ... +</programlisting> + </example> + </section> + <section id="exec.f.exec_cmd"> + <title> + <function moreinfo="none">exec_cmd(command)</function> + </title> + <para> + Executes an external command. It is a lightweight version, which + does not pass the SIP message as parameter, does not set the + environment variables and it does not use the output of the command. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>command</emphasis> - Command to be executed. It + can include pseudo-variables. + </para> + </listitem> + </itemizedlist> + <para> + WARNING: if the var you are passing out has a bash special + character in it, the var needs to be placed inside quotes, for example: + exec_msg("print-contact.sh '$ct'"); + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function moreinfo="none">exec_cmd</function> usage</title> + <programlisting format="linespecific"> +... +exec_cmd("echo TEST > /tmp/test.txt"); +exec_cmd("echo TEST > /tmp/$rU.txt"); +... </programlisting> </example> </section> @@ -274,8 +309,8 @@ exec_avp("echo TEST", "$avp(s:test)"); <section id="exec.known_issues"> <title>Known Issues</title> <para> - There is currently no guarantee that scripts ever return and stop - blocking the &sip; server. (There is kill.c but it is not used along with + There is currently no guarantee that scripts ever return and stop + blocking the &sip; server. (There is kill.c but it is not used along with the current mechanisms based on popen. Besides that kill.c is ugly). </para> </section>

1 0

git:master:1e1e22c1: exec: added own exec cmd wrapper not to pass the sip message buffer
by Daniel-Constantin Mierla 28 Jan '19

28 Jan '19

Module: kamailio Branch: master Commit: 1e1e22c10cdc686fc2b82305990d577aaab7eb58 URL: https://github.com/kamailio/kamailio/commit/1e1e22c10cdc686fc2b82305990d577… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-27T21:45:59+01:00 exec: added own exec cmd wrapper not to pass the sip message buffer --- Modified: src/modules/exec/exec.c Modified: src/modules/exec/exec.h Modified: src/modules/exec/exec_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1e1e22c10cdc686fc2b82305990d577… Patch: https://github.com/kamailio/kamailio/commit/1e1e22c10cdc686fc2b82305990d577… --- diff --git a/src/modules/exec/exec.c b/src/modules/exec/exec.c index 14c693f95a..6bcf01f74f 100644 --- a/src/modules/exec/exec.c +++ b/src/modules/exec/exec.c @@ -305,3 +305,31 @@ int exec_avp(struct sip_msg *msg, char *cmd, pvname_list_p avpl) } return ret; } + +int exec_cmd(sip_msg_t *msg, char *cmd) +{ + FILE *pipe; + int exit_status; + int ret; + + pipe = popen(cmd, "r"); + if(pipe == NULL) { + LM_ERR("cannot open pipe: %s\n", cmd); + ser_error = E_EXEC; + return -1; + } + + ret = 1; + exit_status = pclose(pipe); + if(WIFEXITED(exit_status)) { /* exited properly .... */ + /* return false if script exited with non-zero status */ + if(WEXITSTATUS(exit_status) != 0) + ret = -1; + } else { /* exited erroneously */ + LM_ERR("cmd %s failed. exit_status=%d, errno=%d: %s\n", cmd, + exit_status, errno, strerror(errno)); + ret = -1; + } + + return ret; +} diff --git a/src/modules/exec/exec.h b/src/modules/exec/exec.h index 3bc84a7103..45d44f8719 100644 --- a/src/modules/exec/exec.h +++ b/src/modules/exec/exec.h @@ -32,5 +32,6 @@ int exec_str(struct sip_msg *msg, char *cmd, char *param, int param_len); int exec_msg(struct sip_msg *msg, char *cmd); int exec_avp(struct sip_msg *msg, char *cmd, pvname_list_p avpl); +int exec_cmd(sip_msg_t *msg, char *cmd); #endif diff --git a/src/modules/exec/exec_mod.c b/src/modules/exec/exec_mod.c index f0e1b986a9..b45e199711 100644 --- a/src/modules/exec/exec_mod.c +++ b/src/modules/exec/exec_mod.c @@ -277,7 +277,7 @@ static int ki_exec_cmd(sip_msg_t *msg, str *cmd) LM_DBG("executing [%s]\n", cmd->s); - ret = exec_msg(msg, cmd->s); + ret = exec_cmd(msg, cmd->s); LM_DBG("execution return code: %d\n", ret);

1 0

git:master:85a4047f: exec: added exec_cmd("...") function
by Daniel-Constantin Mierla 28 Jan '19

28 Jan '19

Module: kamailio Branch: master Commit: 85a4047f80c8b79db7d93dd704224eb3c608c97d URL: https://github.com/kamailio/kamailio/commit/85a4047f80c8b79db7d93dd704224eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-27T10:50:20+01:00 exec: added exec_cmd("...") function - execute the command without setting any env variables - lightweight version for exec_msg() --- Modified: src/modules/exec/exec_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/85a4047f80c8b79db7d93dd704224eb… Patch: https://github.com/kamailio/kamailio/commit/85a4047f80c8b79db7d93dd704224eb… --- diff --git a/src/modules/exec/exec_mod.c b/src/modules/exec/exec_mod.c index a9410ee844..f0e1b986a9 100644 --- a/src/modules/exec/exec_mod.c +++ b/src/modules/exec/exec_mod.c @@ -53,6 +53,7 @@ static int mod_init(void); static int w_exec_dset(struct sip_msg *msg, char *cmd, char *foo); static int w_exec_msg(struct sip_msg *msg, char *cmd, char *foo); static int w_exec_avp(struct sip_msg *msg, char *cmd, char *avpl); +static int w_exec_cmd(struct sip_msg *msg, char *cmd, char *foo); static int exec_avp_fixup(void **param, int param_no); @@ -69,8 +70,10 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, {"exec_avp", (cmd_function)w_exec_avp, 1, fixup_spve_null, 0, REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, - {"exec_avp", (cmd_function)w_exec_avp, 2, exec_avp_fixup, 0, + {"exec_avp", (cmd_function)w_exec_avp, 2, exec_avp_fixup, 0, REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, + {"exec_cmd", (cmd_function)w_exec_cmd, 1, fixup_spve_null, 0, + ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -265,6 +268,34 @@ static int exec_avp_fixup(void **param, int param_no) return 0; } +static int ki_exec_cmd(sip_msg_t *msg, str *cmd) +{ + int ret; + + if(cmd == 0 || cmd->s == 0) + return -1; + + LM_DBG("executing [%s]\n", cmd->s); + + ret = exec_msg(msg, cmd->s); + + LM_DBG("execution return code: %d\n", ret); + + return (ret == 0) ? 1 : ret; +} + +static int w_exec_cmd(struct sip_msg *msg, char *cmd, char *foo) +{ + str command; + + if(fixup_get_svalue(msg, (gparam_p)cmd, &command) != 0) { + LM_ERR("invalid command parameter"); + return -1; + } + return ki_exec_cmd(msg, &command); +} + + /** * */ @@ -285,6 +316,11 @@ static sr_kemi_t sr_kemi_exec_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("exec"), str_init("exec_cmd"), + SR_KEMIP_INT, ki_exec_cmd, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:fe50c42d: pkg/docker: Updated submodule
by Sergey Safarov 27 Jan '19

27 Jan '19

Module: kamailio Branch: master Commit: fe50c42d50d1383cbfa6a90a5c3c3b5dcd4afb67 URL: https://github.com/kamailio/kamailio/commit/fe50c42d50d1383cbfa6a90a5c3c3b5… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-01-27T12:26:50+03:00 pkg/docker: Updated submodule --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/fe50c42d50d1383cbfa6a90a5c3c3b5… Patch: https://github.com/kamailio/kamailio/commit/fe50c42d50d1383cbfa6a90a5c3c3b5… --- diff --git a/pkg/docker b/pkg/docker index 97353c5459..b1c54322f0 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 97353c545936e6b51e2e2e8ccb13fc9688197206 +Subproject commit b1c54322f0f490786772db41c4390d7687ed16a6

1 0

Errored: sergey-safarov/kamailio#122 (master - fe723a9)
by Travis CI 27 Jan '19

27 Jan '19

Build Update for sergey-safarov/kamailio ------------------------------------- Build: #122 Status: Errored Duration: 55 secs Commit: fe723a9 (master) Author: Sergey Safarov Message: aaa View the changeset: https://github.com/sergey-safarov/kamailio/compare/083388426f66...fe723a9a1… View the full build log and details: https://travis-ci.org/sergey-safarov/kamailio/builds/484951696?utm_medium=n… -- You can unsubscribe from build emails from the sergey-safarov/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=15162101&u…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

Errored: sergey-safarov/kamailio#121 (master - 0833884)
by Travis CI 26 Jan '19

26 Jan '19

Build Update for sergey-safarov/kamailio ------------------------------------- Build: #121 Status: Errored Duration: 46 secs Commit: 0833884 (master) Author: Sergey Safarov Message: aaa View the changeset: https://github.com/sergey-safarov/kamailio/compare/13a7b04b88a0...083388426… View the full build log and details: https://travis-ci.org/sergey-safarov/kamailio/builds/484863218?utm_medium=n… -- You can unsubscribe from build emails from the sergey-safarov/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=15162101&u…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

Errored: sergey-safarov/kamailio#120 (master - 13a7b04)
by Travis CI 26 Jan '19

26 Jan '19

Build Update for sergey-safarov/kamailio ------------------------------------- Build: #120 Status: Errored Duration: 46 secs Commit: 13a7b04 (master) Author: Sergey Safarov Message: aaaa View the changeset: https://github.com/sergey-safarov/kamailio/compare/d4a105d6dfa0...13a7b04b8… View the full build log and details: https://travis-ci.org/sergey-safarov/kamailio/builds/484858178?utm_medium=n… -- You can unsubscribe from build emails from the sergey-safarov/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=15162101&u…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

Errored: sergey-safarov/kamailio#119 (master - d4a105d)
by Travis CI 26 Jan '19

26 Jan '19

Build Update for sergey-safarov/kamailio ------------------------------------- Build: #119 Status: Errored Duration: 45 secs Commit: d4a105d (master) Author: Sergey Safarov Message: aa View the changeset: https://github.com/sergey-safarov/kamailio/compare/fe9a380e31a9...d4a105d6d… View the full build log and details: https://travis-ci.org/sergey-safarov/kamailio/builds/484855465?utm_medium=n… -- You can unsubscribe from build emails from the sergey-safarov/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=15162101&u…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

Errored: sergey-safarov/kamailio#118 (master - fe9a380)
by Travis CI 26 Jan '19

26 Jan '19

Build Update for sergey-safarov/kamailio ------------------------------------- Build: #118 Status: Errored Duration: 50 secs Commit: fe9a380 (master) Author: Sergey Safarov Message: Updated submodule View the changeset: https://github.com/sergey-safarov/kamailio/compare/b79423f9ef7b...fe9a380e3… View the full build log and details: https://travis-ci.org/sergey-safarov/kamailio/builds/484848848?utm_medium=n… -- You can unsubscribe from build emails from the sergey-safarov/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=15162101&u…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:b79423f9: db_postgres: use generic PKG_MEM_ERROR helper defines, fix missing error log
by Henning Westerholt 26 Jan '19

26 Jan '19

Module: kamailio Branch: master Commit: b79423f9ef7bdf40207d5a3615d296fa0714eb71 URL: https://github.com/kamailio/kamailio/commit/b79423f9ef7bdf40207d5a3615d296f… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-26T18:46:40+01:00 db_postgres: use generic PKG_MEM_ERROR helper defines, fix missing error log --- Modified: src/modules/db_postgres/km_dbase.c Modified: src/modules/db_postgres/km_pg_con.c Modified: src/modules/db_postgres/km_res.c Modified: src/modules/db_postgres/km_val.c Modified: src/modules/db_postgres/pg_cmd.c Modified: src/modules/db_postgres/pg_con.c Modified: src/modules/db_postgres/pg_fld.c Modified: src/modules/db_postgres/pg_res.c Modified: src/modules/db_postgres/pg_sql.c Modified: src/modules/db_postgres/pg_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/b79423f9ef7bdf40207d5a3615d296f… Patch: https://github.com/kamailio/kamailio/commit/b79423f9ef7bdf40207d5a3615d296f…

1 0

[kamailio/kamailio] Custom Username Authentication (#1817)
by Prabhat Kumar 25 Jan '19

25 Jan '19

It would be great if provide a function for authenticating username like ***pv_www_authenticate(realm, passwd, flags [, method])*** Purpose: The purpose behind this is i want to modify username and then authenticate according to credentials saved in DB. -- 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/1817

2 2

[kamailio/kamailio] Authenticating Custom Username (#1818)
by Prabhat Kumar 25 Jan '19

25 Jan '19

There is no function for authenticating custom username like pv_www_authenticate(realm, passwd, flags [, method]) Purpose: The purpose behind this is i want to modify username and then authenticate according to credentials saved in DB. -- 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/1818

2 2

git:master:18db511c: app_python: print script name in error message
by Daniel-Constantin Mierla 25 Jan '19

25 Jan '19

Module: kamailio Branch: master Commit: 18db511c6ab8d97daed37582379cd2ba865abde4 URL: https://github.com/kamailio/kamailio/commit/18db511c6ab8d97daed37582379cd2b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-25T09:28:32+01:00 app_python: print script name in error message --- Modified: src/modules/app_python/app_python_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/18db511c6ab8d97daed37582379cd2b… Patch: https://github.com/kamailio/kamailio/commit/18db511c6ab8d97daed37582379cd2b… --- diff --git a/src/modules/app_python/app_python_mod.c b/src/modules/app_python/app_python_mod.c index 8844d4bbcc..92f05028b2 100644 --- a/src/modules/app_python/app_python_mod.c +++ b/src/modules/app_python/app_python_mod.c @@ -159,7 +159,7 @@ static int mod_init(void) if(apy_load_script()<0) { pkg_free(dname_src); pkg_free(bname_src); - LM_ERR("failed to load python script\n"); + LM_ERR("failed to load python script: %s\n", _sr_python_load_file.s); return -1; }

1 0

git:master:c46884bc: pv: include ppcfg.h for pp_define_get()
by Daniel-Constantin Mierla 24 Jan '19

24 Jan '19

Module: kamailio Branch: master Commit: c46884bc9818a046d549b06de2af0746f614cc0e URL: https://github.com/kamailio/kamailio/commit/c46884bc9818a046d549b06de2af074… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-24T15:54:33+01:00 pv: include ppcfg.h for pp_define_get() --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/c46884bc9818a046d549b06de2af074… Patch: https://github.com/kamailio/kamailio/commit/c46884bc9818a046d549b06de2af074… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 2e54253eb4..0419641efd 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -32,6 +32,7 @@ #include "../../core/strutils.h" #include "../../core/tcp_conn.h" #include "../../core/pvapi.h" +#include "../../core/ppcfg.h" #include "../../core/trim.h" #include "../../core/msg_translator.h" @@ -3671,8 +3672,6 @@ int pv_parse_def_name(pv_spec_p sp, str *in) } -extern str *pp_define_get(int len, const char * text); - int pv_get_def(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) { str *val = pp_define_get(param->pvn.u.isname.name.s.len, param->pvn.u.isname.name.s.s);

1 0

git:master:b5f27fe2: core: export pp_define_get() via ppcfg.h
by Daniel-Constantin Mierla 24 Jan '19

24 Jan '19

Module: kamailio Branch: master Commit: b5f27fe25247e3605aeeb600de5a6b31081d6ac6 URL: https://github.com/kamailio/kamailio/commit/b5f27fe25247e3605aeeb600de5a6b3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-24T15:53:55+01:00 core: export pp_define_get() via ppcfg.h --- Modified: src/core/ppcfg.h --- Diff: https://github.com/kamailio/kamailio/commit/b5f27fe25247e3605aeeb600de5a6b3… Patch: https://github.com/kamailio/kamailio/commit/b5f27fe25247e3605aeeb600de5a6b3… --- diff --git a/src/core/ppcfg.h b/src/core/ppcfg.h index 432d76bcfb..8485059918 100644 --- a/src/core/ppcfg.h +++ b/src/core/ppcfg.h @@ -41,6 +41,7 @@ int pp_subst_run(char **data); int pp_define(int len, const char *text); int pp_define_set(int len, char *text); int pp_define_set_type(int type); +str *pp_define_get(int len, const char * text); void pp_ifdef_level_update(int val); void pp_ifdef_level_check(void);

1 0

git:master:611f5dc2: modules: readme files regenerated - pipelimit ... [skip ci]
by Kamailio Dev 24 Jan '19

24 Jan '19

Module: kamailio Branch: master Commit: 611f5dc2470ce6ac2b16529e6f91a51e95f69bf8 URL: https://github.com/kamailio/kamailio/commit/611f5dc2470ce6ac2b16529e6f91a51… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-24T15:01:45+01:00 modules: readme files regenerated - pipelimit ... [skip ci] --- Modified: src/modules/pipelimit/README --- Diff: https://github.com/kamailio/kamailio/commit/611f5dc2470ce6ac2b16529e6f91a51… Patch: https://github.com/kamailio/kamailio/commit/611f5dc2470ce6ac2b16529e6f91a51… --- diff --git a/src/modules/pipelimit/README b/src/modules/pipelimit/README index 598f47d486..3a1a3cc130 100644 --- a/src/modules/pipelimit/README +++ b/src/modules/pipelimit/README @@ -43,6 +43,7 @@ Daniel-Constantin Mierla 4.9. load_fetch (integer) 4.10. reply_code (integer) 4.11. reply_reason (string) + 4.12. clean_unused (int) 5. Functions @@ -74,8 +75,10 @@ Daniel-Constantin Mierla 1.11. Set reply_code parameter at runtime 1.12. Set reply_reason parameter 1.13. Set reply_reason parameter at runtime - 1.14. pl_check usage - 1.15. pl_drop usage + 1.14. Set clean_unused parameter + 1.15. Set clean_unused parameter at runtime + 1.16. pl_check usage + 1.17. pl_drop usage Chapter 1. Admin Guide @@ -101,6 +104,7 @@ Chapter 1. Admin Guide 4.9. load_fetch (integer) 4.10. reply_code (integer) 4.11. reply_reason (string) + 4.12. clean_unused (int) 5. Functions @@ -211,6 +215,7 @@ Chapter 1. Admin Guide 4.9. load_fetch (integer) 4.10. reply_code (integer) 4.11. reply_reason (string) + 4.12. clean_unused (int) 4.1. hash_size (int) @@ -357,6 +362,22 @@ modparam("pipelimit", "reply_reason", "Limiting") Example 1.13. Set reply_reason parameter at runtime kamcmd cfg.set_now_string pipelimit reply_reason "Limiting" +4.12. clean_unused (int) + + Clean unused pipes afetr this number of timer intervals. + + Default value is 0 (cleanup disabled). + + Example 1.14. Set clean_unused parameter +... +modparam("pipelimit", "clean_unused", 10) +... + + This value can be modified at runtime using kamcmd + + Example 1.15. Set clean_unused parameter at runtime +kamcmd cfg.set_now_int pipelimit clean_unused 10 + 5. Functions 5.1. pl_check(name [, algorithm, limit]) @@ -389,7 +410,7 @@ kamcmd cfg.set_now_string pipelimit reply_reason "Limiting" This function can be used from ANY_ROUTE. - Example 1.14. pl_check usage + Example 1.16. pl_check usage ... # perform pipe match for current method if (!pl_check("one")) { @@ -458,7 +479,7 @@ with unexpected retcode=$var(check_result)\n"); This function can be used from REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE|ONSEND_ROUTE. - Example 1.15. pl_drop usage + Example 1.17. pl_drop usage ... if (!pl_check("one")) { # send back a "503 - Server Unavailable"

1 0

[kamailio/kamailio] Lazedo/pv def (#1814)
by lazedo 24 Jan '19

24 Jan '19

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] 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 - [X] Small bug fix (non-breaking change which fixes an issue) - [X] 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 - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  allows the use definitions as pseudo-variables ``` #!trydef XIP "$HN(i)" #!substdef "!MY_IP_ADDRESS!$def(XIP)!g" #!substdef "!MY_HOSTNAME!$HN(f)!g" #!trydef REGISTRAR_MIN_EXPIRES 300 loadmodule "registrar.so" modparam("registrar", "min_expires", REGISTRAR_MIN_EXPIRES) route[SOMETHING] { xlog("L_INFO", "configured value of registrar min-expires is $def(REGISTRAR_MIN_EXPIRES)\n"); xlog("L_INFO", "configured value of host is MY_HOSTNAME\n"); xlog("L_INFO", "configured value of ip is MY_IP_ADDRESS\n"); } ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1814 -- Commit Summary -- * core: allow pvar resolve in subsdef * core: allow pp_define_get to be used by modules * pv: add $def pseudo variable -- File Changes -- M src/core/cfg.lex (4) M src/core/ppcfg.c (4) M src/modules/pv/pv.c (2) M src/modules/pv/pv_core.c (25) M src/modules/pv/pv_core.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1814.patch https://github.com/kamailio/kamailio/pull/1814.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/1814

3 3

[kamailio/kamailio] Add automatic pipe cleanup (#1819)
by Alex Hermann 24 Jan '19

24 Jan '19

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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 - [x] Small bug fix (non-breaking change which fixes an issue) - [x] 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 - [x] Tested changes locally (on 4.4.x) - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Add automatic cleanup of pipes that have not been used for a while. Save memory on infrequently used pipes. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1819 -- Commit Summary -- * pipelimit: Fix memleak on shutdown * pipelimit: Cleanup unused pipes -- File Changes -- M src/modules/pipelimit/doc/pipelimit_admin.xml (30) M src/modules/pipelimit/pipelimit.c (2) M src/modules/pipelimit/pl_ht.c (36) M src/modules/pipelimit/pl_ht.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1819.patch https://github.com/kamailio/kamailio/pull/1819.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/1819

2 2

git:master:888a035d: Merge pull request #1819 from gaaf/pipelimit
by GitHub 24 Jan '19

24 Jan '19

Module: kamailio Branch: master Commit: 888a035d63020a1165d7682b579cf4c80fec9452 URL: https://github.com/kamailio/kamailio/commit/888a035d63020a1165d7682b579cf4c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-01-24T14:49:14+01:00 Merge pull request #1819 from gaaf/pipelimit Add automatic pipe cleanup --- Modified: src/modules/pipelimit/doc/pipelimit_admin.xml Modified: src/modules/pipelimit/pipelimit.c Modified: src/modules/pipelimit/pl_ht.c Modified: src/modules/pipelimit/pl_ht.h --- Diff: https://github.com/kamailio/kamailio/commit/888a035d63020a1165d7682b579cf4c… Patch: https://github.com/kamailio/kamailio/commit/888a035d63020a1165d7682b579cf4c…

1 0

git:master:048c928e: pipelimit: Cleanup unused pipes
by Alex Hermann 24 Jan '19

24 Jan '19

Module: kamailio Branch: master Commit: 048c928ec68dc82bd628f27bfc9f7901e4c4e9d2 URL: https://github.com/kamailio/kamailio/commit/048c928ec68dc82bd628f27bfc9f790… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: 2019-01-22T16:29:48+01:00 pipelimit: Cleanup unused pipes when pipes are unused by a configurable number of timer intervals, remove them, freeing memory. --- Modified: src/modules/pipelimit/doc/pipelimit_admin.xml Modified: src/modules/pipelimit/pipelimit.c Modified: src/modules/pipelimit/pl_ht.c Modified: src/modules/pipelimit/pl_ht.h --- Diff: https://github.com/kamailio/kamailio/commit/048c928ec68dc82bd628f27bfc9f790… Patch: https://github.com/kamailio/kamailio/commit/048c928ec68dc82bd628f27bfc9f790…

1 0

git:master:ffdec6d3: pipelimit: Fix memleak on shutdown
by Alex Hermann 24 Jan '19

24 Jan '19

Module: kamailio Branch: master Commit: ffdec6d38d0935d8af2633e3d3ded8a985ddfcca URL: https://github.com/kamailio/kamailio/commit/ffdec6d38d0935d8af2633e3d3ded8a… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: 2019-01-22T16:10:19+01:00 pipelimit: Fix memleak on shutdown --- Modified: src/modules/pipelimit/pl_ht.c --- Diff: https://github.com/kamailio/kamailio/commit/ffdec6d38d0935d8af2633e3d3ded8a… Patch: https://github.com/kamailio/kamailio/commit/ffdec6d38d0935d8af2633e3d3ded8a… --- diff --git a/src/modules/pipelimit/pl_ht.c b/src/modules/pipelimit/pl_ht.c index 518254f1fa..319d97b1ff 100644 --- a/src/modules/pipelimit/pl_ht.c +++ b/src/modules/pipelimit/pl_ht.c @@ -102,6 +102,7 @@ int pl_init_htable(unsigned int hsize) void pl_pipe_free(pl_pipe_t *it) { + shm_free(it); return; }

1 0

[kamailio/kamailio] presence: switch warning to debug (#1820)
by Emmanuel Schmidbauer 24 Jan '19

24 Jan '19

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1820 -- Commit Summary -- * switch warning to debug -- File Changes -- M src/modules/presence/presentity.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1820.patch https://github.com/kamailio/kamailio/pull/1820.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/1820

2 1

git:master:a4669173: presence: switch warning to debug
by Emmanuel Schmidbauer 24 Jan '19

24 Jan '19

Module: kamailio Branch: master Commit: a466917378d516025062f7c1d5cf2958c70aa0b9 URL: https://github.com/kamailio/kamailio/commit/a466917378d516025062f7c1d5cf295… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Date: 2019-01-23T08:39:27-05:00 presence: switch warning to debug --- Modified: src/modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/a466917378d516025062f7c1d5cf295… Patch: https://github.com/kamailio/kamailio/commit/a466917378d516025062f7c1d5cf295… --- diff --git a/src/modules/presence/presentity.c b/src/modules/presence/presentity.c index 635ddcefe6..f496f4a583 100644 --- a/src/modules/presence/presentity.c +++ b/src/modules/presence/presentity.c @@ -427,7 +427,7 @@ int delete_presentity_if_dialog_id_exists( old_presentity.event = presentity->event; old_presentity.etag = tmp_db_etag; - LM_WARN("Presentity already exists - deleting it\n"); + LM_DBG("Presentity found - deleting it\n"); if(delete_presentity(&old_presentity, NULL) < 0) { LM_ERR("failed to delete presentity\n");

1 0

git:master:ceaeefd4: Merge pull request #1820 from kamailio/presence-fix-debug-msg
by GitHub 24 Jan '19

24 Jan '19

Module: kamailio Branch: master Commit: ceaeefd4f0add9123054b68b4f2f30707f487249 URL: https://github.com/kamailio/kamailio/commit/ceaeefd4f0add9123054b68b4f2f307… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-01-24T14:47:50+01:00 Merge pull request #1820 from kamailio/presence-fix-debug-msg presence: switch warning to debug --- Modified: src/modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/ceaeefd4f0add9123054b68b4f2f307… Patch: https://github.com/kamailio/kamailio/commit/ceaeefd4f0add9123054b68b4f2f307… --- diff --git a/src/modules/presence/presentity.c b/src/modules/presence/presentity.c index 635ddcefe6..f496f4a583 100644 --- a/src/modules/presence/presentity.c +++ b/src/modules/presence/presentity.c @@ -427,7 +427,7 @@ int delete_presentity_if_dialog_id_exists( old_presentity.event = presentity->event; old_presentity.etag = tmp_db_etag; - LM_WARN("Presentity already exists - deleting it\n"); + LM_DBG("Presentity found - deleting it\n"); if(delete_presentity(&old_presentity, NULL) < 0) { LM_ERR("failed to delete presentity\n");

1 0

git:master:43aeb98f: pv: add $def pseudo variable
by lazedo 24 Jan '19

24 Jan '19

Module: kamailio Branch: master Commit: 43aeb98fbe3902cb8a1c5d653ce0ff8f4551d99a URL: https://github.com/kamailio/kamailio/commit/43aeb98fbe3902cb8a1c5d653ce0ff8… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2019-01-18T13:25:24Z pv: add $def pseudo variable --- 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/43aeb98fbe3902cb8a1c5d653ce0ff8… Patch: https://github.com/kamailio/kamailio/commit/43aeb98fbe3902cb8a1c5d653ce0ff8… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 06f831bd97..0df9353606 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -189,6 +189,8 @@ static pv_export_t mod_pvs[] = { {{"dd", (sizeof("dd")-1)}, /* */ PVT_OTHER, pv_get_dsturi_attr, 0, 0, 0, pv_init_iname, 1}, + {{"def", (sizeof("env")-1)}, PVT_OTHER, pv_get_def, 0, + pv_parse_def_name, 0, 0, 0}, {{"di", (sizeof("di")-1)}, /* */ PVT_OTHER, pv_get_diversion, 0, 0, 0, pv_init_iname, 1}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 01cebc8534..2e54253eb4 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3658,3 +3658,28 @@ int pv_get_env(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_null(msg, param, res); } +int pv_parse_def_name(pv_spec_p sp, str *in) +{ + if (in == NULL || in->s == NULL || sp == NULL) { + LM_ERR("INVALID DEF NAME\n"); + return -1; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = AVP_NAME_STR; + sp->pvp.pvn.u.isname.name.s = *in; + return 0; + +} + +extern str *pp_define_get(int len, const char * text); + +int pv_get_def(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + str *val = pp_define_get(param->pvn.u.isname.name.s.len, param->pvn.u.isname.name.s.s); + + if (val) { + return pv_get_strval(msg, param, res, val); + } + return pv_get_null(msg, param, res); +} + diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 411f2f8aac..86629e66e0 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -379,5 +379,8 @@ int pv_parse_ksr_attrs_name(pv_spec_p sp, str *in); int pv_get_ksr_attrs(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +int pv_parse_def_name(pv_spec_p sp, str *in); +int pv_get_def(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); + #endif

1 0

git:master:4badb27c: Merge pull request #1814 from kamailio/lazedo/pv-def
by GitHub 24 Jan '19

24 Jan '19

Module: kamailio Branch: master Commit: 4badb27c07be39fcfaf58686394810ac15e80111 URL: https://github.com/kamailio/kamailio/commit/4badb27c07be39fcfaf58686394810a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-01-24T14:47:19+01:00 Merge pull request #1814 from kamailio/lazedo/pv-def pv: add $def pseudo variable --- Modified: src/core/cfg.lex Modified: src/core/ppcfg.c 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/4badb27c07be39fcfaf58686394810a… Patch: https://github.com/kamailio/kamailio/commit/4badb27c07be39fcfaf58686394810a… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 6e4d6971e5..9912d111bc 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -113,7 +113,7 @@ struct sr_yy_fname *next; } *sr_yy_fname_list = 0; - static str *pp_define_get(int len, const char * text); + str *pp_define_get(int len, const char * text); static int pp_ifdef_type(int pos); static void pp_ifdef_var(int len, const char * text); static void pp_ifdef(); @@ -1856,7 +1856,7 @@ int pp_define_set(int len, char *text) return 0; } -static str *pp_define_get(int len, const char * text) +str *pp_define_get(int len, const char * text) { str var = {(char *)text, len}; int i; diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 1ff3103f52..a06795f760 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -32,6 +32,7 @@ #include "dprint.h" #include "ppcfg.h" +#include "fmsg.h" typedef struct _pp_subst_rule { char *indata; @@ -184,7 +185,8 @@ int pp_subst_run(char **data) i = 0; while(pr) { - result=subst_str(*data, 0, + sip_msg_t *fmsg = faked_msg_get_next(); + result=subst_str(*data, fmsg, (struct subst_expr*)pr->ppdata, 0); /* pkg malloc'ed result */ if(result!=NULL) { diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 06f831bd97..0df9353606 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -189,6 +189,8 @@ static pv_export_t mod_pvs[] = { {{"dd", (sizeof("dd")-1)}, /* */ PVT_OTHER, pv_get_dsturi_attr, 0, 0, 0, pv_init_iname, 1}, + {{"def", (sizeof("env")-1)}, PVT_OTHER, pv_get_def, 0, + pv_parse_def_name, 0, 0, 0}, {{"di", (sizeof("di")-1)}, /* */ PVT_OTHER, pv_get_diversion, 0, 0, 0, pv_init_iname, 1}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 01cebc8534..2e54253eb4 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3658,3 +3658,28 @@ int pv_get_env(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_null(msg, param, res); } +int pv_parse_def_name(pv_spec_p sp, str *in) +{ + if (in == NULL || in->s == NULL || sp == NULL) { + LM_ERR("INVALID DEF NAME\n"); + return -1; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = AVP_NAME_STR; + sp->pvp.pvn.u.isname.name.s = *in; + return 0; + +} + +extern str *pp_define_get(int len, const char * text); + +int pv_get_def(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + str *val = pp_define_get(param->pvn.u.isname.name.s.len, param->pvn.u.isname.name.s.s); + + if (val) { + return pv_get_strval(msg, param, res, val); + } + return pv_get_null(msg, param, res); +} + diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 411f2f8aac..86629e66e0 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -379,5 +379,8 @@ int pv_parse_ksr_attrs_name(pv_spec_p sp, str *in); int pv_get_ksr_attrs(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +int pv_parse_def_name(pv_spec_p sp, str *in); +int pv_get_def(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); + #endif

1 0

git:master:2a436316: core: allow pvar resolve in subsdef
by lazedo 24 Jan '19

24 Jan '19

Module: kamailio Branch: master Commit: 2a43631692285346050ae906f772a1c111906c5b URL: https://github.com/kamailio/kamailio/commit/2a43631692285346050ae906f772a1c… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2019-01-18T13:17:02Z core: allow pvar resolve in subsdef --- Modified: src/core/ppcfg.c --- Diff: https://github.com/kamailio/kamailio/commit/2a43631692285346050ae906f772a1c… Patch: https://github.com/kamailio/kamailio/commit/2a43631692285346050ae906f772a1c… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 1ff3103f52..a06795f760 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -32,6 +32,7 @@ #include "dprint.h" #include "ppcfg.h" +#include "fmsg.h" typedef struct _pp_subst_rule { char *indata; @@ -184,7 +185,8 @@ int pp_subst_run(char **data) i = 0; while(pr) { - result=subst_str(*data, 0, + sip_msg_t *fmsg = faked_msg_get_next(); + result=subst_str(*data, fmsg, (struct subst_expr*)pr->ppdata, 0); /* pkg malloc'ed result */ if(result!=NULL) {

1 0

git:master:83a43714: core: allow pp_define_get to be used by modules
by lazedo 24 Jan '19

24 Jan '19

Module: kamailio Branch: master Commit: 83a437144bad5d31f5ce1bfc10b03f613524852f URL: https://github.com/kamailio/kamailio/commit/83a437144bad5d31f5ce1bfc10b03f6… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2019-01-18T13:18:01Z core: allow pp_define_get to be used by modules --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/83a437144bad5d31f5ce1bfc10b03f6… Patch: https://github.com/kamailio/kamailio/commit/83a437144bad5d31f5ce1bfc10b03f6… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 6e4d6971e5..9912d111bc 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -113,7 +113,7 @@ struct sr_yy_fname *next; } *sr_yy_fname_list = 0; - static str *pp_define_get(int len, const char * text); + str *pp_define_get(int len, const char * text); static int pp_ifdef_type(int pos); static void pp_ifdef_var(int len, const char * text); static void pp_ifdef(); @@ -1856,7 +1856,7 @@ int pp_define_set(int len, char *text) return 0; } -static str *pp_define_get(int len, const char * text) +str *pp_define_get(int len, const char * text) { str var = {(char *)text, len}; int i;

1 0

git:master:91c0e143: presence_mwi: small improvement to error log message
by Daniel-Constantin Mierla 24 Jan '19

24 Jan '19

Module: kamailio Branch: master Commit: 91c0e1434d743b8af7bcaa7d993029b6a3c15cb8 URL: https://github.com/kamailio/kamailio/commit/91c0e1434d743b8af7bcaa7d993029b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-24T12:46:57+01:00 presence_mwi: small improvement to error log message --- Modified: src/modules/presence_mwi/add_events.c --- Diff: https://github.com/kamailio/kamailio/commit/91c0e1434d743b8af7bcaa7d993029b… Patch: https://github.com/kamailio/kamailio/commit/91c0e1434d743b8af7bcaa7d993029b… --- diff --git a/src/modules/presence_mwi/add_events.c b/src/modules/presence_mwi/add_events.c index 94c606de75..001034ade4 100644 --- a/src/modules/presence_mwi/add_events.c +++ b/src/modules/presence_mwi/add_events.c @@ -106,8 +106,8 @@ int mwi_publ_handl(struct sip_msg* msg) return 1; err: - LM_ERR("check of body <%.*s> failed at character number %d\n", - body.len, body.s, (int)(at - body.s + 1)); + LM_ERR("check of body <%.*s> failed at character index %d (hexa: 0x%x)\n", + body.len, body.s, (int)(at - body.s + 1), (int)(*at)); return -1; }

1 0

git:master:c02c05d5: modules: readme files regenerated - jsonrpcs ... [skip ci]
by Kamailio Dev 23 Jan '19

23 Jan '19

Module: kamailio Branch: master Commit: c02c05d50762e14981c9a1817f303e1d10a8ea90 URL: https://github.com/kamailio/kamailio/commit/c02c05d50762e14981c9a1817f303e1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-23T23:01:41+01:00 modules: readme files regenerated - jsonrpcs ... [skip ci] --- Modified: src/modules/jsonrpcs/README --- Diff: https://github.com/kamailio/kamailio/commit/c02c05d50762e14981c9a1817f303e1… Patch: https://github.com/kamailio/kamailio/commit/c02c05d50762e14981c9a1817f303e1… --- diff --git a/src/modules/jsonrpcs/README b/src/modules/jsonrpcs/README index 3854db4a74..a16d628fae 100644 --- a/src/modules/jsonrpcs/README +++ b/src/modules/jsonrpcs/README @@ -363,13 +363,13 @@ children=2 tcp_accept_no_cl=yes -mpath="modules/" - loadmodule "sl.so" loadmodule "pv.so" loadmodule "xhttp.so" loadmodule "jsonrpcs.so" +modparam("jsonrpcs", "transport", 1) + request_route { send_reply("404", "not found"); exit;

1 0

git:master:7d2e1c83: jsonrpcs: enable http transport in example
by Daniel-Constantin Mierla 23 Jan '19

23 Jan '19

Module: kamailio Branch: master Commit: 7d2e1c83861214489b786bb31b03991588733937 URL: https://github.com/kamailio/kamailio/commit/7d2e1c83861214489b786bb31b03991… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-23T22:58:15+01:00 jsonrpcs: enable http transport in example --- Modified: src/modules/jsonrpcs/doc/jsonrpcs_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7d2e1c83861214489b786bb31b03991… Patch: https://github.com/kamailio/kamailio/commit/7d2e1c83861214489b786bb31b03991… --- diff --git a/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml index af24709cfa..cd8691af09 100644 --- a/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml +++ b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml @@ -423,13 +423,13 @@ children=2 tcp_accept_no_cl=yes -mpath="modules/" - loadmodule "sl.so" loadmodule "pv.so" loadmodule "xhttp.so" loadmodule "jsonrpcs.so" +modparam("jsonrpcs", "transport", 1) + request_route { send_reply("404", "not found"); exit;

1 0

git:master:29e9f8b4: kamailio.cfg: set cuurent version in comments
by Daniel-Constantin Mierla 23 Jan '19

23 Jan '19

Module: kamailio Branch: master Commit: 29e9f8b4eede9a5ff1a9c2f52183d6ede035c2d7 URL: https://github.com/kamailio/kamailio/commit/29e9f8b4eede9a5ff1a9c2f52183d6e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-23T22:53:55+01:00 kamailio.cfg: set cuurent version in comments --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/29e9f8b4eede9a5ff1a9c2f52183d6e… Patch: https://github.com/kamailio/kamailio/commit/29e9f8b4eede9a5ff1a9c2f52183d6e… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index d17c719eaf..db58f98fcb 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -1,6 +1,6 @@ #!KAMAILIO # -# Kamailio (OpenSER) SIP Server v5.2 - default configuration script +# Kamailio (OpenSER) SIP Server v5.3 - default configuration script # - web: https://www.kamailio.org # - git: https://github.com/kamailio/kamailio #

1 0

git:master:3e731300: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 22 Jan '19

22 Jan '19

Module: kamailio Branch: master Commit: 3e731300e54c1dd65a36b044ac05c9a31fc246be URL: https://github.com/kamailio/kamailio/commit/3e731300e54c1dd65a36b044ac05c9a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-22T09:01:54+01:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/3e731300e54c1dd65a36b044ac05c9a… Patch: https://github.com/kamailio/kamailio/commit/3e731300e54c1dd65a36b044ac05c9a… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index 4e3f43e99b..f4bfe360ea 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -662,8 +662,8 @@ modparam("dialog", "default_timeout", 21600) 6.7. early_timeout (integer) - The timeout (in seconds) after which the dialogs in early state (no - final response received) are destroyed. + The timeout (in seconds) after which the dialogs in unconfirmed or + early state (no final response received) are destroyed. Default value is “300 (5 minutes)”.

1 0

git:master:bdc4d3c7: dialog: docs - small addition to early_timeout param
by Daniel-Constantin Mierla 22 Jan '19

22 Jan '19

Module: kamailio Branch: master Commit: bdc4d3c7dea73e10353d37655f31d6e36c87126b URL: https://github.com/kamailio/kamailio/commit/bdc4d3c7dea73e10353d37655f31d6e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-22T08:46:39+01:00 dialog: docs - small addition to early_timeout param --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bdc4d3c7dea73e10353d37655f31d6e… Patch: https://github.com/kamailio/kamailio/commit/bdc4d3c7dea73e10353d37655f31d6e… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 9adca735db..c74140e04e 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -323,8 +323,8 @@ modparam("dialog", "default_timeout", 21600) <section id="dialog.p.early_timeout"> <title><varname>early_timeout</varname> (integer)</title> <para> - The timeout (in seconds) after which the dialogs in early state (no - final response received) are destroyed. + The timeout (in seconds) after which the dialogs in unconfirmed or early + state (no final response received) are destroyed. </para> <para> <emphasis>

1 0

git:master:c06aeea1: db_mysql: remove long commented out DBG statement that don't work for all data
by Henning Westerholt 21 Jan '19

21 Jan '19

Module: kamailio Branch: master Commit: c06aeea1b1c31720437037c211875bea8de0a669 URL: https://github.com/kamailio/kamailio/commit/c06aeea1b1c31720437037c211875be… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-21T23:27:43+01:00 db_mysql: remove long commented out DBG statement that don't work for all data --- Modified: src/modules/db_mysql/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/c06aeea1b1c31720437037c211875be… Patch: https://github.com/kamailio/kamailio/commit/c06aeea1b1c31720437037c211875be… --- diff --git a/src/modules/db_mysql/km_dbase.c b/src/modules/db_mysql/km_dbase.c index 84cb5030d8..3014d374f6 100644 --- a/src/modules/db_mysql/km_dbase.c +++ b/src/modules/db_mysql/km_dbase.c @@ -96,10 +96,6 @@ static int db_mysql_submit_query(const db1_con_t* _h, const str* _s) CON_TIMESTAMP(_h) = t; } - /* screws up the terminal when the query contains a BLOB :-( (by bogdan) - * LM_DBG("submit_query(): %.*s\n", _s->len, _s->s); - */ - /* When a server connection is lost and a query is attempted, most of * the time the query will return a CR_SERVER_LOST, then at the second * attempt to execute it, the mysql lib will reconnect and succeed.

1 0

git:master:f3fa0039: db_mysql: use generic PKG_MEM_ERROR, SHM_ERROR and SYS_MEM_ERROR helper defines
by Henning Westerholt 21 Jan '19

21 Jan '19

Module: kamailio Branch: master Commit: f3fa0039260090f09f936b63867af29936a4afaf URL: https://github.com/kamailio/kamailio/commit/f3fa0039260090f09f936b63867af29… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-21T23:17:21+01:00 db_mysql: use generic PKG_MEM_ERROR, SHM_ERROR and SYS_MEM_ERROR helper defines --- Modified: src/modules/db_mysql/km_dbase.c Modified: src/modules/db_mysql/km_my_con.c Modified: src/modules/db_mysql/km_res.c Modified: src/modules/db_mysql/my_cmd.c Modified: src/modules/db_mysql/my_con.c Modified: src/modules/db_mysql/my_fld.c Modified: src/modules/db_mysql/my_res.c Modified: src/modules/db_mysql/my_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/f3fa0039260090f09f936b63867af29… Patch: https://github.com/kamailio/kamailio/commit/f3fa0039260090f09f936b63867af29…

1 0

git:master:0206c949: db_mysql: remove old module name prefix from several log statements, already added from core
by Henning Westerholt 21 Jan '19

21 Jan '19

Module: kamailio Branch: master Commit: 0206c94949aa3b3a99b2ef62d5ae011ca0c96a78 URL: https://github.com/kamailio/kamailio/commit/0206c94949aa3b3a99b2ef62d5ae011… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-21T23:25:02+01:00 db_mysql: remove old module name prefix from several log statements, already added from core --- Modified: src/modules/db_mysql/my_cmd.c Modified: src/modules/db_mysql/my_con.c Modified: src/modules/db_mysql/my_res.c --- Diff: https://github.com/kamailio/kamailio/commit/0206c94949aa3b3a99b2ef62d5ae011… Patch: https://github.com/kamailio/kamailio/commit/0206c94949aa3b3a99b2ef62d5ae011…

1 0

git:master:ab0de387: db_mysql: small unification for log macro usage for errors and warning
by Henning Westerholt 21 Jan '19

21 Jan '19

Module: kamailio Branch: master Commit: ab0de3872c62084cf5d53b0f263fd7edd70e2781 URL: https://github.com/kamailio/kamailio/commit/ab0de3872c62084cf5d53b0f263fd7e… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-21T22:58:35+01:00 db_mysql: small unification for log macro usage for errors and warning --- Modified: src/modules/db_mysql/db_mysql.c Modified: src/modules/db_mysql/my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/ab0de3872c62084cf5d53b0f263fd7e… Patch: https://github.com/kamailio/kamailio/commit/ab0de3872c62084cf5d53b0f263fd7e… --- diff --git a/src/modules/db_mysql/db_mysql.c b/src/modules/db_mysql/db_mysql.c index 4a79a1878d..da130f1818 100644 --- a/src/modules/db_mysql/db_mysql.c +++ b/src/modules/db_mysql/db_mysql.c @@ -139,14 +139,14 @@ static int mysql_mod_init(void) my_recv_to= DEFAULT_MY_RECV_TO; } } else if (my_recv_to || my_send_to) { - LOG(L_WARN, "WARNING: mysql send or received timeout set, but " + LM_WARN("WARNING: mysql send or received timeout set, but " " not supported by the installed mysql client library" " (needed at least 4.1.22 or 5.0.25, but installed %ld)\n", my_client_ver); } #else if (my_recv_to || my_send_to) { - LOG(L_WARN, "WARNING: mysql send or received timeout set, but " + LM_WARN("WARNING: mysql send or received timeout set, but " " not supported by the mysql client library used to compile" " the mysql module (needed at least 4.1.1 but " " compiled against %ld)\n", MYSQL_VERSION_ID); diff --git a/src/modules/db_mysql/my_con.c b/src/modules/db_mysql/my_con.c index 0f0238aae8..d311f5b342 100644 --- a/src/modules/db_mysql/my_con.c +++ b/src/modules/db_mysql/my_con.c @@ -90,7 +90,7 @@ int my_con_connect(db_con_t* con) if (!mysql_real_connect(mcon->con, muri->host, muri->username, muri->password, muri->database, muri->port, 0, 0)) { - LOG(L_ERR, "mysql: %s\n", mysql_error(mcon->con)); + ERR("mysql: %s\n", mysql_error(mcon->con)); return -1; }

1 0

Re: [sr-dev] Give me a suggest for module implementation
by Henning Westerholt 21 Jan '19

21 Jan '19

Am Sonntag, 20. Januar 2019, 17:57:33 CET schrieb Mojtaba: > Hello Henning, > > Thank you for replying.Sure. It would be useful. Thanks > Using htable module is good idea, But if i want not to use htable module > and save part of SIP Messagre in memory , How do i impelement auto-expire > after afew time? > With regards. Hello Mojtaba, please keep the list in CC. The htable module support this memory storage and also auto-expiration out of the box. :-) You can find (a bit complicated) example in the usrloc module. A starting point for the expiration logic can be the delete_ucontact(..) function there. You need to store the SIP message data in a proper data structure like a list or a hash table. Best regards, Henning > On Sun, 20 Jan 2019, 18:47 Henning Westerholt, <hw(a)kamailio.org> wrote: > > Am Samstag, 19. Januar 2019, 10:43:09 CET schrieb Mojtaba: > > > Sorry for my mistake in subject! > > > "Give me suggestions for module implementation", anyway, > > > Give me suggestions for duplication detection algorithm? > > > > Hello Mojtaba, > > > > just to give you an idea: you can access and store parts of the message in > > memory with e.g. the htable module. Then you can compare it during the > > route > > block with the new incoming message and reject it. > > > > I found this old discussion thread about a similar topic: > > https://lists.kamailio.org/pipermail/users/2009-February/021906.html > > > > You can of course also implement this in a module, but in this case it > > would > > not be necessary. > > > > Maybe this is helpful for your as well. -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://skalatan.de/services Kamailio security assessment - https://skalatan.de/de/assessment

2 2

[kamailio/kamailio] kamctl: keep it POSIX (#1815)
by micmac1 20 Jan '19

20 Jan '19

Hi all, I was trying to add entries to a remote database on OpenWrt and kamctl (address add ...) seemed to just hang there. A bit of digging showed that it prompted for a password, but I couldn't see it because it redirected the prompt to /dev/stderr, which doesn't exist on every system. This patch addresses thist. Use portable "#!/bin/sh" shebang. This may still be a symlink to bash (or some other shell). Also replace the redirection to "/dev/stderr" with a POSIX redirection to stderr. "/dev/stderr" is not available on all systems and is also not recognized by all shells (example: ash). On systems without a working "/dev/stderr" the user will not see the prompts etc. Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net>   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1815 -- Commit Summary -- * kamctl: keep it POSIX -- File Changes -- M utils/kamctl/kamctl (2) M utils/kamctl/kamctl.base (6) M utils/kamctl/kamctl.sqlbase (4) M utils/kamctl/kamdbctl (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1815.patch https://github.com/kamailio/kamailio/pull/1815.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/1815

2 2

git:master:30857dfe: utils: kamctl, kamdbctl improve POSIX compatibility for embedded systems (#1815)
by Henning Westerholt 20 Jan '19

20 Jan '19

Module: kamailio Branch: master Commit: 30857dfe5d0e0e99050fec6437c77f6baafae399 URL: https://github.com/kamailio/kamailio/commit/30857dfe5d0e0e99050fec6437c77f6… Author: micmac1 <sebastian_ml(a)gmx.net> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-01-20T20:58:11+01:00 utils: kamctl, kamdbctl improve POSIX compatibility for embedded systems (#1815) - Use portable "#!/bin/sh" shebang. This may still be a symlink to bash (or some other shell). - Also replace the redirection to "/dev/stderr" with a POSIX redirection to stderr. "/dev/stderr" is not available on all systems and is also not recognized by all shells (example: ash). On systems without a working "/dev/stderr" the user will not see the prompts etc. - Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamctl.base Modified: utils/kamctl/kamctl.sqlbase Modified: utils/kamctl/kamdbctl --- Diff: https://github.com/kamailio/kamailio/commit/30857dfe5d0e0e99050fec6437c77f6… Patch: https://github.com/kamailio/kamailio/commit/30857dfe5d0e0e99050fec6437c77f6… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index b115f5a998..9993d56f0f 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # # control tool for maintaining Kamailio # diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index a776e10d82..b538cd70d1 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -651,7 +651,7 @@ in SIP_DOMAIN" check_aor() { echo "$1" | $EGREP "^$USERNAME_RE@.*\..*" >/dev/null if [ $? -ne 0 ] ; then - echo "error: invalid AoR: $1" > /dev/stderr + echo "error: invalid AoR: $1" >&2 exit 1 fi } @@ -670,7 +670,7 @@ is_aor() { check_sipaor() { echo "$1" | $EGREP "^sip(s)?:$USERNAME_RE@.*\..*" >/dev/null if [ $? -ne 0 ] ; then - echo "error: invalid SIP AoR: $1" > /dev/stderr + echo "error: invalid SIP AoR: $1" >&2 exit 1 fi } @@ -681,7 +681,7 @@ check_sipaor() { check_uri() { echo "$1" | $EGREP "^sip(s)?:($USERNAME_RE@)?.*\..*" > /dev/null if [ $? -ne 0 ] ; then - echo "error: invalid SIP URI: $1" > /dev/stderr + echo "error: invalid SIP URI: $1" >&2 exit 1 fi } diff --git a/utils/kamctl/kamctl.sqlbase b/utils/kamctl/kamctl.sqlbase index f821d2a799..258366b999 100644 --- a/utils/kamctl/kamctl.sqlbase +++ b/utils/kamctl/kamctl.sqlbase @@ -38,9 +38,9 @@ prompt_pw() { if [ -z "$DBRWPW" ] ; then savetty=`stty -g` if [ -z "$1" ] ; then - printf "Password: " > /dev/stderr + printf "Password: " >&2 else - printf "$1: " > /dev/stderr + printf "$1: " >&2 fi stty -echo read DBRWPW diff --git a/utils/kamctl/kamdbctl b/utils/kamctl/kamdbctl index cac33fd1ce..a8d429a728 100755 --- a/utils/kamctl/kamdbctl +++ b/utils/kamctl/kamdbctl @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # # control tool for maintaining Kamailio databases #

1 0

git:master:397acefe: presence_profile: removed history, code formatting
by Daniel-Constantin Mierla 20 Jan '19

20 Jan '19

Module: kamailio Branch: master Commit: 397acefebcd97a7ac32c26a9306c627c5438519d URL: https://github.com/kamailio/kamailio/commit/397acefebcd97a7ac32c26a9306c627… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-20T18:02:15+01:00 presence_profile: removed history, code formatting --- Modified: src/modules/presence_profile/add_events.c Modified: src/modules/presence_profile/add_events.h Modified: src/modules/presence_profile/presence_profile.c Modified: src/modules/presence_profile/presence_profile.h --- Diff: https://github.com/kamailio/kamailio/commit/397acefebcd97a7ac32c26a9306c627… Patch: https://github.com/kamailio/kamailio/commit/397acefebcd97a7ac32c26a9306c627…

1 0

git:master:8fd514f9: dialog: clean very old dialogs for both unconfirmed and early state
by Daniel-Constantin Mierla 20 Jan '19

20 Jan '19

Module: kamailio Branch: master Commit: 8fd514f9bb9e819fa6e5880dc229955cafd72494 URL: https://github.com/kamailio/kamailio/commit/8fd514f9bb9e819fa6e5880dc229955… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-20T18:08:56+01:00 dialog: clean very old dialogs for both unconfirmed and early state - it was done only for unconfirmed state --- Modified: src/modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/8fd514f9bb9e819fa6e5880dc229955… Patch: https://github.com/kamailio/kamailio/commit/8fd514f9bb9e819fa6e5880dc229955… --- diff --git a/src/modules/dialog/dlg_hash.c b/src/modules/dialog/dlg_hash.c index 30c1cf76d1..5c11bada52 100644 --- a/src/modules/dialog/dlg_hash.c +++ b/src/modules/dialog/dlg_hash.c @@ -235,9 +235,9 @@ int dlg_clean_run(ticks_t ti) while (dlg) { tdlg = dlg; dlg = dlg->next; - if(tdlg->state==DLG_STATE_UNCONFIRMED && tdlg->init_ts>0 + if(tdlg->state<=DLG_STATE_EARLY && tdlg->init_ts>0 && tdlg->init_ts<tm-dlg_early_timeout) { - /* dialog in early state older than 5min */ + /* dialog in unconfirmed or early state older than expected */ LM_NOTICE("dialog in early state is too old (%p ref %d)\n", tdlg, tdlg->ref); unlink_unsafe_dlg(&d_table->entries[i], tdlg);

1 0

git:master:2137aef7: presence_reginfo: clang format wrapper to exports struct
by Daniel-Constantin Mierla 20 Jan '19

20 Jan '19

Module: kamailio Branch: master Commit: 2137aef791bfbc835ac5f630c91c49fc509e6a6c URL: https://github.com/kamailio/kamailio/commit/2137aef791bfbc835ac5f630c91c49f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-20T17:57:07+01:00 presence_reginfo: clang format wrapper to exports struct - removed trailing spaces --- Modified: src/modules/presence_reginfo/add_events.c Modified: src/modules/presence_reginfo/add_events.h Modified: src/modules/presence_reginfo/presence_reginfo.c Modified: src/modules/presence_reginfo/presence_reginfo.h --- Diff: https://github.com/kamailio/kamailio/commit/2137aef791bfbc835ac5f630c91c49f… Patch: https://github.com/kamailio/kamailio/commit/2137aef791bfbc835ac5f630c91c49f… --- diff --git a/src/modules/presence_reginfo/add_events.c b/src/modules/presence_reginfo/add_events.c index 5616faa83a..3cb9f7a145 100644 --- a/src/modules/presence_reginfo/add_events.c +++ b/src/modules/presence_reginfo/add_events.c @@ -16,8 +16,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 */ @@ -31,7 +31,7 @@ int reginfo_add_events(void) { pres_ev_t event; - + /* constructing message-summary event */ memset(&event, 0, sizeof(pres_ev_t)); event.name.s = "reg"; @@ -47,6 +47,6 @@ int reginfo_add_events(void) if (pres_add_event(&event) < 0) { LM_ERR("failed to add event \"reginfo\"\n"); return -1; - } + } return 0; } diff --git a/src/modules/presence_reginfo/add_events.h b/src/modules/presence_reginfo/add_events.h index 49d9322740..194dca6f0c 100644 --- a/src/modules/presence_reginfo/add_events.h +++ b/src/modules/presence_reginfo/add_events.h @@ -16,8 +16,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 */ diff --git a/src/modules/presence_reginfo/presence_reginfo.c b/src/modules/presence_reginfo/presence_reginfo.c index bf8588dd37..eadbfdad24 100644 --- a/src/modules/presence_reginfo/presence_reginfo.c +++ b/src/modules/presence_reginfo/presence_reginfo.c @@ -16,8 +16,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 */ @@ -47,6 +47,7 @@ static int mod_init(void); add_event_t pres_add_event; /* module exports */ +/* clang-format off */ struct module_exports exports= { "presence_reginfo", /* module name */ DEFAULT_DLFLAGS, /* dlopen flags */ @@ -59,7 +60,8 @@ struct module_exports exports= { 0, /* per-child init function */ 0 /* module destroy function */ }; - +/* clang-format on */ + /* * init module function */ @@ -85,8 +87,8 @@ static int mod_init(void) } if(reginfo_add_events() < 0) { LM_ERR("failed to add reginfo-info events\n"); - return -1; - } - + return -1; + } + return 0; } diff --git a/src/modules/presence_reginfo/presence_reginfo.h b/src/modules/presence_reginfo/presence_reginfo.h index a721737841..6d5371535b 100644 --- a/src/modules/presence_reginfo/presence_reginfo.h +++ b/src/modules/presence_reginfo/presence_reginfo.h @@ -16,8 +16,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 */

1 0

Give me a suggest for module implementation
by Mojtaba 20 Jan '19

20 Jan '19

Hello As you will know i am developing new module for Kamailio and i'll commit on main project as soon as. Let me give more news about this module later. But i wanna to share with you one thing, if you were in my shoes, what do you to found out duplicated signalling? I don't mean retransmision messages. Let's go to question: In kamailio, you could get a copy of signalling message that is generated by siptrace module in other one kamailio. We know it would be send some signalling messages twice or more in duplicate( I mean 180Ringing, 200OK or etc), How we could found out them? Actually i must do it in module not do in cfg configuration. Would you please give me a suggest? I really need a sugest with no extra overhead. With regards.Mojtaba

3 3

[kamailio/kamailio] siptrace module not send ACK (#1811)
by sergey-safarov 17 Jan '19

17 Jan '19

### Description siptrace module not mirror relayed ACK message. ### Troubleshooting #### Reproduction Need patch vanilla kamailio config like this diff ```patch --- kamailio.cfg +++ /etc/kamailio/kamailio.cfg @@ -1,4 +1,8 @@ #!KAMAILIO +#!define WITH_DEBUG +#!define WITH_PSTN +#!define WITH_NAT + # # Kamailio (OpenSER) SIP Server v5.1 - default configuration script # - web: https://www.kamailio.org @@ -137,7 +141,9 @@ #!define FLT_ACCMISSED 2 #!define FLT_ACCFAILED 3 #!define FLT_NATS 5 +#!define FLT_SIPTRACE 8 + #!define FLB_NATB 6 #!define FLB_NATSIPPING 7 @@ -198,8 +204,8 @@ * pstn.gw_ip = "10.0.0.101" desc "My PSTN GW Address" * * - by default is empty to avoid misrouting */ -pstn.gw_ip = "" desc "PSTN GW Address" -pstn.gw_port = "" desc "PSTN GW Port" +pstn.gw_ip = "8.8.8.8" desc "PSTN GW Address" +pstn.gw_port = "5060" desc "PSTN GW Port" #!endif #!ifdef WITH_VOICEMAIL @@ -286,6 +292,16 @@ loadmodule "debugger.so" #!endif +loadmodule "siptrace.so" +modparam("siptrace", "duplicate_uri", "sip:217.12.247.98:9060") +modparam("siptrace", "hep_mode_on", 1) +modparam("siptrace", "hep_version", 3) +modparam("siptrace", "hep_capture_id", 1) +modparam("siptrace", "trace_to_database", 0) +## `trace_flag` value must be equal to FLT_SIPTRACE value at head of "default.cfg" file +modparam("siptrace", "trace_flag", 8) +modparam("siptrace", "trace_on", 1) + # ----------------- setting module-specific parameters --------------- @@ -310,9 +326,10 @@ # ----- rr params ----- # set next param to 1 to add value to ;lr param (helps with some UAs) -modparam("rr", "enable_full_lr", 0) +modparam("rr", "enable_full_lr", 1) # do not append from tag to the RR (no need for this script) modparam("rr", "append_fromtag", 0) +modparam("rr", "enable_double_rr", 1) # ----- registrar params ----- modparam("registrar", "method_filtering", 1) @@ -536,6 +553,9 @@ if(!t_is_set("failure_route")) t_on_failure("MANAGE_FAILURE"); } + sip_trace(); + setflag(FLT_SIPTRACE); + if (!t_relay()) { sl_reply_error(); } ``` #### Debugging Data none #### Log Messages ```text {1 20 ACK 1258335781} 15(2198) DEBUG: siptrace [siptrace.c:507]: sip_trace_store_db(): database connection not initialized {1 20 ACK 1258335781} 15(2198) DEBUG: siptrace [siptrace_hep.c:498]: pipport2su(): the port string is 35060 {1 20 ACK 1258335781} 15(2198) DEBUG: siptrace [siptrace_hep.c:498]: pipport2su(): the port string is 5060 {1 20 ACK 1258335781} 15(2198) DEBUG: <core> [core/proxy.c:264]: mk_proxy(): doing DNS lookup... {1 20 ACK 1258335781} 15(2198) DEBUG: siptrace [siptrace_hep.c:183]: trace_send_hep3_duplicate(): setting up the socket_info {1 20 ACK 1258335781} 15(2198) exec: *** cfgtrace:request_route=[RELAY] c=[/etc/kamailio/kamailio.cfg] l=557 a=39 n=setflag {1 20 ACK 1258335781} 15(2198) exec: *** cfgtrace:request_route=[RELAY] c=[/etc/kamailio/kamailio.cfg] l=562 a=16 n=if {1 20 ACK 1258335781} 15(2198) exec: *** cfgtrace:request_route=[RELAY] c=[/etc/kamailio/kamailio.cfg] l=559 a=24 n=t_relay {1 20 ACK 1258335781} 15(2198) DEBUG: tm [t_lookup.c:1319]: t_newtran(): msg id=1 , global msg id=0 , T on entrance=0xffffffffffffffff {1 20 ACK 1258335781} 15(2198) DEBUG: tm [t_lookup.c:476]: t_lookup_request(): start searching: hash=11341, isACK=1 {1 20 ACK 1258335781} 15(2198) DEBUG: tm [t_lookup.c:435]: matching_3261(): RFC3261 transaction matching failed {1 20 ACK 1258335781} 15(2198) DEBUG: tm [t_lookup.c:659]: t_lookup_request(): no transaction found {1 20 ACK 1258335781} 15(2198) DEBUG: tm [t_funcs.c:284]: t_relay_to(): forwarding ACK statelessly {1 20 ACK 1258335781} 15(2198) DEBUG: <core> [core/md5utils.c:67]: MD5StringArray(): MD5 calculated: 307e4757bd94a80e26f17adb5260cb13 {1 20 ACK 1258335781} 15(2198) DEBUG: <core> [core/forward.c:557]: forward_request(): Sending: ``` Received ACK is mirrored but relayed ACK is not mirrored. Full log in attached file `kamailio.log` [kamailio.log](https://github.com/kamailio/kamailio/files/2766269/kamailio.l… #### SIP Traffic SIP messages and mirrored traffic in attached pcap file. Packet 19 is not mirrored. [kamailio-ack.zip](https://github.com/kamailio/kamailio/files/2766281/kamail… ### Possible Solutions Not know ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` / # kamailio -v version: kamailio 5.1.6 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, 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_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 03:24:34 Nov 23 2018 with gcc 8.2.0 ``` * **Operating System**: Alpine Linux edge ``` / # cat /etc/os-release NAME="Alpine Linux" ID=alpine VERSION_ID=3.8.0 PRETTY_NAME="Alpine Linux v3.8" HOME_URL="http://alpinelinux.org" BUG_REPORT_URL="http://bugs.alpinelinux.org" ``` -- 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/1811

3 8

git:master:209a868e: modules: readme files regenerated - siptrace ... [skip ci]
by Kamailio Dev 17 Jan '19

17 Jan '19

Module: kamailio Branch: master Commit: 209a868ed97eeece752bb9f1e320282f060a943f URL: https://github.com/kamailio/kamailio/commit/209a868ed97eeece752bb9f1e320282… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-17T18:01:45+01:00 modules: readme files regenerated - siptrace ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/209a868ed97eeece752bb9f1e320282… Patch: https://github.com/kamailio/kamailio/commit/209a868ed97eeece752bb9f1e320282… --- diff --git a/src/modules/siptrace/README b/src/modules/siptrace/README index 3841e32a2e..4b92b778ce 100644 --- a/src/modules/siptrace/README +++ b/src/modules/siptrace/README @@ -100,6 +100,7 @@ Camille Oudot 1.19. Set auth_key parameter 1.20. sip_trace() usage 1.21. hlog() usage + 1.22. Send relayed ACK message Chapter 1. Admin Guide @@ -549,4 +550,13 @@ kamcmd siptrace.status check 7. Known issues Stateless forwarded messages (forward()) are not logged if you set the - flag, use sip_trace(). + flag, use sip_trace() inside onsend_route block. + + Example 1.22. Send relayed ACK message +... +onsend_route { + if (is_method("ACK")) { + sip_trace(); + } +} +...

1 0

git:master:d0498913: Merge pull request #1813 from sergey-safarov/siptrace
by GitHub 17 Jan '19

17 Jan '19

Module: kamailio Branch: master Commit: d0498913159765da9bb94bec5de5ebcd99a6571c URL: https://github.com/kamailio/kamailio/commit/d0498913159765da9bb94bec5de5ebc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-01-17T17:50:57+01:00 Merge pull request #1813 from sergey-safarov/siptrace src/modules/siptrace: Updated usage instruction â¦ --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d0498913159765da9bb94bec5de5ebc… Patch: https://github.com/kamailio/kamailio/commit/d0498913159765da9bb94bec5de5ebc… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index 504e6e98b8..c808066731 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -654,8 +654,20 @@ hlog("$hdr(P-MyID)", "Another one with a custom correlation ID"); <title>Known issues</title> <para> Stateless forwarded messages (forward()) are not logged if you set the - flag, use sip_trace(). + flag, use sip_trace() inside <emphasis>onsend_route</emphasis> block. </para> + <example> + <title>Send relayed ACK message</title> + <programlisting format="linespecific"> +... +onsend_route { + if (is_method("ACK")) { + sip_trace(); + } +} +... +</programlisting> + </example> </section> </chapter>

1 0

git:master:10450f84: src/modules/siptrace: Updated usage instruction about stateless forwarded messages
by Sergey Safarov 17 Jan '19

17 Jan '19

Module: kamailio Branch: master Commit: 10450f84a842db38ed28e7cb052f689fa473c73e URL: https://github.com/kamailio/kamailio/commit/10450f84a842db38ed28e7cb052f689… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-01-17T16:11:09Z src/modules/siptrace: Updated usage instruction about stateless forwarded messages --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/10450f84a842db38ed28e7cb052f689… Patch: https://github.com/kamailio/kamailio/commit/10450f84a842db38ed28e7cb052f689… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index 504e6e98b8..c808066731 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -654,8 +654,20 @@ hlog("$hdr(P-MyID)", "Another one with a custom correlation ID"); <title>Known issues</title> <para> Stateless forwarded messages (forward()) are not logged if you set the - flag, use sip_trace(). + flag, use sip_trace() inside <emphasis>onsend_route</emphasis> block. </para> + <example> + <title>Send relayed ACK message</title> + <programlisting format="linespecific"> +... +onsend_route { + if (is_method("ACK")) { + sip_trace(); + } +} +... +</programlisting> + </example> </section> </chapter>

1 0

[kamailio/kamailio] src/modules/siptrace: Updated usage instruction … (#1813)
by sergey-safarov 17 Jan '19

17 Jan '19

…about stateless forwarded messages #### Pre-Submission Checklist - [x] 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 - [x] 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 - [x] Related to issue #1811 #### Description Added example how to send stateless forwarded messages You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1813 -- Commit Summary -- * src/modules/siptrace: Updated usage instruction about stateless forwarded messages -- File Changes -- M src/modules/siptrace/doc/siptrace_admin.xml (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1813.patch https://github.com/kamailio/kamailio/pull/1813.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/1813

2 2

[kamailio/kamailio] TLS module: Unable to load tls module (#1797)
by com4bizz 17 Jan '19

17 Jan '19

ERROR: tls [tls_init.c:601]: tls_pre_init(): Unable to set the memory allocation functions This error comes with 5.0x - 5.2x and maybe in earlyer versions too. Tried OpenSSL 1.0, and 1.1 with same result... -- 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/1797

4 13

[kamailio/kamailio] Segmentation fault in TM module while processing SIP status 408 (#1806)
by Muhammad Shahzad Shafi 17 Jan '19

17 Jan '19

### Description We have segfault in Kamailio v5.0.7 rev. 7ab0b1 installed on Debain 7.x 32bit KVM when processing sip reply 408 due to RING Timeout.  ### Troubleshooting No troubleshooting was done, since it happened on a production server. We simply restarted the server. #### Reproduction The problem is random and has happened a couple of times within a month.  #### Debugging Data Here is back trace from core dump generated by kamailio. <pre> Core was generated by `/usr/local/adx-webrtc/sbin/kamailio -f /usr/local/adx-webrtc/etc/kamailio/kamai'. Program terminated with signal 11, Segmentation fault. #0 0xb4f9bcb9 in run_failure_handlers (t=0x92d6111c, rpl=0xffffffff, code=408, extra_flags=96) at t_reply.c:1013 1013 t_reply.c: No such file or directory. (gdb) bt #0 0xb4f9bcb9 in run_failure_handlers (t=0x92d6111c, rpl=0xffffffff, code=408, extra_flags=96) at t_reply.c:1013 #1 0xb4f9ea32 in t_should_relay_response (Trans=0x92d6111c, new_code=408, branch=0, should_store=0xbf90fba4, should_relay=0xbf90fba8, cancel_data=0xbf90fc28, reply=0xffffffff) at t_reply.c:1382 #2 0xb4fa1431 in relay_reply (t=0x92d6111c, p_msg=0xffffffff, branch=0, msg_status=408, cancel_data=0xbf90fc28, do_put_on_wait=0) at t_reply.c:1785 #3 0xb4f4bbca in fake_reply (t=0x92d6111c, branch=0, code=408) at timer.c:340 #4 0xb4f4bfe7 in final_response_handler (r_buf=0x92d61288, t=0x92d6111c) at timer.c:506 #5 0xb4f4c07e in retr_buf_handler (ticks=368965158, tl=0x92d6129c, p=0xfffffffe) at timer.c:562 #6 0x08250eb4 in slow_timer_main () at core/timer.c:1131 #7 0x08069a4e in main_loop () at main.c:1679 #8 0x08070868 in main (argc=13, argv=0xbf9103a4) at main.c:2642 </pre> Here is full back trace.  ``` (gdb) bt full #0 0xb4f9bcb9 in run_failure_handlers (t=0x92d6111c, rpl=0xffffffff, code=408, extra_flags=96) at t_reply.c:1013 faked_req = 0x984311f4 faked_req_len = 4512 shmem_msg = 0x94ed18b8 on_failure = 2 keng = 0x0 __FUNCTION__ = "run_failure_handlers" #1 0xb4f9ea32 in t_should_relay_response (Trans=0x92d6111c, new_code=408, branch=0, should_store=0xbf90fba4, should_relay=0xbf90fba8, cancel_data=0xbf90fc28, reply=0xffffffff) at t_reply.c:1382 branch_cnt = 1 picked_code = 408 new_branch = -1755505652 inv_through = 0 extra_flags = 96 i = 0 replies_dropped = 0 __FUNCTION__ = "t_should_relay_response" #2 0xb4fa1431 in relay_reply (t=0x92d6111c, p_msg=0xffffffff, branch=0, msg_status=408, cancel_data=0xbf90fc28, do_put_on_wait=0) at t_reply.c:1785 relay = -65536 save_clone = 0 buf = 0x0 res_len = 0 relayed_code = 0 relayed_msg = 0x0 reply_bak = 0xb5002368 bm = {to_tag_val = {s = 0xb5a847f7 "ation", len = 10}} totag_retr = 0 reply_status = RPS_ERROR uas_rb = 0x0 to_tag = 0x0 reason = {s = 0x0, len = 1946659428} onsend_params = {req = 0xb5002368, rpl = 0x0, param = 0xbf910234, code = -1081017352, flags = 56659, branch = 46322, t_rbuf = 0xb4fd5a10, dst = 0x2, send_buf = { s = 0xbf90fce8 "\030\375\220\277\034\021֒\210\022֒\240", len = 1946588245}} ip = {af = 0, len = 3213949832, u = {addrl = {4294967295, 0, 3213951540, 3213949832}, addr32 = {4294967295, 0, 3213951540, 3213949832}, addr16 = {65535, 65535, 0, 0, 564, 49041, 64392, 49040}, addr = "\377\377\377\377\000\000\000\000\064\002\221\277\210", <incomplete sequence \373\220\277>}} __FUNCTION__ = "relay_reply" #3 0xb4f4bbca in fake_reply (t=0x92d6111c, branch=0, code=408) at timer.c:340 cancel_data = {cancel_bitmap = 0, reason = {cause = 0, u = {text = {s = 0x0, len = 5}, e2e_cancel = 0x0, packed_hdrs = {s = 0x0, len = 5}}}} do_cancel_branch = 1 reply_status = 29068 #4 0xb4f4bfe7 in final_response_handler (r_buf=0x92d61288, t=0x92d6111c) at timer.c:506 silent = 0 branch_ret = -1258282136 prev_branch = 0 now = 0 #5 0xb4f4c07e in retr_buf_handler (ticks=368965158, tl=0x92d6129c, p=0xfffffffe) at timer.c:562 rbuf = 0x92d61288 fr_remainder = 0 retr_remainder = 12 retr_interval = 1674326491 new_retr_interval_ms = 160 crt_retr_interval_ms = 3213950232 t = 0x92d6111c __FUNCTION__ = "retr_buf_handler" #6 0x08250eb4 in slow_timer_main () at core/timer.c:1131 n = 12 ret = 0 tl = 0x92d6129c i = 516 __FUNCTION__ = "slow_timer_main" #7 0x08069a4e in main_loop () at main.c:1679 i = 4 pid = 0 si = 0x0 si_desc = "udp receiver child=3 sock=xx.xx.xx.xx:5060\000\000\000\000\000\004\000\000\000\030\000\221\277\333\061\314c\001\000\000\000\333\061\314c\230\377\220\277\264\n(\bd\024<t\004\000\000\000\331\332\066\b\260\354\066\bq\000\000\000t\331\066\b\v\020\000\000Y\222\350\264D\221\257\265;\031B\264\\\"C\264\214#\000\000\000\000\000" nrprocs = 4 woneinit = 1 __FUNCTION__ = "main_loop" #8 0x08070868 in main (argc=13, argv=0xbf9103a4) at main.c:2642 cfg_stream = 0x8a4a008 c = -1 r = 0 tmp = 0xbf910903 "" tmp_len = -1218121696 port = 2209 proto = 1 options = 0x8344f9c ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 3093231387 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0xbf9103a4 p = 0x805d60c "[\201\303\354\253<" st = {st_dev = 14, __pad1 = 0, st_ino = 10259, st_mode = 16832, st_nlink = 2, st_uid = 0, st_gid = 0, st_rdev = 0, __pad2 = 0, st_size = 60, st_blksize = 4096, st_blocks = 0, st_atim = { tv_sec = 1542580403, tv_nsec = 128163439}, st_mtim = {tv_sec = 1542580752, tv_nsec = 236241520}, st_ctim = {tv_sec = 1542580752, tv_nsec = 236241520}, __unused4 = 0, __unused5 = 0} __FUNCTION__ = "main" ``` #### Log Messages No logs available since it happend on a production server.  ``` Jan 10 16:00:53 webrtc-as kernel: [25983771.956320] kamailio[29068]: segfault at 36c ip b4f9bcb9 sp bf90f7a0 error 6 in tm.so[b4eeb000+117000] ``` #### SIP Traffic No SIP traffic available.  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.0.7 (i386/linux) 7ab0b1 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, 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, select. id: 7ab0b1 compiled on 22:43:08 Aug 27 2018 with gcc 4.7.2 ``` * **Operating System**:  ``` Linux webrtc-as1 3.16.0-0.bpo.4-686-pae #1 SMP Debian 3.16.36-1+deb8u2~bpo70+1 (2016-10-19) i686 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/1806

2 5

git:5.1:8a21170c: siptrace: don't calculate message source socket if already set
by Federico Cabiddu 17 Jan '19

17 Jan '19

Module: kamailio Branch: 5.1 Commit: 8a21170c3a5283b84e0ff3cbc6db8c72413dec05 URL: https://github.com/kamailio/kamailio/commit/8a21170c3a5283b84e0ff3cbc6db8c7… Author: Federico Cabiddu <fcabiddu(a)libon.com> Committer: Federico Cabiddu <fcabiddu(a)libon.com> Date: 2019-01-17T09:43:47+01:00 siptrace: don't calculate message source socket if already set (cherry picked from commit 929a24f08aeef6b72999ac9b188ffeded40759a9) --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/8a21170c3a5283b84e0ff3cbc6db8c7… Patch: https://github.com/kamailio/kamailio/commit/8a21170c3a5283b84e0ff3cbc6db8c7… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 035ace455b..1e26bc2131 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1520,7 +1520,10 @@ int siptrace_net_data_send(sr_event_param_t *evp) return -1; new_dst = *nd->dst; - new_dst.send_sock = get_send_socket(0, &nd->dst->to, nd->dst->proto); + + if(new_dst.send_sock == 0) { + new_dst.send_sock = get_send_socket(0, &nd->dst->to, nd->dst->proto); + } memset(&sto, 0, sizeof(siptrace_data_t));

1 0

git:5.2:b7193895: siptrace: don't calculate message source socket if already set
by Federico Cabiddu 17 Jan '19

17 Jan '19

Module: kamailio Branch: 5.2 Commit: b71938952e1fc7543fa5bf7ba2abed6e39167150 URL: https://github.com/kamailio/kamailio/commit/b71938952e1fc7543fa5bf7ba2abed6… Author: Federico Cabiddu <fcabiddu(a)libon.com> Committer: Federico Cabiddu <fcabiddu(a)libon.com> Date: 2019-01-17T09:43:29+01:00 siptrace: don't calculate message source socket if already set (cherry picked from commit 929a24f08aeef6b72999ac9b188ffeded40759a9) --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/b71938952e1fc7543fa5bf7ba2abed6… Patch: https://github.com/kamailio/kamailio/commit/b71938952e1fc7543fa5bf7ba2abed6… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 7de96b4b5d..521ff113ab 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1492,7 +1492,10 @@ int siptrace_net_data_send(sr_event_param_t *evp) return -1; new_dst = *nd->dst; - new_dst.send_sock = get_send_socket(0, &nd->dst->to, nd->dst->proto); + + if(new_dst.send_sock == 0) { + new_dst.send_sock = get_send_socket(0, &nd->dst->to, nd->dst->proto); + } memset(&sto, 0, sizeof(siptrace_data_t));

1 0

git:master:79494842: Merge pull request #1810 from kamailio/grumvalski/siptrace_src_socket
by GitHub 17 Jan '19

17 Jan '19

Module: kamailio Branch: master Commit: 7949484246f38dc284d994b148c917f16ec8b880 URL: https://github.com/kamailio/kamailio/commit/7949484246f38dc284d994b148c917f… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-01-17T09:41:42+01:00 Merge pull request #1810 from kamailio/grumvalski/siptrace_src_socket siptrace: siptrace: don't calculate message source socket if already set --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/7949484246f38dc284d994b148c917f… Patch: https://github.com/kamailio/kamailio/commit/7949484246f38dc284d994b148c917f… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 8957c22fab..05a6310f40 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1493,7 +1493,10 @@ int siptrace_net_data_send(sr_event_param_t *evp) return -1; new_dst = *nd->dst; - new_dst.send_sock = get_send_socket(0, &nd->dst->to, nd->dst->proto); + + if(new_dst.send_sock == 0) { + new_dst.send_sock = get_send_socket(0, &nd->dst->to, nd->dst->proto); + } memset(&sto, 0, sizeof(siptrace_data_t));

1 0

[kamailio/kamailio] siptrace: siptrace: don't calculate message source socket if already set (#1810)
by Federico Cabiddu 17 Jan '19

17 Jan '19

When trace_mode = 1, the source socket of an outgoing message can be retrieved from the payload passed in the callback of SREV_NET_DATA_SEND. Otherwise, if the socket has been manually forced (setting $fs, calling force_send_socket..), the information will be overwritten and the actual source socket of the outgoing message lost. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1810 -- Commit Summary -- * siptrace: siptrace: don't calculate message source socket if already set -- File Changes -- M src/modules/siptrace/siptrace.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1810.patch https://github.com/kamailio/kamailio/pull/1810.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/1810

1 1

git:master:929a24f0: siptrace: don't calculate message source socket if already set
by Federico Cabiddu 17 Jan '19

17 Jan '19

Module: kamailio Branch: master Commit: 929a24f08aeef6b72999ac9b188ffeded40759a9 URL: https://github.com/kamailio/kamailio/commit/929a24f08aeef6b72999ac9b188ffed… Author: Federico Cabiddu <fcabiddu(a)libon.com> Committer: Federico Cabiddu <fcabiddu(a)libon.com> Date: 2019-01-16T18:09:42+01:00 siptrace: don't calculate message source socket if already set --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/929a24f08aeef6b72999ac9b188ffed… Patch: https://github.com/kamailio/kamailio/commit/929a24f08aeef6b72999ac9b188ffed… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 8957c22fab..05a6310f40 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1493,7 +1493,10 @@ int siptrace_net_data_send(sr_event_param_t *evp) return -1; new_dst = *nd->dst; - new_dst.send_sock = get_send_socket(0, &nd->dst->to, nd->dst->proto); + + if(new_dst.send_sock == 0) { + new_dst.send_sock = get_send_socket(0, &nd->dst->to, nd->dst->proto); + } memset(&sto, 0, sizeof(siptrace_data_t));

1 0

git:master:4197b52f: presence_xml: clang format the code
by Daniel-Constantin Mierla 17 Jan '19

17 Jan '19

Module: kamailio Branch: master Commit: 4197b52f313b75abd32592b78a5faf9b23ddbf1b URL: https://github.com/kamailio/kamailio/commit/4197b52f313b75abd32592b78a5faf9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-17T08:53:18+01:00 presence_xml: clang format the code --- Modified: src/modules/presence_xml/add_events.c Modified: src/modules/presence_xml/add_events.h Modified: src/modules/presence_xml/api.h Modified: src/modules/presence_xml/notify_body.c Modified: src/modules/presence_xml/notify_body.h Modified: src/modules/presence_xml/pidf.c Modified: src/modules/presence_xml/pidf.h Modified: src/modules/presence_xml/pres_check.c Modified: src/modules/presence_xml/pres_check.h Modified: src/modules/presence_xml/presence_xml.c Modified: src/modules/presence_xml/presence_xml.h Modified: src/modules/presence_xml/xcap_auth.c Modified: src/modules/presence_xml/xcap_auth.h --- Diff: https://github.com/kamailio/kamailio/commit/4197b52f313b75abd32592b78a5faf9… Patch: https://github.com/kamailio/kamailio/commit/4197b52f313b75abd32592b78a5faf9…

1 0

git:master:516091c0: presence: remove svn id lines and history comments
by Daniel-Constantin Mierla 17 Jan '19

17 Jan '19

Module: kamailio Branch: master Commit: 516091c0fcf3554d1778f257bc8b086b5ef30a70 URL: https://github.com/kamailio/kamailio/commit/516091c0fcf3554d1778f257bc8b086… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-17T08:36:52+01:00 presence: remove svn id lines and history comments --- Modified: src/modules/presence_xml/add_events.c Modified: src/modules/presence_xml/add_events.h Modified: src/modules/presence_xml/api.h Modified: src/modules/presence_xml/notify_body.c Modified: src/modules/presence_xml/notify_body.h Modified: src/modules/presence_xml/pidf.c Modified: src/modules/presence_xml/pidf.h Modified: src/modules/presence_xml/presence_xml.h Modified: src/modules/presence_xml/xcap_auth.c Modified: src/modules/presence_xml/xcap_auth.h --- Diff: https://github.com/kamailio/kamailio/commit/516091c0fcf3554d1778f257bc8b086… Patch: https://github.com/kamailio/kamailio/commit/516091c0fcf3554d1778f257bc8b086…

1 0

git:master:a9331b65: presence_xml: include guard for pres_check.h, declare extern variables in .h
by Daniel-Constantin Mierla 17 Jan '19

17 Jan '19

Module: kamailio Branch: master Commit: a9331b659eb767e8ae19f1ae2adb0ecbfbc71c13 URL: https://github.com/kamailio/kamailio/commit/a9331b659eb767e8ae19f1ae2adb0ec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-17T08:45:06+01:00 presence_xml: include guard for pres_check.h, declare extern variables in .h --- Modified: src/modules/presence_xml/add_events.h Modified: src/modules/presence_xml/api.h Modified: src/modules/presence_xml/pres_check.h Modified: src/modules/presence_xml/presence_xml.c --- Diff: https://github.com/kamailio/kamailio/commit/a9331b659eb767e8ae19f1ae2adb0ec… Patch: https://github.com/kamailio/kamailio/commit/a9331b659eb767e8ae19f1ae2adb0ec… --- diff --git a/src/modules/presence_xml/add_events.h b/src/modules/presence_xml/add_events.h index a4acc8dd75..c15c75c368 100644 --- a/src/modules/presence_xml/add_events.h +++ b/src/modules/presence_xml/add_events.h @@ -13,15 +13,15 @@ * 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 * */ /*! * \file - * \brief Kamailio Presence_XML :: Several event packages, presence, presence.winfo, dialog;sla + * \brief Kamailio Presence_XML :: Several event packages, presence, presence.winfo, dialog;sla * \ingroup presence_xml */ diff --git a/src/modules/presence_xml/api.h b/src/modules/presence_xml/api.h index 73ed2c12d0..36a907f1cd 100644 --- a/src/modules/presence_xml/api.h +++ b/src/modules/presence_xml/api.h @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ + #ifndef PXML_API_H #define PXML_API_H #include "../../core/str.h" diff --git a/src/modules/presence_xml/pres_check.h b/src/modules/presence_xml/pres_check.h index 70d1e88128..40b9409076 100644 --- a/src/modules/presence_xml/pres_check.h +++ b/src/modules/presence_xml/pres_check.h @@ -13,12 +13,16 @@ * 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 */ +#ifndef _PRES_CHECK_H_ +#define _PRES_CHECK_H_ + + #include <stdio.h> #include "../../core/parser/msg_parser.h" #include "../presence/bind_presence.h" @@ -26,6 +30,7 @@ int presxml_check_basic(struct sip_msg* msg, str presentity_uri, str status); int presxml_check_activities(struct sip_msg* msg, str presentity_uri, str activity); -contains_event_t pres_contains_event; -pres_get_presentity_t pres_get_presentity; -pres_free_presentity_t pres_free_presentity; +extern contains_event_t pres_contains_event; +extern pres_get_presentity_t pres_get_presentity; +extern pres_free_presentity_t pres_free_presentity; +#endif diff --git a/src/modules/presence_xml/presence_xml.c b/src/modules/presence_xml/presence_xml.c index 228896c18a..3918903e96 100644 --- a/src/modules/presence_xml/presence_xml.c +++ b/src/modules/presence_xml/presence_xml.c @@ -78,6 +78,9 @@ add_event_t pres_add_event; update_watchers_t pres_update_watchers; pres_get_sphere_t pres_get_sphere; +contains_event_t pres_contains_event; +pres_get_presentity_t pres_get_presentity; +pres_free_presentity_t pres_free_presentity; /* Module parameter variables */ str xcap_table= str_init("xcap");

1 0

git:master:4f692b41: presence: clang format the code
by Daniel-Constantin Mierla 17 Jan '19

17 Jan '19

Module: kamailio Branch: master Commit: 4f692b418cc2f7a965b19264893c04d0ad87a197 URL: https://github.com/kamailio/kamailio/commit/4f692b418cc2f7a965b19264893c04d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-17T08:30:25+01:00 presence: clang format the code --- Modified: src/modules/presence/bind_presence.c Modified: src/modules/presence/bind_presence.h Modified: src/modules/presence/event_list.c Modified: src/modules/presence/event_list.h Modified: src/modules/presence/hash.c Modified: src/modules/presence/hash.h Modified: src/modules/presence/notify.c Modified: src/modules/presence/notify.h Modified: src/modules/presence/presence.c Modified: src/modules/presence/presence.h Modified: src/modules/presence/presence_dmq.c Modified: src/modules/presence/presence_dmq.h Modified: src/modules/presence/presentity.c Modified: src/modules/presence/presentity.h Modified: src/modules/presence/publish.c Modified: src/modules/presence/publish.h Modified: src/modules/presence/subscribe.c Modified: src/modules/presence/subscribe.h Modified: src/modules/presence/utils_func.c Modified: src/modules/presence/utils_func.h --- Diff: https://github.com/kamailio/kamailio/commit/4f692b418cc2f7a965b19264893c04d… Patch: https://github.com/kamailio/kamailio/commit/4f692b418cc2f7a965b19264893c04d…

1 0

Updating default kamailio.cfg to use rtpengine
by Daniel-Constantin Mierla 16 Jan '19

16 Jan '19

Hello, being discussed at events offline or during irc meetings couple of times, I want to open the discussion about updating the default configuration file to use rtpengine. So far I let rtpproxy because was packaged in many Linux distros, however, given the benefits of rtpengine in terms of performance as well as webrtc support, doubled by the fact that nowadays in the community it seems to be the primary choice of rtp relay, we should decide what to do. I see two options: 1) add a define to allow selection between rtpproxy and rtpengine 2) replace rtpproxy completely with rtpengine I would prefer 2) for simplicity of the configuration file, but the main question for the users community is how easy they find the deploying of rtpengine. Using Debian/Ubuntu should be trivial, there are packages for it, but I do not know about CentOS, Fedora, openSUSE or other Linux/BSD OSes people here are using it. Reply to sr-users if you have an opinion on this matter (I cc-ed sr-dev mainly to make aware the devs, but it is a matter of using kamailio). Of course, other suggestions are welcome as well. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - May 6-8, 2019 -- www.kamailioworld.com Kamailio Advanced Training - Mar 4-6, 2019 in Berlin; Mar 25-27, 2019, in Washington, DC, USA -- www.asipto.com

3 2

Kamailio v5.2.1 Released
by Daniel-Constantin Mierla 16 Jan '19

16 Jan '19

Hello, Kamailio SIP Server v5.2.1 stable release is out. This is a maintenance release of the latest stable branch, 5.2, that includes fixes since the release of v5.2.0. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.2.x. Deployments running previous v5.2.x versions are strongly recommended to be upgraded to v5.2.1. For more details about version 5.2.1 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2019/01/kamailio-v5-2-1-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - May 6-8, 2019 -- www.kamailioworld.com Kamailio Advanced Training - Mar 4-6, 2019 in Berlin; Mar 25-27, 2019, in Washington, DC, USA -- www.asipto.com

1 0

git:5.2:9477693d: ChangeLog: content updated for v5.2.1
by Daniel-Constantin Mierla 16 Jan '19

16 Jan '19

Module: kamailio Branch: 5.2 Commit: 9477693d82930040f042df3eb6d077875b8f0a57 URL: https://github.com/kamailio/kamailio/commit/9477693d82930040f042df3eb6d0778… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-16T11:27:33+01:00 ChangeLog: content updated for v5.2.1 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/9477693d82930040f042df3eb6d0778… Patch: https://github.com/kamailio/kamailio/commit/9477693d82930040f042df3eb6d0778…

1 0

git:5.2:c0d79767: Makefile.defs: version set to 5.2.1
by Daniel-Constantin Mierla 16 Jan '19

16 Jan '19

Module: kamailio Branch: 5.2 Commit: c0d7976703a74ca1e41ec4ab1bf90c59a6cbf5a0 URL: https://github.com/kamailio/kamailio/commit/c0d7976703a74ca1e41ec4ab1bf90c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-16T11:12:46+01:00 Makefile.defs: version set to 5.2.1 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/c0d7976703a74ca1e41ec4ab1bf90c5… Patch: https://github.com/kamailio/kamailio/commit/c0d7976703a74ca1e41ec4ab1bf90c5… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index eb29fdd08b..349e21cc2a 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 2 -SUBLEVEL = 0 +SUBLEVEL = 1 EXTRAVERSION = # memory manager switcher

1 0

git:5.2:85e5a8dc: pkg/debian: set version to 5.2.1 in deb spec files
by Daniel-Constantin Mierla 16 Jan '19

16 Jan '19

Module: kamailio Branch: 5.2 Commit: 85e5a8dcba7e45805f249e0d62bee8a3a5f52424 URL: https://github.com/kamailio/kamailio/commit/85e5a8dcba7e45805f249e0d62bee8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-16T11:10:27+01:00 pkg/debian: set version to 5.2.1 in deb spec files --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/85e5a8dcba7e45805f249e0d62bee8a… Patch: https://github.com/kamailio/kamailio/commit/85e5a8dcba7e45805f249e0d62bee8a…

1 0

git:5.2:da84d4d3: pkg: version set to 5.2.1 for alpine and rpm specs
by Daniel-Constantin Mierla 16 Jan '19

16 Jan '19

Module: kamailio Branch: 5.2 Commit: da84d4d3adaf9c719702a4355ef619fc4ef93156 URL: https://github.com/kamailio/kamailio/commit/da84d4d3adaf9c719702a4355ef619f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-16T09:25:27+01:00 pkg: version set to 5.2.1 for alpine and rpm specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/oracle/el6/kamailio.spec Modified: pkg/kamailio/oracle/el7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/da84d4d3adaf9c719702a4355ef619f… Patch: https://github.com/kamailio/kamailio/commit/da84d4d3adaf9c719702a4355ef619f… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 3baa81a628..af041b00e3 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.2.0 +pkgver=5.2.1 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index bd174fa0c6..31ea71c781 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.2.0 +%define ver 5.2.1 %define rel dev1.0%{dist} %if 0%{?fedora} == 27 diff --git a/pkg/kamailio/oracle/el6/kamailio.spec b/pkg/kamailio/oracle/el6/kamailio.spec index 2a3f38c7c8..4493d7368f 100644 --- a/pkg/kamailio/oracle/el6/kamailio.spec +++ b/pkg/kamailio/oracle/el6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.2.0 +%define ver 5.2.1 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/oracle/el7/kamailio.spec b/pkg/kamailio/oracle/el7/kamailio.spec index 2059efad99..aa6e6adc13 100644 --- a/pkg/kamailio/oracle/el7/kamailio.spec +++ b/pkg/kamailio/oracle/el7/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.2.0 +%define ver 5.2.1 %define rel 0 %define _sharedir %{_prefix}/share

1 0

Releasing Kamailio v5.2.1
by Daniel-Constantin Mierla 16 Jan '19

16 Jan '19

Hello, I am considering to release Kamailio v5.2.1 sometime next week, likely on Tuesday (Jan 15) or Wednesday (Jan 16). Should any of you be aware of issues not reported to the bug tracker, open a bug report as soon as possible to give it a chance for analysis and an eventual fix: - https://github.com/kamailio/kamailio/issues Days after it, I am planning to make new releases from branch 5.1 and 5.0 (it should be the last one from there to mark the end of official packaging). Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - May 6-8, 2019 -- www.kamailioworld.com Kamailio Advanced Training - Mar 4-6, 2019 in Berlin; Mar 25-27, 2019, in Washington, DC, USA -- www.asipto.com

1 2

[kamailio/kamailio] acc_json: Supporting multi_leg_info parameter (#1745)
by jklingenmeyer 15 Jan '19

15 Jan '19

### Description The recently-added **acc_json** module does not support the _multi_leg_info_ parameter from the main **acc** module. ### Expected behavior **acc_json** module could add the extra leg info attributes in the JSON data, as the **acc_radius** module already does. Behavior could be the same for the JSON module. -- 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/1745

3 6

[kamailio/kamailio] tcp: correct queued length checking (#1376)
by Dmitri Savolainen 15 Jan '19

15 Jan '19

#### 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 - [x] 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description I can’t get big responses via jsonrpcs with default tcp params. According to log response size ~3200k, kamailio send ~2500k of data and can’t add 700k to queue after. This patch should fix, if my understanding of “queued” value is right. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1376 -- Commit Summary -- * tcp: correct queued length checking -- File Changes -- M src/core/tcp_main.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1376.patch https://github.com/kamailio/kamailio/pull/1376.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/1376

2 11

git:master:38a696ff: doc/tutorials/tcp_tunning: note about network buffers size
by Daniel-Constantin Mierla 15 Jan '19

15 Jan '19

Module: kamailio Branch: master Commit: 38a696fff66f0a453e54c92c93e8c459a1b4e77d URL: https://github.com/kamailio/kamailio/commit/38a696fff66f0a453e54c92c93e8c45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-15T13:02:08+01:00 doc/tutorials/tcp_tunning: note about network buffers size - they may need tunning when dealing with large data --- Modified: doc/tutorials/tcp_tunning.txt --- Diff: https://github.com/kamailio/kamailio/commit/38a696fff66f0a453e54c92c93e8c45… Patch: https://github.com/kamailio/kamailio/commit/38a696fff66f0a453e54c92c93e8c45… --- diff --git a/doc/tutorials/tcp_tunning.txt b/doc/tutorials/tcp_tunning.txt index 39097d57b7..aca6a12449 100644 --- a/doc/tutorials/tcp_tunning.txt +++ b/doc/tutorials/tcp_tunning.txt @@ -19,22 +19,22 @@ For now it deals only with Linux specific optimizations. net.core.somaxconn - limit of the listen() backlog, default 128 net.ipv4.tcp_max_syn_backlog - default 1024 or 128 -net.ipv4.tcp_timestamps - default on., should be on (along with +net.ipv4.tcp_timestamps - default on., should be on (along with tcp_tw_recycle and timestamp supporting peers allows for fast connections rates) -1.2 connection in close_wait +1.2 Connection in close_wait - Connection should stay as little as possible - in close_wait to quickly free the fd/resources for new connections attempts - WARNING: this could break normal TCP use, use it only if you know what you are + Connection should stay as little as possible + in close_wait to quickly free the fd/resources for new connections attempts + WARNING: this could break normal TCP use, use it only if you know what you are doing - + net.ipv4.tcp_max_tw_buckets - maximum number of timewait sockets (the default seems to be ok) net.ipv4.tcp_tw_recycle - enables fast time wait sockets recycling (default off), should be enabled if you have lots of short - lived connections + lived connections WARNING: see the above warning net.ipv4.tcp_tw_reuse - allows reusing of time-wait sockets (default off) WARNING: see above @@ -49,10 +49,26 @@ net.ipv4.ip_local_port_range - should be increased (e.g. 4096-65534) 1.4 Open file descriptors fs.file-max - maximum number of fds that will be allocated - (you probably need to increase it, default + (you probably need to increase it, default depends on installed memory) -1.5 other sysctl that might affect tcp connection rate or the maximum number +1.5 Buffers size + + When dealing with large data, check the values for network sockets buffers + to be sufficient, among them: + +net.core.rmem_max +net.core.wmem_max +net.core.rmem_default +net.core.wmem_default +net.ipv4.tcp_mem +net.ipv4.tcp_rmem +net.ipv4.tcp_wmem + + Note: sysctl -w net.ipv4.route.flush=1 - enusre that immediatly subsequent + connections use the values + +1.6 Other sysctl that might affect tcp connection rate or the maximum number of open connections fs.epoll.max_user_instances - maximum number of devices - per user (2.6.27.8+)

1 0

[kamailio/kamailio] coredump when used append_body_part (#1631)
by sergey-safarov 15 Jan '19

15 Jan '19

### Description I want convert `application/sdp` body of INVITE message to `multipart/mixed`. For this used [contruction](https://kamailio.org/docs/modules/devel/modules/textops.html#t… ``` set_body_multipart("test", "text/plain", "delimiter"); msg_apply_changes(); $var(b) = "7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c" append_body_part("$var(b)", "application/vnd.cirpack.isdn-ext", "signal;handling=required"); ``` For some reason `msg_apply_changes` is not applied and then `append_body_part` causes coredump. ### Troubleshooting #### Reproduction On alpine dist or on docker contained `kamailio/kamailio-ci` need add load [kazoo config](https://github.com/2600hz/kazoo-configs-kamailio) and apply this patch ``` diff --git a/kamailio/default.cfg b/kamailio/default.cfg index bc4a084..4b85642 100644 --- a/kamailio/default.cfg +++ b/kamailio/default.cfg @@ -334,6 +334,13 @@ route route(AUTHORIZATION_CHECK); #!endif + if (is_method("INVITE") && isflagset(FLAG_INTERNALLY_SOURCED)) { + set_body_multipart(); + msg_apply_changes(); + $var(b) = "7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c"; + append_body_part("$var(b)", "application/vnd.cirpack.isdn-ext", "signal;handling=required"); + } + route(HANDLE_MESSAGE_WRAPPER); #!ifdef PRESENCE_ROLE ``` Then make call to other phone. #### Debugging Data ``` (gdb) bt #0 0x00007f1235f96f1b in __syscall4 (a4=<optimized out>, a3=<optimized out>, a2=<optimized out>, a1=<optimized out>, n=<optimized out>) at ./arch/x86_64/syscall_arch.h:38 #1 __restore_sigs (set=set@entry=0x7ffc151162d0) at src/signal/block.c:43 #2 0x00007f1235f97035 in raise (sig=sig@entry=6) at src/signal/raise.c:13 #3 0x00007f1235f6efb4 in abort () at src/exit/abort.c:9 #4 0x00005598707495a2 in free_lump (lmp=0x7f1235e76478) at core/data_lump.c:464 #5 0x000055987074965d in free_lump_list (l=l@entry=0x7f1235e763d8) at core/data_lump.c:498 #6 0x000055987074983a in del_nonshm_lump (lump_list=lump_list@entry=0x7f1235e737b8) at core/data_lump.c:647 #7 0x0000559870785c43 in replace_body (msg=msg@entry=0x7f1235e73208, txt=...) at core/msg_translator.c:1667 #8 0x000055987078d205 in check_boundaries (msg=msg@entry=0x7f1235e73208, send_info=send_info@entry=0x7f12322d6df8) at core/msg_translator.c:1874 #9 0x000055987078d5d3 in build_req_buf_from_sip_req (msg=msg@entry=0x7f1235e73208, returned_len=returned_len@entry=0x7ffc151166fc, send_info=0x7f12322d6df8, mode=mode@entry=128) at core/msg_translator.c:1979 #10 0x00007f123602a1ec in prepare_new_uac (t=t@entry=0x7f12322d6b90, i_req=i_req@entry=0x7f1235e73208, branch=branch@entry=0, uri=<optimized out>, uri@entry=0x7f1235e73480, path=<optimized out>, next_hop=<optimized out>, fsocket=0x7f1235e5ba50, snd_flags=..., fproto=0, flags=0, instance=<optimized out>, ruid=<optimized out>, location_ua=<optimized out>) at t_fwd.c:474 #11 0x00007f123602b665 in add_uac (t=t@entry=0x7f12322d6b90, request=request@entry=0x7f1235e73208, uri=0x7f1235e73480, next_hop=<optimized out>, path=<optimized out>, proxy=proxy@entry=0x0, fsocket=0x7f1235e5ba50, snd_flags=..., proto=0, flags=0, instance=0x7f1235e73850, ruid=0x7f1235e73868, location_ua=0x7f1235e73878) at t_fwd.c:800 #12 0x00007f12360307b8 in t_forward_nonack (t=0x7f12322d6b90, p_msg=p_msg@entry=0x7f1235e73208, proxy=proxy@entry=0x0, proto=proto@entry=0) at t_fwd.c:1680 #13 0x00007f123603ee65 in t_relay_to (p_msg=0x7f1235e73208, proxy=0x0, proto=0, replicate=0) at t_funcs.c:331 #14 0x000055987076fbb8 in do_action (h=h@entry=0x7ffc15118360, a=a@entry=0x7f1235bbf528, msg=msg@entry=0x7f1235e73208) at core/action.c:1073 #15 0x000055987076ac5d in run_actions (h=h@entry=0x7ffc15118360, a=0x7f1235bb1c28, msg=msg@entry=0x7f1235e73208) at core/action.c:1565 #16 0x000055987076dbb3 in do_action (h=h@entry=0x7ffc15118360, a=a@entry=0x7f1235bad570, msg=msg@entry=0x7f1235e73208) at core/action.c:691 #17 0x000055987076ac5d in run_actions (h=h@entry=0x7ffc15118360, a=0x7f1235bad570, msg=msg@entry=0x7f1235e73208) at core/action.c:1565 #18 0x000055987076fb99 in do_action (h=h@entry=0x7ffc15118360, a=a@entry=0x7f1235baf5c8, msg=msg@entry=0x7f1235e73208) at core/action.c:1062 #19 0x000055987076ac5d in run_actions (h=h@entry=0x7ffc15118360, a=0x7f1235bac9d0, msg=msg@entry=0x7f1235e73208) at core/action.c:1565 #20 0x000055987076dbb3 in do_action (h=h@entry=0x7ffc15118360, a=a@entry=0x7f1235b71db8, msg=msg@entry=0x7f1235e73208) at core/action.c:691 #21 0x000055987076ac5d in run_actions (h=h@entry=0x7ffc15118360, a=a@entry=0x7f1235b69540, msg=msg@entry=0x7f1235e73208) at core/action.c:1565 #22 0x0000559870775dc7 in run_top_route (a=0x7f1235b69540, msg=msg@entry=0x7f1235e73208, c=c@entry=0x0) at core/action.c:1654 #23 0x00005598707660c1 in receive_msg ( buf=buf@entry=0x559870a51640 <buf> "INVITE sip:safarov2@node1.nga911.com SIP/2.0\r\nVia: SIP/2.0/UDP 10.0.9.35:11000;rport;branch=z9hG4bK69ag32Nr5gFjH\r\nRoute: <sip:10.0.9.39:5060>\r\nMax-Forwards: 48\r\nFrom: \"Sergey Safarov\" <sip:1240@node1."..., len=<optimized out>, rcv_info=rcv_info@entry=0x7ffc151186c0) at core/receive.c:278 #24 0x00005598708131fb in udp_rcv_loop () at core/udp_server.c:554 #25 0x0000559870744fb6 in main_loop () at main.c:1619 #26 0x000055987073d51f in main (argc=<optimized out>, argv=<optimized out>) at main.c:2638 ``` Full backtrace at [bt_full.txt](https://github.com/kamailio/kamailio/files/2342768/bt_full.txt) #### Log Messages Please look [kamailio_console.txt](https://github.com/kamailio/kamailio/files/2342769/ka… #### SIP Traffic Crash when started modification of packet 73 of pcap file [sip.pcap.gz](https://github.com/kamailio/kamailio/files/2342770/sip.pcap.gz) ### Possible Solutions Not known ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` / # kamailio -v version: kamailio 5.1.5 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, 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_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 16:32:28 Sep 1 2018 with gcc 6.4.0 ``` * **Operating System**: ``` / # cat /etc/os-release NAME="Alpine Linux" ID=alpine VERSION_ID=3.8.0 PRETTY_NAME="Alpine Linux v3.8" HOME_URL="http://alpinelinux.org" BUG_REPORT_URL="http://bugs.alpinelinux.org" ``` -- 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/1631

2 12

[kamailio/kamailio] presence_xml db_url param can not set (#1809)
by Cui Gang 15 Jan '19

15 Jan '19

### Description I'm testing the presence feature, on branch 5.2 last version 1e56e4d . modparam("presence_xml", "db_url", DBURL) Can not set db_url of the presence_xml correct value. presence_xml db_url always the default value(DEFAULT_DB_URL). The same way, presence db_url is right. #### Debugging Data presence.cfg file: ``` debug=3 #!define DBURL "mysql://kamailio:kamailiorw@localhost/kamailio52" /* set paths to location of modules */ mpath="/usr/local/kamailio/lib64/kamailio/modules/" loadmodule "db_mysql.so" loadmodule "tm.so" loadmodule "sl.so" loadmodule "presence.so" loadmodule "presence_xml.so" modparam("presence", "db_url", DBURL) modparam("presence_xml", "db_url", DBURL) modparam("presence_xml", "integrated_xcap_server", 1) request_route { exit; } ``` #### Log Messages ``` 0(76822) DEBUG: <core> [core/sr_module.c:896]: init_mod(): presence 0(76822) DEBUG: presence [presence.c:282]: mod_init(): db_url=mysql://kamailio:kamailiorw@localhost/kamailio52/48/0x102b9e860 .... 0(76822) DEBUG: <core> [core/sr_module.c:896]: init_mod(): presence_xml 0(76822) DEBUG: presence_xml [presence_xml.c:159]: mod_init(): db_url=mysql://kamailio:kamailiorw@localhost/kamailio/46/0x103cf2d64 ... 0(76822) DEBUG: presence_xml [add_events.c:139]: xml_add_events(): added 'xcap-diff' event to presence module 0(76822) DEBUG: <core> [core/sr_module.c:619]: find_mod_export_record(): found export of <db_bind_api> in module db_mysql [/usr/local/kamailio/lib64/kamailio/modules/db_mysql.so] 0(76822) DEBUG: <core> [db.c:210]: db_bind_mod(): using db bind api for db_mysql 0(76822) DEBUG: <core> [db.c:315]: db_do_init2(): connection 0x102bac2e8 not found in pool 0(76822) DEBUG: db_mysql [km_my_con.c:108]: db_mysql_new_connection(): opening connection: mysql://xxxx:xxxx@localhost/kamailio 0(76822) ERROR: db_mysql [km_my_con.c:139]: db_mysql_new_connection(): driver error: Unknown database 'kamailio' 0(76822) ERROR: <core> [db.c:319]: db_do_init2(): could not add connection to the pool 0(76822) ERROR: presence_xml [presence_xml.c:214]: mod_init(): while connecting to database 0(76822) ERROR: <core> [core/sr_module.c:899]: init_mod(): Error while initializing module presence_xml (/usr/local/kamailio/lib64/kamailio/modules/presence_xml.so) ERROR: error while initializing modules ``` The correct db_url is #!define DBURL "mysql://kamailio:kamailiorw@localhost/kamailio52" I don't know why presence_xml db_url always the default value in the source code DEFAULT_DB_URL. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.0 (x86_64/darwin) 1e56e4 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, 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_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, select, kqueue. id: 1e56e4 compiled on 23:15:49 Jan 12 2019 with gcc Configured with: --prefix=/Applications/Xcode.app/Contents/Developer/usr --with-gxx-include-dir=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/usr/include/c++/4.2.1 Apple LLVM version 10.0.0 (clang-1000.11.45.5) Target: x86_64-apple-darwin18.2.0 Thread model: posix InstalledDir: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin ``` * **Operating System**: ``` MacOS ``` -- 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/1809

2 4

[kamailio/kamailio] TSILO crashes kamailio on ts_store() (#1775)
by ForGuru 14 Jan '19

14 Jan '19

I am getting following error when ts_store() is called Dec 21 12:50:57 ejabberd /usr/local/kamailio-5.1/sbin/kamailio[25676]: {1 2 INVITE 2d24732c962aa49859622eb9d214a115(a)192.168.2.7} DEBUG: tsilo [ts_store.c:80]: ts_store(): storing transaction 5967:208972607 for r-uri: Dec 21 12:50:57 ejabberd /usr/local/kamailio-5.1/sbin/kamailio[25696]: DEBUG: <core> [core/tcp_main.c:3279]: handle_tcp_child(): dead tcp child 2 (pid 25676, no 19) (shutting down?) Dec 21 12:50:57 ejabberd /usr/local/kamailio-5.1/sbin/kamailio[25696]: DEBUG: <core> [core/io_wait.h:602]: io_watch_del(): DBG: io_watch_del (0xa6cf40, 37, -1, 0x0) fd_no=37 called Dec 21 12:50:57 ejabberd /usr/local/kamailio-5.1/sbin/kamailio[25696]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 34 Dec 21 12:50:57 ejabberd /usr/local/kamailio-5.1/sbin/kamailio[25696]: DEBUG: <core> [core/tcp_main.c:3512]: handle_ser_child(): dead child 19, pid 25676 (shutting down?)  ``` if (lookup("location")) { xlog("L_INFO","PUSHASYNC: for new transaction [$T(id_index):$T(id_label)] $fU => $rU \n"); if(t_newtran()) { xlog("L_INFO","PUSHASYNC: storing transaction [$T(id_index):$T(id_label)] fU=[$fU] => rU=[$rU] ru=[$ru] \n"); ts_store(); xlog("L_INFO","PUSHASYNC: stored transaction [$T(id_index):$T(id_label)] [$fU] => [$rU]\n"); } $sht(vtp=>stored::$rU) = 1; return; } ``` ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- 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/1775

4 9

git:5.2:82d9703e: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 14 Jan '19

14 Jan '19

Module: kamailio Branch: 5.2 Commit: 82d9703e619f765efcda8f37e45bfcfe4b22607e URL: https://github.com/kamailio/kamailio/commit/82d9703e619f765efcda8f37e45bfcf… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-14T12:46:35+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/dialog/README Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/82d9703e619f765efcda8f37e45bfcf… Patch: https://github.com/kamailio/kamailio/commit/82d9703e619f765efcda8f37e45bfcf… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index b1b63b8e30..05a1b531f8 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -426,9 +426,10 @@ Chapter 1. Admin Guide 2. How it works - To create the dialog associated with an initial request, the flag - “dlg_flag” (Section 6.4, “dlg_flag (integer)”) must be set before - creating the corresponding transaction. + To create the dialog associated with an initial INVITE request, execute + the function “dlg_manage()” or set the flag specified by parameter + “dlg_flag” (Section 6.4, “dlg_flag (integer)”) before creating the + corresponding transaction. The dialog is automatically destroyed when a “BYE” is received. In case of no “BYE”, the dialog lifetime is controlled via the default timeout @@ -611,6 +612,10 @@ modparam("dialog", "rr_param", "xyz") Flag to be used for marking if a dialog should be constructed for the current request (this make sense only for initial requests). + Note: it is not needed to set this parameter and its corresponding flag + for initial request in case the “dlg_manage()” function is used. In + other words, using “dlg_manage()” alone is enough. + Default value is “none”. Example 1.4. Set dlg_flag parameter diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 53a464d8ff..c788e393c8 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -697,10 +697,15 @@ Note Controls what gateways are tested to see if they are reachable. * Value 0: If set to 0, only the gateways with state PROBING are tested. After a gateway is probed, the PROBING state is cleared in - this mode. + this mode. This means that no probing will be executed at all only + if flag in config file is set to 8/PROBING (please check + destination list file syntaxis for more details), it will probe + only one time at startup or after dispatcher reload. * Value 1: If set to 1, all gateways are tested. If set to 1 and there is a failure of keepalive to an active gateway, then it is - set to TRYING state. + set to TRYING state. This means that probing will be executed all + the time, but you can skip some servers with flag 4 in destination + list file, for example. * Value 2: if set to 2, only gateways in inactive state with probing mode set are tested. * Value 3: If set to 3, any gateway with state PROBING is continually @@ -1388,6 +1393,21 @@ kamcmd dispatcher.set_state ip 3 all Example: kamcmd dispatcher.list + ... +DEST: { + URI: sip:192.168.0.1:5060 + FLAGS: AP + PRIORITY: 12 +} + ... + + FLAGS consist out of 2 letters. First letter describe status of + destination: A-active, I â inactive, T â trying, D â disabled. + Second letter might be P or X. P is for probing, so AP means + destination is active and it is tested by SIP options continuously. X + means that there are no probing or sip pinging. So AX means that + destination is assumed as active and it is not tested by SIP options. + DX respectively is disabled destination that is not tested, etc. 5.3. dispatcher.reload

1 0

git:5.2:1bebb9f8: presence_xml: do not include ../presence/presence.h
by Daniel-Constantin Mierla 14 Jan '19

14 Jan '19

Module: kamailio Branch: 5.2 Commit: 1bebb9f8a4cb33f8ef9a4e95ad28e80d74b545b6 URL: https://github.com/kamailio/kamailio/commit/1bebb9f8a4cb33f8ef9a4e95ad28e80… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-14T12:30:30+01:00 presence_xml: do not include ../presence/presence.h - it is not needed, that header file is related to modparams of presence module - renamed db_url to presxml_db_url just to avoid possible conflict in the future like for GH #1809 (cherry picked from commit f0e0a849f5dfe5dae0cd0e755b9739cbc7fa8200) --- Modified: src/modules/presence_xml/presence_xml.c Modified: src/modules/presence_xml/presence_xml.h --- Diff: https://github.com/kamailio/kamailio/commit/1bebb9f8a4cb33f8ef9a4e95ad28e80… Patch: https://github.com/kamailio/kamailio/commit/1bebb9f8a4cb33f8ef9a4e95ad28e80… --- diff --git a/src/modules/presence_xml/presence_xml.c b/src/modules/presence_xml/presence_xml.c index 183d0a6626..10e34293bd 100644 --- a/src/modules/presence_xml/presence_xml.c +++ b/src/modules/presence_xml/presence_xml.c @@ -81,7 +81,7 @@ pres_get_sphere_t pres_get_sphere; /* Module parameter variables */ str xcap_table= str_init("xcap"); -str db_url = str_init(DEFAULT_DB_URL); +static str presxml_db_url = str_init(DEFAULT_DB_URL); int force_active= 0; int force_dummy_presence = 0; int integrated_xcap_server= 0; @@ -115,7 +115,7 @@ static cmd_export_t cmds[]={ }; static param_export_t params[]={ - { "db_url", PARAM_STR, &db_url}, + { "db_url", PARAM_STR, &presxml_db_url}, { "xcap_table", PARAM_STR, &xcap_table}, { "force_active", INT_PARAM, &force_active }, { "integrated_xcap_server", INT_PARAM, &integrated_xcap_server}, @@ -156,7 +156,8 @@ static int mod_init(void) if(passive_mode==1) return 0; - LM_DBG("db_url=%s/%d/%p\n",ZSW(db_url.s),db_url.len, db_url.s); + LM_DBG("db_url=%s (len=%d addr=%p)\n", ZSW(presxml_db_url.s), + presxml_db_url.len, presxml_db_url.s); /* bind the SL API */ if (sl_load_api(&slb)!=0) { @@ -196,7 +197,7 @@ static int mod_init(void) if(force_active== 0) { /* binding to mysql module */ - if (db_bind_mod(&db_url, &pxml_dbf)) + if (db_bind_mod(&presxml_db_url, &pxml_dbf)) { LM_ERR("Database module not found\n"); return -1; @@ -208,7 +209,7 @@ static int mod_init(void) return -1; } - pxml_db = pxml_dbf.init(&db_url); + pxml_db = pxml_dbf.init(&presxml_db_url); if (!pxml_db) { LM_ERR("while connecting to database\n"); @@ -279,7 +280,7 @@ static int child_init(int rank) { if(pxml_db) return 0; - pxml_db = pxml_dbf.init(&db_url); + pxml_db = pxml_dbf.init(&presxml_db_url); if (pxml_db== NULL) { LM_ERR("while connecting database\n"); diff --git a/src/modules/presence_xml/presence_xml.h b/src/modules/presence_xml/presence_xml.h index 7b523ef028..e165852684 100644 --- a/src/modules/presence_xml/presence_xml.h +++ b/src/modules/presence_xml/presence_xml.h @@ -35,7 +35,6 @@ #include "../../lib/srdb1/db.h" #include "../../modules/sl/sl.h" #include "../presence/event_list.h" -#include "../presence/presence.h" #include "../presence/presentity.h" #include "../xcap_client/xcap_functions.h"

1 0

git:5.2:df148278: presence_xml: Makefile - link agaist libicu on macos/darwin
by Daniel-Constantin Mierla 14 Jan '19

14 Jan '19

Module: kamailio Branch: 5.2 Commit: df1482789cdbcfb7d32e08ba908e185f53cc48ac URL: https://github.com/kamailio/kamailio/commit/df1482789cdbcfb7d32e08ba908e185… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-14T12:30:06+01:00 presence_xml: Makefile - link agaist libicu on macos/darwin - libxml2 needs it but its pkg-config doesn't list it (cherry picked from commit 869f57aac4496e10480094c36373f485aef11a80) --- Modified: src/modules/presence_xml/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/df1482789cdbcfb7d32e08ba908e185… Patch: https://github.com/kamailio/kamailio/commit/df1482789cdbcfb7d32e08ba908e185… --- diff --git a/src/modules/presence_xml/Makefile b/src/modules/presence_xml/Makefile index 08711cdfa9..f6a1dd4d63 100644 --- a/src/modules/presence_xml/Makefile +++ b/src/modules/presence_xml/Makefile @@ -8,6 +8,12 @@ LIBS= ifeq ($(CROSS_COMPILE),) XML2CFG=$(shell which xml2-config) +ifeq ($(OS), darwin) +ICU_BUILDER = $(shell \ + if pkg-config --exists icu-uc; then \ + echo 'pkg-config icu-uc'; \ + fi) +endif endif ifneq ($(XML2CFG),) @@ -19,6 +25,11 @@ else LIBS+=-L$(LOCALBASE)/lib -lxml2 endif +ifneq ($(ICU_BUILDER),) + DEFS += $(shell $(ICU_BUILDER) --cflags ) + LIBS += $(shell $(ICU_BUILDER) --libs) +endif + SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 include ../../Makefile.modules

1 0

git:5.2:57017b10: presence: do not include presence.h in other header files
by Daniel-Constantin Mierla 14 Jan '19

14 Jan '19

Module: kamailio Branch: 5.2 Commit: 57017b10d9a50385368324beb7eef9044d0b124a URL: https://github.com/kamailio/kamailio/commit/57017b10d9a50385368324beb7eef90… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-14T12:30:18+01:00 presence: do not include presence.h in other header files - it exports as extern the module parameter variables and other modules built on top of presence can end up including this header file, overwriting declaration of variables with same name - renamed db_url to pres_db_url, this being a common variable name, to avoid same situation with a mistaken include in the future - GH #1809 (cherry picked from commit eb1bf9a69abad3d237c136750fe8cacea4cd0a31) --- Modified: src/modules/presence/hash.h Modified: src/modules/presence/presence.c Modified: src/modules/presence/presence.h Modified: src/modules/presence/presence_dmq.c Modified: src/modules/presence/presence_dmq.h Modified: src/modules/presence/presentity.h Modified: src/modules/presence/subscribe.h --- Diff: https://github.com/kamailio/kamailio/commit/57017b10d9a50385368324beb7eef90… Patch: https://github.com/kamailio/kamailio/commit/57017b10d9a50385368324beb7eef90…

1 0

git:5.2:e61ad10e: dispatcher: docs - typo and indentation for the rpc flags paragraph
by Daniel-Constantin Mierla 14 Jan '19

14 Jan '19

Module: kamailio Branch: 5.2 Commit: e61ad10e62d427bd0a22e5621f798015630a1e3f URL: https://github.com/kamailio/kamailio/commit/e61ad10e62d427bd0a22e5621f79801… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-14T12:29:19+01:00 dispatcher: docs - typo and indentation for the rpc flags paragraph (cherry picked from commit 14b4d23a06fdc9b9f6b17781c50902beaff0cd94) --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e61ad10e62d427bd0a22e5621f79801… Patch: https://github.com/kamailio/kamailio/commit/e61ad10e62d427bd0a22e5621f79801… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index c0a55b27ad..6092349cf7 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1713,13 +1713,15 @@ DEST: { } ... </programlisting> -<para>FLAGS consist out of 2 letters. First letter describe status of destination: A-active, - I – inactive, T – trying, D – disabled. Second letter might be P or X. P is for probing, - so AP means destination is active and it is tested by SIP options continuously. - X means that there are no probing or sip pinging. So AX means that destination is assumed as active - and it is not tested by SIP options. DX respectively is disabled destination what is not tested and etc. -</para> - </section> + <para>FLAGS consist out of 2 letters. First letter describe status of + destination: A-active, I – inactive, T – trying, D – disabled. Second + letter might be P or X. P is for probing, so AP means destination + is active and it is tested by SIP options continuously. X means that + there are no probing or sip pinging. So AX means that destination is + assumed as active and it is not tested by SIP options. DX + respectively is disabled destination that is not tested, etc. + </para> + </section> <section id="dispatcher.r.reload"> <title> <function moreinfo="none">dispatcher.reload</function>

1 0

git:5.2:ff5d8bf7: presence: Makefile - link agaist libicu on macos/darwin
by Daniel-Constantin Mierla 14 Jan '19

14 Jan '19

Module: kamailio Branch: 5.2 Commit: ff5d8bf7e0692d50a104e0ebcb7690ba236ff343 URL: https://github.com/kamailio/kamailio/commit/ff5d8bf7e0692d50a104e0ebcb7690b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-14T12:29:55+01:00 presence: Makefile - link agaist libicu on macos/darwin - libxml2 needs it but its pkg-config doesn't list it (cherry picked from commit d3208e1859051eb09013f855126f7f5f5ec47ab8) --- Modified: src/modules/presence/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/ff5d8bf7e0692d50a104e0ebcb7690b… Patch: https://github.com/kamailio/kamailio/commit/ff5d8bf7e0692d50a104e0ebcb7690b… --- diff --git a/src/modules/presence/Makefile b/src/modules/presence/Makefile index 6891a79d39..bd1bcebc75 100644 --- a/src/modules/presence/Makefile +++ b/src/modules/presence/Makefile @@ -7,6 +7,12 @@ NAME=presence.so ifeq ($(CROSS_COMPILE),) XML2CFG=$(shell which xml2-config) +ifeq ($(OS), darwin) +ICU_BUILDER = $(shell \ + if pkg-config --exists icu-uc; then \ + echo 'pkg-config icu-uc'; \ + fi) +endif endif ifneq ($(XML2CFG),) @@ -18,6 +24,11 @@ else LIBS+=-L$(LOCALBASE)/lib -lxml2 endif +ifneq ($(ICU_BUILDER),) + DEFS += $(shell $(ICU_BUILDER) --cflags ) + LIBS += $(shell $(ICU_BUILDER) --libs) +endif + SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 SER_LIBS+=$(SERLIBPATH)/srutils/srutils

1 0

git:5.2:458abbe5: dispatcher: update for module docs (#1804)
by Daniel-Constantin Mierla 14 Jan '19

14 Jan '19

Module: kamailio Branch: 5.2 Commit: 458abbe5b5d8fbcb814612af3cac90aa784db227 URL: https://github.com/kamailio/kamailio/commit/458abbe5b5d8fbcb814612af3cac90a… Author: Jurijs I <jurijs.ivolga(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-14T12:29:03+01:00 dispatcher: update for module docs (#1804) - update for module docs (#1804) - Some minor comments for dispatcher module were added - Additionally a description were added, what the several states means when dispatcher list are executed (cherry picked from commit 14a87383fbae102b430ed6cfdba2559f1768cdd0) --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/458abbe5b5d8fbcb814612af3cac90a… Patch: https://github.com/kamailio/kamailio/commit/458abbe5b5d8fbcb814612af3cac90a… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 3b40c04622..c0a55b27ad 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -631,12 +631,16 @@ modparam("dispatcher", "force_dst", 1) <itemizedlist> <listitem> <para>Value 0: If set to 0, only the gateways with state PROBING are tested. - After a gateway is probed, the PROBING state is cleared in this mode.</para> + After a gateway is probed, the PROBING state is cleared in this mode. + This means that no probing will be executed at all only if flag in config file is set to 8/PROBING + (please check destination list file syntaxis for more details), it will probe only one time at startup or + after dispatcher reload.</para> </listitem> <listitem> <para>Value 1: If set to 1, all gateways are tested. If set to 1 and there is a failure of keepalive to an active gateway, then it is - set to TRYING state.</para> + set to TRYING state. This means that probing will be executed all the time, + but you can skip some servers with flag 4 in destination list file, for example.</para> </listitem> <listitem> <para>Value 2: if set to 2, only gateways in inactive state with @@ -1701,8 +1705,21 @@ onreply_route { </para> <programlisting format="linespecific"> &sercmd; dispatcher.list - </programlisting> - </section> + ... +DEST: { + URI: sip:192.168.0.1:5060 + FLAGS: AP + PRIORITY: 12 +} + ... +</programlisting> +<para>FLAGS consist out of 2 letters. First letter describe status of destination: A-active, + I – inactive, T – trying, D – disabled. Second letter might be P or X. P is for probing, + so AP means destination is active and it is tested by SIP options continuously. + X means that there are no probing or sip pinging. So AX means that destination is assumed as active + and it is not tested by SIP options. DX respectively is disabled destination what is not tested and etc. +</para> + </section> <section id="dispatcher.r.reload"> <title> <function moreinfo="none">dispatcher.reload</function>

1 0

git:5.2:563f1d6a: dialog: do not require dlg_flag parameter to be set
by Daniel-Constantin Mierla 14 Jan '19

14 Jan '19

Module: kamailio Branch: 5.2 Commit: 563f1d6af3123485ed25cc58bb3badd68e7793a4 URL: https://github.com/kamailio/kamailio/commit/563f1d6af3123485ed25cc58bb3badd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-14T12:27:56+01:00 dialog: do not require dlg_flag parameter to be set - using dlg_manage() should be enough for tracking dialogs (cherry picked from commit 404f403786478a917637186446bb285e8e32cc59) --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/563f1d6af3123485ed25cc58bb3badd… Patch: https://github.com/kamailio/kamailio/commit/563f1d6af3123485ed25cc58bb3badd… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index bf2ba96488..6665398742 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -515,8 +515,8 @@ static int mod_init(void) return -1; /* param checkings */ - if (dlg_flag>MAX_FLAG) { - LM_ERR("invalid dlg flag %d!!\n",dlg_flag); + if (dlg_flag!=-1 && dlg_flag>MAX_FLAG) { + LM_ERR("invalid dlg flag %d!!\n", dlg_flag); return -1; } diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 96406bde35..c80ca7d59f 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -761,8 +761,10 @@ void dlg_onreq(struct cell* t, int type, struct tmcb_params *param) } } if (dlg==NULL) { - if((req->flags&dlg_flag_mask)!=dlg_flag_mask) + if((dlg_flag_mask==0) || (req->flags&dlg_flag_mask)!=dlg_flag_mask) { + LM_DBG("flag not set for creating a new dialog\n"); return; + } LM_DBG("dialog creation on config flag\n"); dlg_new_dialog(req, t, 1); dlg = dlg_get_ctx_dialog();

1 0

git:5.2:23a5c07e: tsilo: add check for empty aor
by Daniel-Constantin Mierla 14 Jan '19

14 Jan '19

Module: kamailio Branch: 5.2 Commit: 23a5c07e924a2feb5f09b727f4ad0faf6c5af349 URL: https://github.com/kamailio/kamailio/commit/23a5c07e924a2feb5f09b727f4ad0fa… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-14T12:28:25+01:00 tsilo: add check for empty aor Fix: #1775 (cherry picked from commit 5a5d742eb459249995114eb6a3642f99c6770496) --- Modified: src/modules/tsilo/ts_store.c --- Diff: https://github.com/kamailio/kamailio/commit/23a5c07e924a2feb5f09b727f4ad0fa… Patch: https://github.com/kamailio/kamailio/commit/23a5c07e924a2feb5f09b727f4ad0fa… --- diff --git a/src/modules/tsilo/ts_store.c b/src/modules/tsilo/ts_store.c index a33924fa50..6d1c5a5f72 100644 --- a/src/modules/tsilo/ts_store.c +++ b/src/modules/tsilo/ts_store.c @@ -71,6 +71,11 @@ int ts_store(struct sip_msg* msg, str *puri) { else aor = ruri.user; + if(aor.s==NULL) { + LM_ERR("malformed aor from uri[%.*s]\n", suri.len, suri.s); + return -1; + } + t = _tmb.t_gett(); if (!t || t==T_UNDEFINED) { LM_ERR("no transaction defined for %.*s\n", aor.len, aor.s);

1 0

git:5.2:3dd154fa: dialog: docs - more info about using the flag and dlg_manage()
by Daniel-Constantin Mierla 14 Jan '19

14 Jan '19

Module: kamailio Branch: 5.2 Commit: 3dd154faeead29f54145843d14367c5b28a4fb7b URL: https://github.com/kamailio/kamailio/commit/3dd154faeead29f54145843d14367c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-14T12:27:35+01:00 dialog: docs - more info about using the flag and dlg_manage() (cherry picked from commit e4dfe3587943d69d556b15df3492cf38c3b21a5f) --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3dd154faeead29f54145843d14367c5… Patch: https://github.com/kamailio/kamailio/commit/3dd154faeead29f54145843d14367c5… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 2240a72c85..901c2b79c0 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -45,9 +45,10 @@ <section> <title>How it works</title> <para> - To create the dialog associated with an initial request, the flag - <quote>dlg_flag</quote> (<xref linkend="dialog.p.flag"/>) must be set before - creating the corresponding transaction. + To create the dialog associated with an initial INVITE request, execute + the function <quote>dlg_manage()</quote> or set the flag specified by + parameter <quote>dlg_flag</quote> (<xref linkend="dialog.p.flag"/>) + before creating the corresponding transaction. </para> <para> The dialog is automatically destroyed when a <quote>BYE</quote> is @@ -256,6 +257,12 @@ modparam("dialog", "rr_param", "xyz") current request (this make sense only for initial requests). </para> <para> + Note: it is not needed to set this parameter and its corresponding flag + for initial request in case the <quote>dlg_manage()</quote> function + is used. In other words, using <quote>dlg_manage()</quote> alone is + enough. + </para> + <para> <emphasis> Default value is <quote>none</quote>. </emphasis>

1 0

git:master:0a5cba42: kamctl: added 'psa' command
by Daniel-Constantin Mierla 14 Jan '19

14 Jan '19

Module: kamailio Branch: master Commit: 0a5cba422967f2e861ce209942a42e09719f4fcb URL: https://github.com/kamailio/kamailio/commit/0a5cba422967f2e861ce209942a42e0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-14T08:47:41+01:00 kamctl: added 'psa' command - print more attributes for running processes (extended 'ps') --- Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamctl.ctlbase --- Diff: https://github.com/kamailio/kamailio/commit/0a5cba422967f2e861ce209942a42e0… Patch: https://github.com/kamailio/kamailio/commit/0a5cba422967f2e861ce209942a42e0… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 4dd9bc7fed..b115f5a998 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -3010,6 +3010,11 @@ case $1 in ctl_cmd_run core.psx ;; + psa) + require_ctlengine + ctl_cmd_run core.psa + ;; + uptime) require_ctlengine ctl_cmd_run core.uptime diff --git a/utils/kamctl/kamctl.ctlbase b/utils/kamctl/kamctl.ctlbase index a668e22d18..1fc64091af 100644 --- a/utils/kamctl/kamctl.ctlbase +++ b/utils/kamctl/kamctl.ctlbase @@ -81,6 +81,12 @@ usage_ctlcommon() { echo cat <<EOF ps ................................. details about running processes +EOF + echo + mecho " -- command 'psa' - print all attributes about running processes" + echo +cat <<EOF + psa ................................ all attributes about running processes EOF echo mecho " -- command 'uptime' - print uptime details"

1 0

Regenerate module docs on github
by Julien Chavanton 13 Jan '19

13 Jan '19

Hi, not sure how to regenerate modules doc on the repo. Localy I can use make but it seems people are using a more standard procedure ? Acc_json is not updated with some improvement in the examples.

2 1

git:master:ee799504: modules: readme files regenerated - acc_json ... [skip ci]
by Kamailio Dev 13 Jan '19

13 Jan '19

Module: kamailio Branch: master Commit: ee799504ad5f7e272a9e61f1952099ca1183d461 URL: https://github.com/kamailio/kamailio/commit/ee799504ad5f7e272a9e61f1952099c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-13T16:46:28+01:00 modules: readme files regenerated - acc_json ... [skip ci] --- Modified: src/modules/acc_json/README --- Diff: https://github.com/kamailio/kamailio/commit/ee799504ad5f7e272a9e61f1952099c… Patch: https://github.com/kamailio/kamailio/commit/ee799504ad5f7e272a9e61f1952099c…

1 0

git:master:fb23d67b: acc_json: replaced angle brackets with xml tokens
by Daniel-Constantin Mierla 13 Jan '19

13 Jan '19

Module: kamailio Branch: master Commit: fb23d67b396bafb51f9c971e2546df0faff54262 URL: https://github.com/kamailio/kamailio/commit/fb23d67b396bafb51f9c971e2546df0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-13T16:45:23+01:00 acc_json: replaced angle brackets with xml tokens --- Modified: src/modules/acc_json/doc/acc_json_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fb23d67b396bafb51f9c971e2546df0… Patch: https://github.com/kamailio/kamailio/commit/fb23d67b396bafb51f9c971e2546df0… --- diff --git a/src/modules/acc_json/doc/acc_json_admin.xml b/src/modules/acc_json/doc/acc_json_admin.xml index ea1fbc446c..2dcfbcd0f2 100644 --- a/src/modules/acc_json/doc/acc_json_admin.xml +++ b/src/modules/acc_json/doc/acc_json_admin.xml @@ -216,16 +216,16 @@ route[RUN_ACC_PUBLISH] { $var(count) = $var(count) + 1; xinfo("[RUN_ACC_PUBLISH][$var(q_size)][$var(count)][$mqk(acc_events)][$mqv(acc_events)]\n"); $var(res) = http_connect_raw("nsqd", "", "application/json", $mqv(acc_events), "$var(nsq_res)"); - if ($var(res) < 0) { + if ($var(res) < 0) { xerr("[RUN_ACC_PUBLISH][$var(res)] http_connect_raw: timeout or error !\n"); mq_add("acc_events", "acc_key", "$mqv(acc_events)"); - } else if ($var(res) < 200 || $var(res) > 299) { + } else if ($var(res) < 200 || $var(res) > 299) { xerr("[RUN_ACC_PUBLISH][$var(res)] http unexpected response code !\n"); mq_add("acc_dead_letter_queue", "acc_key", "$mqv(acc_events)"); return; } } - if ($var(count) > 0 ) { + if ($var(count) > 0 ) { xinfo("[RUN_CDR_PUBLISH]done count[$var(count)]\n"); } }

1 0

Re: [sr-dev] [kamailio/kamailio] presence: do not include presence.h in other header files (eb1bf9a)
by Cui Gang 13 Jan '19

13 Jan '19

There is a compile ERROR: ``` presence_dmq.c:97:5: error: use of undeclared identifier 'pres_sruid' if(pres_sruid.pid == 0) { ^ ``` -- 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/eb1bf9a69abad3d237c136750fe8cac…

1 0

git:master:7412f771: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 13 Jan '19

13 Jan '19

Module: kamailio Branch: master Commit: 7412f7714f5a6b021c14d0eff4f5ed5ed890b8b6 URL: https://github.com/kamailio/kamailio/commit/7412f7714f5a6b021c14d0eff4f5ed5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-13T13:16:38+01:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README Modified: src/modules/janssonrpcc/README --- Diff: https://github.com/kamailio/kamailio/commit/7412f7714f5a6b021c14d0eff4f5ed5… Patch: https://github.com/kamailio/kamailio/commit/7412f7714f5a6b021c14d0eff4f5ed5…

1 0

[kamailio/kamailio] janssonrpcc: add new parameter "keep_alive" (#1808)
by Emmanuel Schmidbauer 13 Jan '19

13 Jan '19

- send periodic tcp keepalive packets to server in order to prevent connection from closing You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1808 -- Commit Summary -- * janssonrpcc: add new parameter "keep_alive" -- File Changes -- M src/modules/janssonrpcc/doc/janssonrpcc_admin.xml (19) M src/modules/janssonrpcc/janssonrpc_connect.c (56) M src/modules/janssonrpcc/janssonrpc_server.h (1) M src/modules/janssonrpcc/janssonrpc_srv.h (1) M src/modules/janssonrpcc/janssonrpcc_mod.c (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1808.patch https://github.com/kamailio/kamailio/pull/1808.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/1808

2 4

git:master:786b2645: janssonrpcc: add new parameter "keep_alive"
by Emmanuel Schmidbauer 13 Jan '19

13 Jan '19

Module: kamailio Branch: master Commit: 786b2645d38386a9a1771f7fbd6a151af22b5c64 URL: https://github.com/kamailio/kamailio/commit/786b2645d38386a9a1771f7fbd6a151… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Date: 2019-01-11T12:47:07-05:00 janssonrpcc: add new parameter "keep_alive" - send periodic tcp keepalive packets to server in order to prevent connection from closing --- Modified: src/modules/janssonrpcc/doc/janssonrpcc_admin.xml Modified: src/modules/janssonrpcc/janssonrpc_connect.c Modified: src/modules/janssonrpcc/janssonrpc_server.h Modified: src/modules/janssonrpcc/janssonrpc_srv.h Modified: src/modules/janssonrpcc/janssonrpcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/786b2645d38386a9a1771f7fbd6a151… Patch: https://github.com/kamailio/kamailio/commit/786b2645d38386a9a1771f7fbd6a151…

1 0

git:master:d6628516: Merge pull request #1808 from kamailio/janssonrpcc-keepalive
by GitHub 13 Jan '19

13 Jan '19

Module: kamailio Branch: master Commit: d66285162af2baa2335e6b2ff811b64cf9c84891 URL: https://github.com/kamailio/kamailio/commit/d66285162af2baa2335e6b2ff811b64… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: GitHub <noreply(a)github.com> Date: 2019-01-13T07:08:04-05:00 Merge pull request #1808 from kamailio/janssonrpcc-keepalive janssonrpcc: add new parameter "keep_alive" --- Modified: src/modules/janssonrpcc/doc/janssonrpcc_admin.xml Modified: src/modules/janssonrpcc/janssonrpc_connect.c Modified: src/modules/janssonrpcc/janssonrpc_server.h Modified: src/modules/janssonrpcc/janssonrpc_srv.h Modified: src/modules/janssonrpcc/janssonrpcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d66285162af2baa2335e6b2ff811b64… Patch: https://github.com/kamailio/kamailio/commit/d66285162af2baa2335e6b2ff811b64…

1 0

git:master:4269fc7c: Merge pull request #1782 from tverlaan/dispatcher_rpc_add_inmemory
by GitHub 13 Jan '19

13 Jan '19

Module: kamailio Branch: master Commit: 4269fc7cb134387e4d0c6bf4ad8d96988f7987fc URL: https://github.com/kamailio/kamailio/commit/4269fc7cb134387e4d0c6bf4ad8d969… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-01-13T13:07:41+01:00 Merge pull request #1782 from tverlaan/dispatcher_rpc_add_inmemory dispatcher: add destination to in-memory dispatcher list --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4269fc7cb134387e4d0c6bf4ad8d969… Patch: https://github.com/kamailio/kamailio/commit/4269fc7cb134387e4d0c6bf4ad8d969…

1 0

git:master:97a198b4: dispatcher: add destination to in-memory dispatcher list
by Timmo Verlaan 13 Jan '19

13 Jan '19

Module: kamailio Branch: master Commit: 97a198b4569d7237798c9e507c60ecfebb728ab3 URL: https://github.com/kamailio/kamailio/commit/97a198b4569d7237798c9e507c60ecf… Author: Timmo Verlaan <tverlaan(a)gmail.com> Committer: Timmo Verlaan <tverlaan(a)gmail.com> Date: 2019-01-02T22:46:45+01:00 dispatcher: add destination to in-memory dispatcher list - add dispatcher.add rpc call to add destinations to in-memory dispatcher list - refactored ds_log_set to allow for re-use of loop over all destinations --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/97a198b4569d7237798c9e507c60ecf… Patch: https://github.com/kamailio/kamailio/commit/97a198b4569d7237798c9e507c60ecf…

1 0

[kamailio/kamailio] dispatcher: add destination to in-memory dispatcher list (#1782)
by Timmo Verlaan 13 Jan '19

13 Jan '19

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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) - [x] 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description To prevent code duplication I refactored ds_log_set a bit to allow for re-use of loop over all destinations and execute a callback. Perhaps there are more places this could be useful. Add dispatcher.add rpc call to add destinations to in-memory dispatcher list. This allows for more quick and flexible updates to dispatcher list in kamailio. _A few ideas that build on top of this change are:_ 1. modparam for reload to keep in-memory entries or not 2. modparam to not read list or db 3. `dispatcher.remove _group_ _destination_` 4. modifying in routing script with `ds_add_dst`/`ds_remove_dst` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1782 -- Commit Summary -- * dispatcher: add destination to in-memory dispatcher list -- File Changes -- M src/modules/dispatcher/dispatch.c (81) M src/modules/dispatcher/dispatch.h (1) M src/modules/dispatcher/dispatcher.c (29) M src/modules/dispatcher/doc/dispatcher_admin.xml (32) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1782.patch https://github.com/kamailio/kamailio/pull/1782.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/1782

2 3

git:master:eb1bf9a6: presence: do not include presence.h in other header files
by Daniel-Constantin Mierla 13 Jan '19

13 Jan '19

Module: kamailio Branch: master Commit: eb1bf9a69abad3d237c136750fe8cacea4cd0a31 URL: https://github.com/kamailio/kamailio/commit/eb1bf9a69abad3d237c136750fe8cac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-13T11:31:22+01:00 presence: do not include presence.h in other header files - it exports as extern the module parameter variables and other modules built on top of presence can end up including this header file, overwriting declaration of variables with same name - renamed db_url to pres_db_url, this being a common variable name, to avoid same situation with a mistaken include in the future - GH #1809 --- Modified: src/modules/presence/hash.h Modified: src/modules/presence/presence.c Modified: src/modules/presence/presence.h Modified: src/modules/presence/presence_dmq.c Modified: src/modules/presence/presence_dmq.h Modified: src/modules/presence/presentity.h Modified: src/modules/presence/subscribe.h --- Diff: https://github.com/kamailio/kamailio/commit/eb1bf9a69abad3d237c136750fe8cac… Patch: https://github.com/kamailio/kamailio/commit/eb1bf9a69abad3d237c136750fe8cac…

1 0

git:master:f0e0a849: presence_xml: do not include ../presence/presence.h
by Daniel-Constantin Mierla 13 Jan '19

13 Jan '19

Module: kamailio Branch: master Commit: f0e0a849f5dfe5dae0cd0e755b9739cbc7fa8200 URL: https://github.com/kamailio/kamailio/commit/f0e0a849f5dfe5dae0cd0e755b9739c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-13T11:34:25+01:00 presence_xml: do not include ../presence/presence.h - it is not needed, that header file is related to modparams of presence module - renamed db_url to presxml_db_url just to avoid possible conflict in the future like for GH #1809 --- Modified: src/modules/presence_xml/presence_xml.c Modified: src/modules/presence_xml/presence_xml.h --- Diff: https://github.com/kamailio/kamailio/commit/f0e0a849f5dfe5dae0cd0e755b9739c… Patch: https://github.com/kamailio/kamailio/commit/f0e0a849f5dfe5dae0cd0e755b9739c… --- diff --git a/src/modules/presence_xml/presence_xml.c b/src/modules/presence_xml/presence_xml.c index 36995c8b3c..228896c18a 100644 --- a/src/modules/presence_xml/presence_xml.c +++ b/src/modules/presence_xml/presence_xml.c @@ -81,7 +81,7 @@ pres_get_sphere_t pres_get_sphere; /* Module parameter variables */ str xcap_table= str_init("xcap"); -str db_url = str_init(DEFAULT_DB_URL); +static str presxml_db_url = str_init(DEFAULT_DB_URL); int force_active= 0; int force_dummy_presence = 0; int integrated_xcap_server= 0; @@ -115,7 +115,7 @@ static cmd_export_t cmds[]={ }; static param_export_t params[]={ - { "db_url", PARAM_STR, &db_url}, + { "db_url", PARAM_STR, &presxml_db_url}, { "xcap_table", PARAM_STR, &xcap_table}, { "force_active", INT_PARAM, &force_active }, { "integrated_xcap_server", INT_PARAM, &integrated_xcap_server}, @@ -156,7 +156,8 @@ static int mod_init(void) if(passive_mode==1) return 0; - LM_DBG("db_url=%s/%d/%p\n",ZSW(db_url.s),db_url.len, db_url.s); + LM_DBG("db_url=%s (len=%d addr=%p)\n", ZSW(presxml_db_url.s), + presxml_db_url.len, presxml_db_url.s); /* bind the SL API */ if (sl_load_api(&slb)!=0) { @@ -196,7 +197,7 @@ static int mod_init(void) if(force_active== 0) { /* binding to mysql module */ - if (db_bind_mod(&db_url, &pxml_dbf)) + if (db_bind_mod(&presxml_db_url, &pxml_dbf)) { LM_ERR("Database module not found\n"); return -1; @@ -208,7 +209,7 @@ static int mod_init(void) return -1; } - pxml_db = pxml_dbf.init(&db_url); + pxml_db = pxml_dbf.init(&presxml_db_url); if (!pxml_db) { LM_ERR("while connecting to database\n"); @@ -284,7 +285,7 @@ static int child_init(int rank) { if(pxml_db) return 0; - pxml_db = pxml_dbf.init(&db_url); + pxml_db = pxml_dbf.init(&presxml_db_url); if (pxml_db== NULL) { LM_ERR("while connecting database\n"); diff --git a/src/modules/presence_xml/presence_xml.h b/src/modules/presence_xml/presence_xml.h index 7b523ef028..e165852684 100644 --- a/src/modules/presence_xml/presence_xml.h +++ b/src/modules/presence_xml/presence_xml.h @@ -35,7 +35,6 @@ #include "../../lib/srdb1/db.h" #include "../../modules/sl/sl.h" #include "../presence/event_list.h" -#include "../presence/presence.h" #include "../presence/presentity.h" #include "../xcap_client/xcap_functions.h"

1 0

git:master:d3208e18: presence: Makefile - link agaist libicu on macos/darwin
by Daniel-Constantin Mierla 13 Jan '19

13 Jan '19

Module: kamailio Branch: master Commit: d3208e1859051eb09013f855126f7f5f5ec47ab8 URL: https://github.com/kamailio/kamailio/commit/d3208e1859051eb09013f855126f7f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-13T11:03:28+01:00 presence: Makefile - link agaist libicu on macos/darwin - libxml2 needs it but its pkg-config doesn't list it --- Modified: src/modules/presence/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/d3208e1859051eb09013f855126f7f5… Patch: https://github.com/kamailio/kamailio/commit/d3208e1859051eb09013f855126f7f5… --- diff --git a/src/modules/presence/Makefile b/src/modules/presence/Makefile index 6891a79d39..bd1bcebc75 100644 --- a/src/modules/presence/Makefile +++ b/src/modules/presence/Makefile @@ -7,6 +7,12 @@ NAME=presence.so ifeq ($(CROSS_COMPILE),) XML2CFG=$(shell which xml2-config) +ifeq ($(OS), darwin) +ICU_BUILDER = $(shell \ + if pkg-config --exists icu-uc; then \ + echo 'pkg-config icu-uc'; \ + fi) +endif endif ifneq ($(XML2CFG),) @@ -18,6 +24,11 @@ else LIBS+=-L$(LOCALBASE)/lib -lxml2 endif +ifneq ($(ICU_BUILDER),) + DEFS += $(shell $(ICU_BUILDER) --cflags ) + LIBS += $(shell $(ICU_BUILDER) --libs) +endif + SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 SER_LIBS+=$(SERLIBPATH)/srutils/srutils

1 0

git:master:869f57aa: presence_xml: Makefile - link agaist libicu on macos/darwin
by Daniel-Constantin Mierla 13 Jan '19

13 Jan '19

Module: kamailio Branch: master Commit: 869f57aac4496e10480094c36373f485aef11a80 URL: https://github.com/kamailio/kamailio/commit/869f57aac4496e10480094c36373f48… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-13T11:04:16+01:00 presence_xml: Makefile - link agaist libicu on macos/darwin - libxml2 needs it but its pkg-config doesn't list it --- Modified: src/modules/presence_xml/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/869f57aac4496e10480094c36373f48… Patch: https://github.com/kamailio/kamailio/commit/869f57aac4496e10480094c36373f48… --- diff --git a/src/modules/presence_xml/Makefile b/src/modules/presence_xml/Makefile index 08711cdfa9..f6a1dd4d63 100644 --- a/src/modules/presence_xml/Makefile +++ b/src/modules/presence_xml/Makefile @@ -8,6 +8,12 @@ LIBS= ifeq ($(CROSS_COMPILE),) XML2CFG=$(shell which xml2-config) +ifeq ($(OS), darwin) +ICU_BUILDER = $(shell \ + if pkg-config --exists icu-uc; then \ + echo 'pkg-config icu-uc'; \ + fi) +endif endif ifneq ($(XML2CFG),) @@ -19,6 +25,11 @@ else LIBS+=-L$(LOCALBASE)/lib -lxml2 endif +ifneq ($(ICU_BUILDER),) + DEFS += $(shell $(ICU_BUILDER) --cflags ) + LIBS += $(shell $(ICU_BUILDER) --libs) +endif + SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 include ../../Makefile.modules

1 0

git:master:c47c759e: cnxcc: updated the export signature of set_max_credit() to kemi
by Daniel-Constantin Mierla 12 Jan '19

12 Jan '19

Module: kamailio Branch: master Commit: c47c759e6f59ec674c9c83a9e38d2620c36323c8 URL: https://github.com/kamailio/kamailio/commit/c47c759e6f59ec674c9c83a9e38d262… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-12T18:15:28+01:00 cnxcc: updated the export signature of set_max_credit() to kemi - affected by last addition with connection cost --- Modified: src/modules/cnxcc/cnxcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c47c759e6f59ec674c9c83a9e38d262… Patch: https://github.com/kamailio/kamailio/commit/c47c759e6f59ec674c9c83a9e38d262… --- diff --git a/src/modules/cnxcc/cnxcc_mod.c b/src/modules/cnxcc/cnxcc_mod.c index d1a7c17076..55d9bf00a1 100644 --- a/src/modules/cnxcc/cnxcc_mod.c +++ b/src/modules/cnxcc/cnxcc_mod.c @@ -2127,7 +2127,7 @@ static sr_kemi_t sr_kemi_cnxcc_exports[] = { { str_init("cnxcc"), str_init("set_max_credit"), SR_KEMIP_INT, ki_set_max_credit, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, - SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE } + SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_INT } }, { str_init("cnxcc"), str_init("set_max_time"), SR_KEMIP_INT, ki_set_max_time,

1 0

git:5.0:3dcde884: cdp: fix three coverity errors (ressource leaks and error checks)
by Henning Westerholt 11 Jan '19

11 Jan '19

Module: kamailio Branch: 5.0 Commit: 3dcde88477e243131acd6f06f945ec367e9d5f27 URL: https://github.com/kamailio/kamailio/commit/3dcde88477e243131acd6f06f945ec3… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-11T16:11:24+01:00 cdp: fix three coverity errors (ressource leaks and error checks) - fix an ressource leak related to library call getaddrinfo - add missing error checks for setsockopts and fcntl calls (cherry picked from commit 967a71687aa63a253d495ba49351ae916713a452) --- Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/3dcde88477e243131acd6f06f945ec3… Patch: https://github.com/kamailio/kamailio/commit/3dcde88477e243131acd6f06f945ec3… --- diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index 4162501f6c..2710387d29 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -844,6 +844,7 @@ int receive_loop(peer *original_peer) int peer_connect(peer *p) { int sock; + int tmp = 0; unsigned int option = 1; struct addrinfo *ainfo=0,*res=0,*sainfo=0,hints; @@ -935,10 +936,21 @@ int peer_connect(peer *p) } x=fcntl(sock,F_GETFL,0); - fcntl(sock,F_SETFL,x & (~O_NONBLOCK)); + if (x == -1) { + LM_ERR("error during first fcntl operation\n"); + goto error; + } + tmp = fcntl(sock,F_SETFL,x & (~O_NONBLOCK)); + if (tmp == -1) { + LM_ERR("error during second fcntl operation\n"); + goto error; + } + } + tmp = setsockopt(sock,SOL_SOCKET,SO_REUSEADDR,&option,sizeof(option)); + if (tmp == -1) { + LM_ERR("could not set socket options\n"); + goto error; } - setsockopt(sock,SOL_SOCKET,SO_REUSEADDR,&option,sizeof(option)); - LM_INFO("peer_connect(): Peer %.*s:%d connected\n",p->fqdn.len,p->fqdn.s,p->port); if (!send_fd(p->fd_exchange_pipe,sock,p)){ @@ -948,10 +960,12 @@ int peer_connect(peer *p) } if (res) freeaddrinfo(res); + if (sainfo) freeaddrinfo(sainfo); return sock; } error: if (res) freeaddrinfo(res); + if (sainfo) freeaddrinfo(sainfo); return -1; }

2 2

git:5.0:3f0d4174: core: fix an error in check_via_address, reported from Mojtaba, mespio at gmail dot com
by Henning Westerholt 11 Jan '19

11 Jan '19

Module: kamailio Branch: 5.0 Commit: 3f0d41742e41f117dc9426afd148cf906c271e46 URL: https://github.com/kamailio/kamailio/commit/3f0d41742e41f117dc9426afd148cf9… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-11T16:11:53+01:00 core: fix an error in check_via_address, reported from Mojtaba, mespio at gmail dot com - fix an error in check_via_address, reported from Mojtaba, mespio at gmail dot com - use the same logic for IPv4 string comparison as for IPv6 - the old comparison could return true for e.g. via="192.168.1.1", src="192.1.1.100" - the new logic is also faster for the trivial case with different string length (cherry picked from commit 98ee014a88ca951d82a0389f0be119078ba525f7) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/3f0d41742e41f117dc9426afd148cf9… Patch: https://github.com/kamailio/kamailio/commit/3f0d41742e41f117dc9426afd148cf9… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 54ed42b903..aa286788aa 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -176,7 +176,7 @@ static int check_via_address(struct ip_addr* ip, str *name, LM_CRIT("invalid Via host name\n"); return -1; } - if (strncmp(name->s, s, name->len)==0) + if (len==name->len&&(strncmp(name->s, s, name->len)==0)) return 0; } }else{

1 0

git:5.0:ccf6bfe1: core: check for optarg before passing it to external library (coverity report)
by Henning Westerholt 11 Jan '19

11 Jan '19

Module: kamailio Branch: 5.0 Commit: ccf6bfe19e9402e616633c9b18fef0a08c27d304 URL: https://github.com/kamailio/kamailio/commit/ccf6bfe19e9402e616633c9b18fef0a… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-11T16:11:43+01:00 core: check for optarg before passing it to external library (coverity report) (cherry picked from commit 7eb1eae615a4c3ef710e9931b101ddc4db07aff2) --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/ccf6bfe19e9402e616633c9b18fef0a… Patch: https://github.com/kamailio/kamailio/commit/ccf6bfe19e9402e616633c9b18fef0a… --- diff --git a/src/main.c b/src/main.c index 8982c31c8e..1e8859ab65 100644 --- a/src/main.c +++ b/src/main.c @@ -1891,6 +1891,10 @@ int main(int argc, char** argv) log_color=1; break; case 'M': + if (optarg == NULL) { + fprintf(stderr, "bad private mem size\n"); + goto error; + } pkg_mem_size=strtol(optarg, &tmp, 10) * 1024 * 1024; if (tmp &&(*tmp)){ fprintf(stderr, "bad private mem size number: -M %s\n",

1 0

git:5.0:85e45ced: cdp: fix two errors from coverty scan (missing check, var initialization)
by Henning Westerholt 11 Jan '19

11 Jan '19

Module: kamailio Branch: 5.0 Commit: 85e45cede3c463fbe8186d19a8d7d024dd42cb76 URL: https://github.com/kamailio/kamailio/commit/85e45cede3c463fbe8186d19a8d7d02… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-11T16:10:57+01:00 cdp: fix two errors from coverty scan (missing check, var initialization) - remove library call can fail, test for the error and log it - initialize the msghdr variable with a memset (cherry picked from commit 7d52bf6ce7188eaa57690766c231e55b5509db4f) --- Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/85e45cede3c463fbe8186d19a8d7d02… Patch: https://github.com/kamailio/kamailio/commit/85e45cede3c463fbe8186d19a8d7d02… --- diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index 0ff2fe15ae..4162501f6c 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -157,10 +157,14 @@ static int make_send_pipe(serviced_peer_t *sp) */ static void close_send_pipe(serviced_peer_t *sp) { + int tmp; if (sp->send_pipe_name.s) { close(sp->send_pipe_fd); close(sp->send_pipe_fd_out); - remove(sp->send_pipe_name.s); + tmp = remove(sp->send_pipe_name.s); + if (tmp == -1) { + LM_ERR("could not remove send pipe\n"); + } shm_free(sp->send_pipe_name.s); sp->send_pipe_name.s=0; sp->send_pipe_name.len=0; @@ -269,6 +273,7 @@ static int send_fd(int pipe_fd,int fd, peer *p) struct iovec iov[1]; int ret; int *tmp = NULL; + memset(&msg, 0, sizeof(struct msghdr)); #ifdef HAVE_MSGHDR_MSG_CONTROL struct cmsghdr* cmsg;

1 0

git:5.2:1e56e4df: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 11 Jan '19

11 Jan '19

Module: kamailio Branch: 5.2 Commit: 1e56e4df35865f7138565213e35da8fd32096332 URL: https://github.com/kamailio/kamailio/commit/1e56e4df35865f7138565213e35da8f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-11T16:16:32+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/phonenum/README --- Diff: https://github.com/kamailio/kamailio/commit/1e56e4df35865f7138565213e35da8f… Patch: https://github.com/kamailio/kamailio/commit/1e56e4df35865f7138565213e35da8f… --- diff --git a/src/modules/phonenum/README b/src/modules/phonenum/README index fe7cf03ec7..842e2cfcc7 100644 --- a/src/modules/phonenum/README +++ b/src/modules/phonenum/README @@ -30,7 +30,7 @@ Daniel-Constantin Mierla 4. Functions 4.1. phonenum_match(num, pvc) - 4.2. phonenum_match(num, cnc, pvc) + 4.2. phonenum_match_cn(num, cnc, pvc) 5. Pseudo Variables @@ -57,7 +57,7 @@ Chapter 1. Admin Guide 4. Functions 4.1. phonenum_match(num, pvc) - 4.2. phonenum_match(num, cnc, pvc) + 4.2. phonenum_match_cn(num, cnc, pvc) 5. Pseudo Variables @@ -110,7 +110,7 @@ modparam("phonenum", "smode", 0) 4. Functions 4.1. phonenum_match(num, pvc) - 4.2. phonenum_match(num, cnc, pvc) + 4.2. phonenum_match_cn(num, cnc, pvc) 4.1. phonenum_match(num, pvc) @@ -133,7 +133,7 @@ if(phonenum_match("1-484-555-8888", "src")) { } ... -4.2. phonenum_match(num, cnc, pvc) +4.2. phonenum_match_cn(num, cnc, pvc) Match num against the libphonenumber and set the attributes inside the pvc container, restricting the rules with a country name code (two

1 0

git:5.2:0d25cb4e: phonenum: fixing documentation typo (#1807)
by Henning Westerholt 11 Jan '19

11 Jan '19

Module: kamailio Branch: 5.2 Commit: 0d25cb4e9d4f4cc6d3e4a864ef2fa3aaca746511 URL: https://github.com/kamailio/kamailio/commit/0d25cb4e9d4f4cc6d3e4a864ef2fa3a… Author: Rick <dunst0(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-11T16:03:59+01:00 phonenum: fixing documentation typo (#1807) (cherry picked from commit 77316f7567e0bbabcc7897969b68fdf64432d645) --- Modified: src/modules/phonenum/doc/phonenum_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0d25cb4e9d4f4cc6d3e4a864ef2fa3a… Patch: https://github.com/kamailio/kamailio/commit/0d25cb4e9d4f4cc6d3e4a864ef2fa3a… --- diff --git a/src/modules/phonenum/doc/phonenum_admin.xml b/src/modules/phonenum/doc/phonenum_admin.xml index ab62660ccf..402edfdb60 100644 --- a/src/modules/phonenum/doc/phonenum_admin.xml +++ b/src/modules/phonenum/doc/phonenum_admin.xml @@ -124,7 +124,7 @@ if(phonenum_match("1-484-555-8888", "src")) { </section> <section id="phonenum.f.phonenum_match_cn"> <title> - <function moreinfo="none">phonenum_match(num, cnc, pvc)</function> + <function moreinfo="none">phonenum_match_cn(num, cnc, pvc)</function> </title> <para> Match num against the libphonenumber and set the attributes inside

1 0

git:master:b98e0558: modules: readme files regenerated - phonenum ... [skip ci]
by Kamailio Dev 11 Jan '19

11 Jan '19

Module: kamailio Branch: master Commit: b98e0558c9f94a314e802baa7b50345a3f0d1270 URL: https://github.com/kamailio/kamailio/commit/b98e0558c9f94a314e802baa7b50345… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-11T16:01:46+01:00 modules: readme files regenerated - phonenum ... [skip ci] --- Modified: src/modules/phonenum/README --- Diff: https://github.com/kamailio/kamailio/commit/b98e0558c9f94a314e802baa7b50345… Patch: https://github.com/kamailio/kamailio/commit/b98e0558c9f94a314e802baa7b50345… --- diff --git a/src/modules/phonenum/README b/src/modules/phonenum/README index fe7cf03ec7..842e2cfcc7 100644 --- a/src/modules/phonenum/README +++ b/src/modules/phonenum/README @@ -30,7 +30,7 @@ Daniel-Constantin Mierla 4. Functions 4.1. phonenum_match(num, pvc) - 4.2. phonenum_match(num, cnc, pvc) + 4.2. phonenum_match_cn(num, cnc, pvc) 5. Pseudo Variables @@ -57,7 +57,7 @@ Chapter 1. Admin Guide 4. Functions 4.1. phonenum_match(num, pvc) - 4.2. phonenum_match(num, cnc, pvc) + 4.2. phonenum_match_cn(num, cnc, pvc) 5. Pseudo Variables @@ -110,7 +110,7 @@ modparam("phonenum", "smode", 0) 4. Functions 4.1. phonenum_match(num, pvc) - 4.2. phonenum_match(num, cnc, pvc) + 4.2. phonenum_match_cn(num, cnc, pvc) 4.1. phonenum_match(num, pvc) @@ -133,7 +133,7 @@ if(phonenum_match("1-484-555-8888", "src")) { } ... -4.2. phonenum_match(num, cnc, pvc) +4.2. phonenum_match_cn(num, cnc, pvc) Match num against the libphonenumber and set the attributes inside the pvc container, restricting the rules with a country name code (two

1 0

[kamailio/kamailio] phonenum: fixing documentation typo (#1807)
by Rick 11 Jan '19

11 Jan '19

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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 - [x] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1807 -- Commit Summary -- * phonenum: fixing documentation typo -- File Changes -- M src/modules/phonenum/doc/phonenum_admin.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1807.patch https://github.com/kamailio/kamailio/pull/1807.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/1807

2 2

git:master:77316f75: phonenum: fixing documentation typo (#1807)
by Henning Westerholt 11 Jan '19

11 Jan '19

Module: kamailio Branch: master Commit: 77316f7567e0bbabcc7897969b68fdf64432d645 URL: https://github.com/kamailio/kamailio/commit/77316f7567e0bbabcc7897969b68fdf… Author: Rick <dunst0(a)users.noreply.github.com> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-01-11T16:00:55+01:00 phonenum: fixing documentation typo (#1807) --- Modified: src/modules/phonenum/doc/phonenum_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/77316f7567e0bbabcc7897969b68fdf… Patch: https://github.com/kamailio/kamailio/commit/77316f7567e0bbabcc7897969b68fdf… --- diff --git a/src/modules/phonenum/doc/phonenum_admin.xml b/src/modules/phonenum/doc/phonenum_admin.xml index ab62660ccf..402edfdb60 100644 --- a/src/modules/phonenum/doc/phonenum_admin.xml +++ b/src/modules/phonenum/doc/phonenum_admin.xml @@ -124,7 +124,7 @@ if(phonenum_match("1-484-555-8888", "src")) { </section> <section id="phonenum.f.phonenum_match_cn"> <title> - <function moreinfo="none">phonenum_match(num, cnc, pvc)</function> + <function moreinfo="none">phonenum_match_cn(num, cnc, pvc)</function> </title> <para> Match num against the libphonenumber and set the attributes inside

1 0

git:master:4ed69046: kamctl: version set to 5.3.0
by Daniel-Constantin Mierla 11 Jan '19

11 Jan '19

Module: kamailio Branch: master Commit: 4ed69046984eb9be58e858cc652f14e8dd714f87 URL: https://github.com/kamailio/kamailio/commit/4ed69046984eb9be58e858cc652f14e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-11T15:51:38+01:00 kamctl: version set to 5.3.0 --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/4ed69046984eb9be58e858cc652f14e… Patch: https://github.com/kamailio/kamailio/commit/4ed69046984eb9be58e858cc652f14e… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index acc0d1f741..4dd9bc7fed 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -5,7 +5,7 @@ #=================================================================== ### version for this script -VERSION='5.2.0' +VERSION='5.3.0' PATH=$PATH:/usr/local/sbin/

1 0

git:master:249e96f7: github: small syntax fix for contribution guide
by Henning Westerholt 10 Jan '19

10 Jan '19

Module: kamailio Branch: master Commit: 249e96f7409a8c954b9512c1b351eb67cb293ced URL: https://github.com/kamailio/kamailio/commit/249e96f7409a8c954b9512c1b351eb6… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-10T23:27:43+01:00 github: small syntax fix for contribution guide --- Modified: .github/CONTRIBUTING.md --- Diff: https://github.com/kamailio/kamailio/commit/249e96f7409a8c954b9512c1b351eb6… Patch: https://github.com/kamailio/kamailio/commit/249e96f7409a8c954b9512c1b351eb6… --- diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 936f606017..227f212fcf 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -71,7 +71,7 @@ and commit history, there are several *rules* required for each contribution. will be regenerated by a automatic script that is executed every few hours * so if you modify an existing module **README** don't commit the changes of this file to the git repository - * if you create a new module that includes also a **README file, you + * if you create a new module that includes also a **README** file, you need to commit the README to the git repository one time * code **should** be formatted with **clang-format** or to match the style of the component that the commit applies to. The `.clang-format` file is part of

1 0

git:master:5bccf99b: sdpops: rename new function get_sdp_address_family to sdp_get_address_family()
by Henning Westerholt 10 Jan '19

10 Jan '19

Module: kamailio Branch: master Commit: 5bccf99bbcaec9fc6742a6e303623a0e790459b8 URL: https://github.com/kamailio/kamailio/commit/5bccf99bbcaec9fc6742a6e303623a0… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-10T23:24:29+01:00 sdpops: rename new function get_sdp_address_family to sdp_get_address_family() --- Modified: src/modules/sdpops/doc/sdpops_admin.xml Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5bccf99bbcaec9fc6742a6e303623a0… Patch: https://github.com/kamailio/kamailio/commit/5bccf99bbcaec9fc6742a6e303623a0… --- diff --git a/src/modules/sdpops/doc/sdpops_admin.xml b/src/modules/sdpops/doc/sdpops_admin.xml index 91374eb489..6cd8a68f69 100644 --- a/src/modules/sdpops/doc/sdpops_admin.xml +++ b/src/modules/sdpops/doc/sdpops_admin.xml @@ -573,21 +573,21 @@ if(sdp_get_line_startswith("$avp(mline)", "m=")) { </programlisting> </example> </section> - <section id="sdpops.f.get_sdp_address_family"> + <section id="sdpops.f.sdp_get_address_family"> <title> - <function moreinfo="none">get_sdp_address_family()</function> + <function moreinfo="none">sdp_get_address_family()</function> </title> <para> it helps to get IP address family at c line from sdp body. it returns -1 on error , 4 for IP4 and 6 for IP6 </para> <example> - <title><function>get_sdp_address_family</function>usage</title> + <title><function>sdp_get_address_family</function>usage</title> <programlisting format="linespecific"> ... if(is_method("INVITE") && has_body("application/sdp")){ - $avp(af) = get_sdp_address_family(); + $avp(af) = sdp_get_address_family(); xlog("L_INFO","ADDRESS FAMILY OF SDP C line $avp(af) "); } ... diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index 6c692c338c..11d8d69c2a 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -65,7 +65,7 @@ static int w_sdp_get_line_startswith(sip_msg_t* msg, char *foo, char *bar); static int sdp_get_sess_version(sip_msg_t* msg, str* sess_version, int* sess_version_num); static int sdp_set_sess_version(sip_msg_t* msg, str* sess_version, int* sess_version_num); -static int w_get_sdp_address_family(sip_msg_t* msg); +static int w_sdp_get_address_family(sip_msg_t* msg); static int pv_get_sdp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); @@ -126,7 +126,7 @@ static cmd_export_t cmds[] = { 0, 0, 0, ANY_ROUTE}, {"sdp_get_line_startswith", (cmd_function)w_sdp_get_line_startswith, 2, fixup_none_spve, 0, ANY_ROUTE}, - {"get_sdp_address_family", (cmd_function)w_get_sdp_address_family, + {"sdp_get_address_family", (cmd_function)w_sdp_get_address_family, 0, 0, 0, ANY_ROUTE}, {"bind_sdpops", (cmd_function)bind_sdpops, 1, 0, 0, 0}, @@ -1004,7 +1004,7 @@ it helps to extract IP adress family at c line from sdp 6 for IP6 */ -static int w_get_sdp_address_family(sip_msg_t *msg){ +static int w_sdp_get_address_family(sip_msg_t *msg){ sdp_session_cell_t* session; int sdp_session_num;

1 0

[kamailio/kamailio] sdpops : added new function named as get_sdp_address_family (#1801)
by Yasin CANER 10 Jan '19

10 Jan '19

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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) - [x] 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  added new function that helps to extract IP address family at c line from SDP body. it returns -1 on error , 4 for IP4 , 6 for IP6 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1801 -- Commit Summary -- * sdpops : removed commented function * sdpops : added new function as named get_sdp_address_family() * sdpops : added documentation about get_sdp_address_family -- File Changes -- M src/modules/sdpops/doc/sdpops_admin.xml (25) M src/modules/sdpops/sdpops_mod.c (66) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1801.patch https://github.com/kamailio/kamailio/pull/1801.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/1801

3 4

git:master:a142b781: github: update contribution guidelines about our README file change process
by Henning Westerholt 10 Jan '19

10 Jan '19

Module: kamailio Branch: master Commit: a142b781edf2c6c22128987c32cb38b029005fe4 URL: https://github.com/kamailio/kamailio/commit/a142b781edf2c6c22128987c32cb38b… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-10T23:18:55+01:00 github: update contribution guidelines about our README file change process --- Modified: .github/CONTRIBUTING.md --- Diff: https://github.com/kamailio/kamailio/commit/a142b781edf2c6c22128987c32cb38b… Patch: https://github.com/kamailio/kamailio/commit/a142b781edf2c6c22128987c32cb38b… --- diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index a09a8c0ef7..936f606017 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -67,13 +67,12 @@ and commit history, there are several *rules* required for each contribution. file. Instead, edit the xml files located in **modules/modname/doc/** folder * to regenerate the README, run **make modules-readme modules=modules/modname** * docbook utils and xsl packages are needed for the above command to work - * it is ok to modify only the xml doc file, the readme can be regenerated by - another developer who has the required tools installed - * if it is a change to README that needs to be backported, make separate - commits to xml doc file and README. The changes to README files are very - likely to rise merge conflicts. With separate commit, that won't be - backported, only the commit to xml doc file, then README will be manually - regenerated in the corresponding branch. + * it is only necessary to modify and commit the xml doc file, the **README** + will be regenerated by a automatic script that is executed every few hours + * so if you modify an existing module **README** don't commit the changes + of this file to the git repository + * if you create a new module that includes also a **README file, you + need to commit the README to the git repository one time * code **should** be formatted with **clang-format** or to match the style of the component that the commit applies to. The `.clang-format` file is part of Kamailio source code tree, in the root folder.

1 0

git:master:e2978071: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 10 Jan '19

10 Jan '19

Module: kamailio Branch: master Commit: e29780715a2021ddf4a4b74011817849fe11c30c URL: https://github.com/kamailio/kamailio/commit/e29780715a2021ddf4a4b7401181784… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-10T23:16:36+01:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README Modified: src/modules/sdpops/README --- Diff: https://github.com/kamailio/kamailio/commit/e29780715a2021ddf4a4b7401181784… Patch: https://github.com/kamailio/kamailio/commit/e29780715a2021ddf4a4b7401181784…

1 0

git:master:14b4d23a: dispatcher: docs - typo and indentation for the rpc flags paragraph
by Daniel-Constantin Mierla 10 Jan '19

10 Jan '19

Module: kamailio Branch: master Commit: 14b4d23a06fdc9b9f6b17781c50902beaff0cd94 URL: https://github.com/kamailio/kamailio/commit/14b4d23a06fdc9b9f6b17781c50902b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-10T23:09:07+01:00 dispatcher: docs - typo and indentation for the rpc flags paragraph --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/14b4d23a06fdc9b9f6b17781c50902b… Patch: https://github.com/kamailio/kamailio/commit/14b4d23a06fdc9b9f6b17781c50902b… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index c0a55b27ad..6092349cf7 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1713,13 +1713,15 @@ DEST: { } ... </programlisting> -<para>FLAGS consist out of 2 letters. First letter describe status of destination: A-active, - I – inactive, T – trying, D – disabled. Second letter might be P or X. P is for probing, - so AP means destination is active and it is tested by SIP options continuously. - X means that there are no probing or sip pinging. So AX means that destination is assumed as active - and it is not tested by SIP options. DX respectively is disabled destination what is not tested and etc. -</para> - </section> + <para>FLAGS consist out of 2 letters. First letter describe status of + destination: A-active, I – inactive, T – trying, D – disabled. Second + letter might be P or X. P is for probing, so AP means destination + is active and it is tested by SIP options continuously. X means that + there are no probing or sip pinging. So AX means that destination is + assumed as active and it is not tested by SIP options. DX + respectively is disabled destination that is not tested, etc. + </para> + </section> <section id="dispatcher.r.reload"> <title> <function moreinfo="none">dispatcher.reload</function>

1 0

git:master:547a40dc: sdpops : added new function named as get_sdp_address_family (#1801)
by Henning Westerholt 10 Jan '19

10 Jan '19

Module: kamailio Branch: master Commit: 547a40dca93cb30769d57d51e299f85dd0980416 URL: https://github.com/kamailio/kamailio/commit/547a40dca93cb30769d57d51e299f85… Author: Yasin CANER <caner_yaso(a)hotmail.com> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-01-10T23:08:24+01:00 sdpops : added new function named as get_sdp_address_family (#1801) - added new function as named get_sdp_address_family() to extract the IP address family from the SDP body 'c' part. it returns:4 for IP4, 6 for IP6, -1 for error - also added documentation about get_sdp_address_family() function - removed commented out function sdp_remove_str_codec_id_attrs() from year 2016 --- Modified: src/modules/sdpops/doc/sdpops_admin.xml Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/547a40dca93cb30769d57d51e299f85… Patch: https://github.com/kamailio/kamailio/commit/547a40dca93cb30769d57d51e299f85…

1 0

git:master:d0831cf3: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 10 Jan '19

10 Jan '19

Module: kamailio Branch: master Commit: d0831cf336f6f4a2cad87698f60ecd151dcd28b9 URL: https://github.com/kamailio/kamailio/commit/d0831cf336f6f4a2cad87698f60ecd1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-10T22:01:38+01:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/d0831cf336f6f4a2cad87698f60ecd1… Patch: https://github.com/kamailio/kamailio/commit/d0831cf336f6f4a2cad87698f60ecd1… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 53a464d8ff..55cc631c1f 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -697,10 +697,15 @@ Note Controls what gateways are tested to see if they are reachable. * Value 0: If set to 0, only the gateways with state PROBING are tested. After a gateway is probed, the PROBING state is cleared in - this mode. + this mode. This means that no probing will be executed at all only + if flag in config file is set to 8/PROBING (please check + destination list file syntaxis for more details), it will probe + only one time at startup or after dispatcher reload. * Value 1: If set to 1, all gateways are tested. If set to 1 and there is a failure of keepalive to an active gateway, then it is - set to TRYING state. + set to TRYING state. This means that probing will be executed all + the time, but you can skip some servers with flag 4 in destination + list file, for example. * Value 2: if set to 2, only gateways in inactive state with probing mode set are tested. * Value 3: If set to 3, any gateway with state PROBING is continually @@ -1388,6 +1393,21 @@ kamcmd dispatcher.set_state ip 3 all Example: kamcmd dispatcher.list + ... +DEST: { + URI: sip:192.168.0.1:5060 + FLAGS: AP + PRIORITY: 12 +} + ... + + FLAGS consist out of 2 letters. First letter describe status of + destination: A-active, I â inactive, T â trying, D â disabled. + Second letter might be P or X. P is for probing, so AP means + destination is active and it is tested by SIP options continuously. X + means that there are no probing or sip pinging. So AX means that + destination is assumed as active and it is not tested by SIP options. + DX respectively is disabled destination what is not tested and etc. 5.3. dispatcher.reload

1 0

[kamailio/kamailio] Update for Readme Dispatcher module (#1804)
by Jurijs I 10 Jan '19

10 Jan '19

Update for Readme Dispatcher module. I added some minor comments for dispatcher module, what I think might be useful for somebody. Additionally I added description, what several states means when dispatcher list are executed, as discussed.   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1804 -- Commit Summary -- * Update for Readme Dispatcher module -- File Changes -- M src/modules/dispatcher/doc/dispatcher_admin.xml (25) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1804.patch https://github.com/kamailio/kamailio/pull/1804.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/1804

2 2

git:master:14a87383: dispatcher: update for module docs (#1804)
by Henning Westerholt 10 Jan '19

10 Jan '19

Module: kamailio Branch: master Commit: 14a87383fbae102b430ed6cfdba2559f1768cdd0 URL: https://github.com/kamailio/kamailio/commit/14a87383fbae102b430ed6cfdba2559… Author: Jurijs I <jurijs.ivolga(a)gmail.com> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-01-10T21:49:58+01:00 dispatcher: update for module docs (#1804) - update for module docs (#1804) - Some minor comments for dispatcher module were added - Additionally a description were added, what the several states means when dispatcher list are executed --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/14a87383fbae102b430ed6cfdba2559… Patch: https://github.com/kamailio/kamailio/commit/14a87383fbae102b430ed6cfdba2559… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 3b40c04622..c0a55b27ad 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -631,12 +631,16 @@ modparam("dispatcher", "force_dst", 1) <itemizedlist> <listitem> <para>Value 0: If set to 0, only the gateways with state PROBING are tested. - After a gateway is probed, the PROBING state is cleared in this mode.</para> + After a gateway is probed, the PROBING state is cleared in this mode. + This means that no probing will be executed at all only if flag in config file is set to 8/PROBING + (please check destination list file syntaxis for more details), it will probe only one time at startup or + after dispatcher reload.</para> </listitem> <listitem> <para>Value 1: If set to 1, all gateways are tested. If set to 1 and there is a failure of keepalive to an active gateway, then it is - set to TRYING state.</para> + set to TRYING state. This means that probing will be executed all the time, + but you can skip some servers with flag 4 in destination list file, for example.</para> </listitem> <listitem> <para>Value 2: if set to 2, only gateways in inactive state with @@ -1701,8 +1705,21 @@ onreply_route { </para> <programlisting format="linespecific"> &sercmd; dispatcher.list - </programlisting> - </section> + ... +DEST: { + URI: sip:192.168.0.1:5060 + FLAGS: AP + PRIORITY: 12 +} + ... +</programlisting> +<para>FLAGS consist out of 2 letters. First letter describe status of destination: A-active, + I – inactive, T – trying, D – disabled. Second letter might be P or X. P is for probing, + so AP means destination is active and it is tested by SIP options continuously. + X means that there are no probing or sip pinging. So AX means that destination is assumed as active + and it is not tested by SIP options. DX respectively is disabled destination what is not tested and etc. +</para> + </section> <section id="dispatcher.r.reload"> <title> <function moreinfo="none">dispatcher.reload</function>

1 0

Re: [sr-dev] [kamailio/kamailio] auth_db: database table version updated to 7 (673f4af)
by Victor Seva 10 Jan '19

10 Jan '19

If you want to document the changes needed to upgrade the config defined in the howto, please, be my guest and write a post in your blog, or a whole howto, if you prefer, so other people can benefit of those hours you spent searching for the solution of your problem. Sorry, but, I still don't see how this is related to kamailio default config or the lack of upgrade documentation. Again, there's a mailing list sr-users(a)lists.kamailio.org where you can ask for help. This is for actual bugs in the code. -- 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/673f4af214fcb613ce227b5c9b1b805…

1 0

Re: [sr-dev] [kamailio/kamailio] auth_db: database table version updated to 7 (673f4af)
by PICCORO Lenz McKAY 10 Jan '19

10 Jan '19

hi @linuxmaniac due either kamailo or asterisk talk about that problem i spend many days in setup the migration from 4 to 5.. due kamailio does not property redirect to asterisk due that changes in the related commit.. that change are in nowhere place in the network.. neither in the documentation that you pointed.. due the table sopected "sipusers" are related to asterisk.. that seems not changed between vesions of asterisk.. but has a change in kamailio! due the cited " asipto howto, " are not official and theres no documentation about that integracion up to date, that change about spected version table at asterisk side are not pointed... **i dont know why the kamailio now spected that "sipusers" table of asterisk need version 7, this commit only defines the version of the kamailio suscriber table.. so if that are as i just said. it a bug!** -- 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/673f4af214fcb613ce227b5c9b1b805…

1 0

Re: [sr-dev] [kamailio/kamailio] auth_db: database table version updated to 7 (673f4af)
by bryanbencomo4 10 Jan '19

10 Jan '19

seems there's a spected table version 7 in asterisk that are not documented a change in nowhere -- 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/673f4af214fcb613ce227b5c9b1b805…

1 0

Re: [sr-dev] [kamailio/kamailio] auth_db: database table version updated to 7 (673f4af)
by Victor Seva 10 Jan '19

10 Jan '19

Again, the change in auth_db was documented at the [wiki](https://www.kamailio.org/wiki/install/upgrade/4.4.x-to-5.0.0) There's no kamailio and asterisk integration per se. It seems that You followed the [asipto howto](https://kb.asipto.com/asterisk:realtime:kamailio-4.0.x-asterisk-11.3…, and that's fine but please don't complain about lack of documentation for upgrades between kamailio versions. -- 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/673f4af214fcb613ce227b5c9b1b805…

1 0

Re: [sr-dev] [kamailio/kamailio] auth_db: database table version updated to 7 (673f4af)
by PICCORO Lenz McKAY 10 Jan '19

10 Jan '19

related to https://github.com/kamailio/kamailio/issues/1780 that was silenced due a really true! was update a force upgrade without documented! now kamalio and asterisk integration has a version check incompatibility that can be workaround with ... `modparam("auth_db", "version_table", 0)` that by default are "1" -- 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/673f4af214fcb613ce227b5c9b1b805…

1 0

[kamailio/kamailio] Update for Readme Dispatcher module (#1803)
by Jurijs I 10 Jan '19

10 Jan '19

Update for Readme Dispatcher module. I added some minor comments for dispatcher module, what I think might be useful for somebody.   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1803 -- Commit Summary -- * Update for Readme Dispatcher module -- File Changes -- M src/modules/dispatcher/doc/dispatcher_admin.xml (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1803.patch https://github.com/kamailio/kamailio/pull/1803.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/1803

2 4

git:master:5a5d742e: tsilo: add check for empty aor
by Victor Seva 10 Jan '19

10 Jan '19

Module: kamailio Branch: master Commit: 5a5d742eb459249995114eb6a3642f99c6770496 URL: https://github.com/kamailio/kamailio/commit/5a5d742eb459249995114eb6a3642f9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-01-09T17:44:09+01:00 tsilo: add check for empty aor Fix: #1775 --- Modified: src/modules/tsilo/ts_store.c --- Diff: https://github.com/kamailio/kamailio/commit/5a5d742eb459249995114eb6a3642f9… Patch: https://github.com/kamailio/kamailio/commit/5a5d742eb459249995114eb6a3642f9… --- diff --git a/src/modules/tsilo/ts_store.c b/src/modules/tsilo/ts_store.c index a33924fa50..6d1c5a5f72 100644 --- a/src/modules/tsilo/ts_store.c +++ b/src/modules/tsilo/ts_store.c @@ -71,6 +71,11 @@ int ts_store(struct sip_msg* msg, str *puri) { else aor = ruri.user; + if(aor.s==NULL) { + LM_ERR("malformed aor from uri[%.*s]\n", suri.len, suri.s); + return -1; + } + t = _tmb.t_gett(); if (!t || t==T_UNDEFINED) { LM_ERR("no transaction defined for %.*s\n", aor.len, aor.s);

1 0

git:master:fe0a2b2f: Merge pull request #1802 from kamailio/vseva_1775
by GitHub 10 Jan '19

10 Jan '19

Module: kamailio Branch: master Commit: fe0a2b2fafcaa28a1f5f964ade8d26686e8f660d URL: https://github.com/kamailio/kamailio/commit/fe0a2b2fafcaa28a1f5f964ade8d266… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-01-10T09:46:25+01:00 Merge pull request #1802 from kamailio/vseva_1775 tsilo: add check for empty aor --- Modified: src/modules/tsilo/ts_store.c --- Diff: https://github.com/kamailio/kamailio/commit/fe0a2b2fafcaa28a1f5f964ade8d266… Patch: https://github.com/kamailio/kamailio/commit/fe0a2b2fafcaa28a1f5f964ade8d266… --- diff --git a/src/modules/tsilo/ts_store.c b/src/modules/tsilo/ts_store.c index a33924fa50..6d1c5a5f72 100644 --- a/src/modules/tsilo/ts_store.c +++ b/src/modules/tsilo/ts_store.c @@ -71,6 +71,11 @@ int ts_store(struct sip_msg* msg, str *puri) { else aor = ruri.user; + if(aor.s==NULL) { + LM_ERR("malformed aor from uri[%.*s]\n", suri.len, suri.s); + return -1; + } + t = _tmb.t_gett(); if (!t || t==T_UNDEFINED) { LM_ERR("no transaction defined for %.*s\n", aor.len, aor.s);

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev