sr-dev September 2018

sr-dev@lists.kamailio.org

24 participants
331 discussions

git:master:89676b97: registrar: use sruid_next_safe()
by Daniel-Constantin Mierla 19 Sep '18

19 Sep '18

Module: kamailio Branch: master Commit: 89676b9774ecc0f72272b7027821a9531dc1a6ea URL: https://github.com/kamailio/kamailio/commit/89676b9774ecc0f72272b7027821a95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-19T08:33:14+02:00 registrar: use sruid_next_safe() --- Modified: src/modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/89676b9774ecc0f72272b7027821a95… Patch: https://github.com/kamailio/kamailio/commit/89676b9774ecc0f72272b7027821a95… --- diff --git a/src/modules/registrar/save.c b/src/modules/registrar/save.c index 1432efed64..2b39444a29 100644 --- a/src/modules/registrar/save.c +++ b/src/modules/registrar/save.c @@ -404,7 +404,7 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, goto error; } } - if(sruid_next(&_reg_sruid)<0) + if(sruid_next_safe(&_reg_sruid)<0) goto error; ci.ruid = _reg_sruid.uid; LM_DBG("generated ruid is: %.*s\n", ci.ruid.len, ci.ruid.s);

1 0

git:master:fd30ccf4: usrloc: use sruid_next_safe()
by Daniel-Constantin Mierla 19 Sep '18

19 Sep '18

Module: kamailio Branch: master Commit: fd30ccf4473d43d98cfb0d896c47d4824c089bce URL: https://github.com/kamailio/kamailio/commit/fd30ccf4473d43d98cfb0d896c47d48… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-19T08:11:36+02:00 usrloc: use sruid_next_safe() --- Modified: src/modules/usrloc/ul_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/fd30ccf4473d43d98cfb0d896c47d48… Patch: https://github.com/kamailio/kamailio/commit/fd30ccf4473d43d98cfb0d896c47d48… --- diff --git a/src/modules/usrloc/ul_rpc.c b/src/modules/usrloc/ul_rpc.c index 39d8aa2776..53031799ac 100644 --- a/src/modules/usrloc/ul_rpc.c +++ b/src/modules/usrloc/ul_rpc.c @@ -660,7 +660,7 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) return; } - if(sruid_next(&_ul_sruid)<0) + if(sruid_next_safe(&_ul_sruid)<0) { rpc->fault(ctx, 500, "Can't obtain next uid"); return;

1 0

git:master:06de5083: htable: proper parameter type for sht_setxs() kemi export
by Daniel-Constantin Mierla 18 Sep '18

18 Sep '18

Module: kamailio Branch: master Commit: 06de508301a9dff63c671991d47944ef91cf91d2 URL: https://github.com/kamailio/kamailio/commit/06de508301a9dff63c671991d47944e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-18T14:19:33+02:00 htable: proper parameter type for sht_setxs() kemi export --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/06de508301a9dff63c671991d47944e… Patch: https://github.com/kamailio/kamailio/commit/06de508301a9dff63c671991d47944e… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 8305947641..bd323ac37a 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1687,7 +1687,7 @@ static sr_kemi_t sr_kemi_htable_exports[] = { }, { str_init("htable"), str_init("sht_setxs"), SR_KEMIP_INT, ki_ht_setxs, - { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE } },

1 0

git:master:b3614e8b: ims_charging: In case of tel: URI => type MSISDN, skip the "tel:" from the URI
by Carsten Bock 18 Sep '18

18 Sep '18

Module: kamailio Branch: master Commit: b3614e8b9e4192722a4577a59f071ec93f29664a URL: https://github.com/kamailio/kamailio/commit/b3614e8b9e4192722a4577a59f071ec… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2018-09-18T10:31:57+02:00 ims_charging: In case of tel: URI => type MSISDN, skip the "tel:" from the URI --- Modified: src/modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/b3614e8b9e4192722a4577a59f071ec… Patch: https://github.com/kamailio/kamailio/commit/b3614e8b9e4192722a4577a59f071ec… --- diff --git a/src/modules/ims_charging/ims_ro.c b/src/modules/ims_charging/ims_ro.c index 4e67813362..cd3ae215ae 100644 --- a/src/modules/ims_charging/ims_ro.c +++ b/src/modules/ims_charging/ims_ro.c @@ -1105,6 +1105,8 @@ int Ro_Send_CCR(struct sip_msg *msg, struct dlg_cell *dlg, int dir, int reservat //getting subscription id type if (strncasecmp(subscription_id.s, "tel:", 4) == 0) { subscription_id_type = Subscription_Type_MSISDN; + subscription_id.s += 4; + subscription_id.len -= 4; } else { subscription_id_type = Subscription_Type_IMPU; //default is END_USER_SIP_URI }

1 0

git:master:25cf75d6: ims_registrar_scscf: Copy AOR for lookup, so unlock udomain properly unlocks the domain. Should fix issue Github #1647
by Carsten Bock 18 Sep '18

18 Sep '18

Module: kamailio Branch: master Commit: 25cf75d6a7cc040883ada7bb7988aad0b6dde663 URL: https://github.com/kamailio/kamailio/commit/25cf75d6a7cc040883ada7bb7988aad… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2018-09-18T10:30:05+02:00 ims_registrar_scscf: Copy AOR for lookup, so unlock udomain properly unlocks the domain. Should fix issue Github #1647 --- Modified: src/modules/ims_registrar_scscf/lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/25cf75d6a7cc040883ada7bb7988aad… Patch: https://github.com/kamailio/kamailio/commit/25cf75d6a7cc040883ada7bb7988aad… --- diff --git a/src/modules/ims_registrar_scscf/lookup.c b/src/modules/ims_registrar_scscf/lookup.c index 5489440208..0e7b06cf60 100644 --- a/src/modules/ims_registrar_scscf/lookup.c +++ b/src/modules/ims_registrar_scscf/lookup.c @@ -75,7 +75,7 @@ int lookup(struct sip_msg* _m, udomain_t* _d, char* ue_type_c) { LM_ERR("NULL message!!!\n"); return -1; } - + switch (ue_type_c[0]) { case '3': LM_DBG("looking for 3gpp terminals\n"); @@ -91,8 +91,23 @@ int lookup(struct sip_msg* _m, udomain_t* _d, char* ue_type_c) { ue_type=0; } - if (_m->new_uri.s) aor = _m->new_uri; - else aor = _m->first_line.u.request.uri; + if (_m->new_uri.s) { + aor.s = pkg_malloc(_m->new_uri.len); + if (aor.s == NULL) { + LM_ERR("memory allocation failure\n"); + return -1; + } + memcpy(aor.s, _m->new_uri.s, _m->new_uri.len); + aor.len = _m->new_uri.len; + } else { + aor.s = pkg_malloc(_m->first_line.u.request.uri.len); + if (aor.s == NULL) { + LM_ERR("memory allocation failure\n"); + return -1; + } + memcpy(aor.s, _m->first_line.u.request.uri.s, _m->first_line.u.request.uri.len); + aor.len = _m->first_line.u.request.uri.len; + } for (i = 4; i < aor.len; i++) if (aor.s[i] == ':' || aor.s[i] == ';' || aor.s[i] == '?') { @@ -108,6 +123,7 @@ int lookup(struct sip_msg* _m, udomain_t* _d, char* ue_type_c) { res = ul.get_impurecord(_d, &aor, &r); if (res != 0) { LM_DBG("'%.*s' Not found in usrloc\n", aor.len, ZSW(aor.s)); + pkg_free(aor.s); ul.unlock_udomain(_d, &aor); return -1; } @@ -206,6 +222,7 @@ int lookup(struct sip_msg* _m, udomain_t* _d, char* ue_type_c) { } done: + pkg_free(aor.s); ul.unlock_udomain(_d, &aor); return ret; }

1 0

git:5.1:53bc3a93: core: backported commit f088d2afe4153b9e440a4293211c78f5a25af691 manually
by Juha Heinanen 17 Sep '18

17 Sep '18

Module: kamailio Branch: 5.1 Commit: 53bc3a936d43d0eb23c61b0d1f089c63b437b0e9 URL: https://github.com/kamailio/kamailio/commit/53bc3a936d43d0eb23c61b0d1f089c6… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2018-09-17T18:17:36+03:00 core: backported commit f088d2afe4153b9e440a4293211c78f5a25af691 manually --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/53bc3a936d43d0eb23c61b0d1f089c6… Patch: https://github.com/kamailio/kamailio/commit/53bc3a936d43d0eb23c61b0d1f089c6… --- diff --git a/src/core/receive.c b/src/core/receive.c index cd92ef8cad..fe7bb6eed9 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -137,6 +137,7 @@ int receive_msg(char *buf, unsigned int len, struct receive_info *rcv_info) sr_net_info_t netinfo; sr_kemi_eng_t *keng = NULL; sr_event_param_t evp = {0}; + int errsipmsg = 0; if(sr_event_enabled(SREV_NET_DATA_RECV)) { if(sip_check_fline(buf, len) == 0) { @@ -182,15 +183,22 @@ int receive_msg(char *buf, unsigned int len, struct receive_info *rcv_info) msg_set_time(msg); if(parse_msg(buf, len, msg) != 0) { + errsipmsg = 1; evp.data = (void *)msg; if((ret = sr_event_exec(SREV_RCV_NOSIP, &evp)) < NONSIP_MSG_DROP) { - LOG(cfg_get(core, core_cfg, corelog), - "core parsing of SIP message failed (%s:%d/%d)\n", - ip_addr2a(&msg->rcv.src_ip), (int)msg->rcv.src_port, - (int)msg->rcv.proto); - sr_core_ert_run(msg, SR_CORE_ERT_RECEIVE_PARSE_ERROR); - } else if(ret == NONSIP_MSG_DROP) + LM_DBG("attempt of nonsip message processing failed\n"); + } else if(ret == NONSIP_MSG_DROP) { + LM_DBG("nonsip message processing completed\n"); goto error02; + } + } + if(errsipmsg==1) { + LOG(cfg_get(core, core_cfg, corelog), + "core parsing of SIP message failed (%s:%d/%d)\n", + ip_addr2a(&msg->rcv.src_ip), (int)msg->rcv.src_port, + (int)msg->rcv.proto); + sr_core_ert_run(msg, SR_CORE_ERT_RECEIVE_PARSE_ERROR); + goto error02; } if(parse_headers(msg, HDR_FROM_F | HDR_TO_F | HDR_CALLID_F | HDR_CSEQ_F, 0)

1 0

git:master:f088d2af: core: if nosip msg hooks skip handling the packet, stop sip routing processing
by Daniel-Constantin Mierla 17 Sep '18

17 Sep '18

Module: kamailio Branch: master Commit: f088d2afe4153b9e440a4293211c78f5a25af691 URL: https://github.com/kamailio/kamailio/commit/f088d2afe4153b9e440a4293211c78f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-17T16:18:58+02:00 core: if nosip msg hooks skip handling the packet, stop sip routing processing --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/f088d2afe4153b9e440a4293211c78f… Patch: https://github.com/kamailio/kamailio/commit/f088d2afe4153b9e440a4293211c78f… --- diff --git a/src/core/receive.c b/src/core/receive.c index df8db65ca6..b14ebf8fb9 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -169,6 +169,7 @@ int receive_msg(char *buf, unsigned int len, struct receive_info *rcv_info) sr_event_param_t evp = {0}; unsigned int cidlockidx = 0; unsigned int cidlockset = 0; + int errsipmsg = 0; if(sr_event_enabled(SREV_NET_DATA_RECV)) { if(sip_check_fline(buf, len) == 0) { @@ -214,15 +215,22 @@ int receive_msg(char *buf, unsigned int len, struct receive_info *rcv_info) msg_set_time(msg); if(parse_msg(buf, len, msg) != 0) { + errsipmsg = 1; evp.data = (void *)msg; if((ret = sr_event_exec(SREV_RCV_NOSIP, &evp)) < NONSIP_MSG_DROP) { - LOG(cfg_get(core, core_cfg, corelog), - "core parsing of SIP message failed (%s:%d/%d)\n", - ip_addr2a(&msg->rcv.src_ip), (int)msg->rcv.src_port, - (int)msg->rcv.proto); - sr_core_ert_run(msg, SR_CORE_ERT_RECEIVE_PARSE_ERROR); - } else if(ret == NONSIP_MSG_DROP) + LM_DBG("attempt of nonsip message processing failed\n"); + } else if(ret == NONSIP_MSG_DROP) { + LM_DBG("nonsip message processing completed\n"); goto error02; + } + } + if(errsipmsg==1) { + LOG(cfg_get(core, core_cfg, corelog), + "core parsing of SIP message failed (%s:%d/%d)\n", + ip_addr2a(&msg->rcv.src_ip), (int)msg->rcv.src_port, + (int)msg->rcv.proto); + sr_core_ert_run(msg, SR_CORE_ERT_RECEIVE_PARSE_ERROR); + goto error02; } if(unlikely(parse_headers(msg, HDR_FROM_F | HDR_TO_F | HDR_CALLID_F | HDR_CSEQ_F, 0)

1 0

git:master:9f8e2d43: pkg/kamailio/deb: set version 5.2.0-dev7
by Victor Seva 17 Sep '18

17 Sep '18

Module: kamailio Branch: master Commit: 9f8e2d43b748a9e78f18f748aba6b5965be01808 URL: https://github.com/kamailio/kamailio/commit/9f8e2d43b748a9e78f18f748aba6b59… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-09-17T12:13:23+02:00 pkg/kamailio/deb: set version 5.2.0-dev7 --- 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/9f8e2d43b748a9e78f18f748aba6b59… Patch: https://github.com/kamailio/kamailio/commit/9f8e2d43b748a9e78f18f748aba6b59…

1 0

git:master:6e3e86c2: htable: better handling of unsupported matching operator
by Daniel-Constantin Mierla 17 Sep '18

17 Sep '18

Module: kamailio Branch: master Commit: 6e3e86c2bae81232f73b391d0cd47b5e4415a0b8 URL: https://github.com/kamailio/kamailio/commit/6e3e86c2bae81232f73b391d0cd47b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-17T11:48:37+02:00 htable: better handling of unsupported matching operator --- Modified: src/modules/htable/ht_api.c --- Diff: https://github.com/kamailio/kamailio/commit/6e3e86c2bae81232f73b391d0cd47b5… Patch: https://github.com/kamailio/kamailio/commit/6e3e86c2bae81232f73b391d0cd47b5… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index 1c82e9c7ea..f129c5d48f 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -1398,7 +1398,9 @@ int ht_has_cell_op_str(str *sre, ht_t *ht, int mode, int op) } break; default: - goto notmatched; + ht_slot_unlock(ht, i); + LM_ERR("unsupported matching operator: %d\n", op); + return -1; } } it = it->next; @@ -1416,13 +1418,6 @@ int ht_has_cell_op_str(str *sre, ht_t *ht, int mode, int op) regfree(&re); } return 1; - -notmatched: - ht_slot_unlock(ht, i); - if(op==HT_RM_OP_RE) { - regfree(&re); - } - return -1; } int ht_reset_content(ht_t *ht)

1 0

git:master:13bb3732: htable: use proper variable to set the expire along with the value
by Daniel-Constantin Mierla 17 Sep '18

17 Sep '18

Module: kamailio Branch: master Commit: 13bb3732aff23abbb1ba1114f1697095c09d584c URL: https://github.com/kamailio/kamailio/commit/13bb3732aff23abbb1ba1114f169709… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-17T11:45:15+02:00 htable: use proper variable to set the expire along with the value --- Modified: src/modules/htable/ht_api.c --- Diff: https://github.com/kamailio/kamailio/commit/13bb3732aff23abbb1ba1114f169709… Patch: https://github.com/kamailio/kamailio/commit/13bb3732aff23abbb1ba1114f169709… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index 7f4298c10b..1c82e9c7ea 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -597,8 +597,7 @@ int ht_set_cell_ex(ht_t *ht, str *name, int type, int_str *val, int mode, } /* add */ cell = ht_cell_new(name, type, val, hid); - if(cell == NULL) - { + if(cell == NULL) { LM_ERR("cannot create new cell.\n"); if(mode) ht_slot_unlock(ht, idx); return -1; @@ -606,12 +605,10 @@ int ht_set_cell_ex(ht_t *ht, str *name, int type, int_str *val, int mode, if(exv<=0) { cell->expire = now + ht->htexpire; } else { - it->expire = now + exv; + cell->expire = now + exv; } - if(prev==NULL) - { - if(ht->entries[idx].first!=NULL) - { + if(prev==NULL) { + if(ht->entries[idx].first!=NULL) { cell->next = ht->entries[idx].first; ht->entries[idx].first->prev = cell; }

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
34
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2018