sr-dev June 2021

sr-dev@lists.kamailio.org

15 participants
312 discussions

git:5.5:d1c83128: dmq: warning about protocol made info

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: d1c831288746bac7850343da10ae02099cb7c80d URL: https://github.com/kamailio/kamailio/commit/d1c831288746bac7850343da10ae020… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-10T12:27:42+02:00 dmq: warning about protocol made info (cherry picked from commit b775bbdff501de0ca1f1a0bc1ab39a3b790c166f) --- Modified: src/modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/d1c831288746bac7850343da10ae020… Patch: https://github.com/kamailio/kamailio/commit/d1c831288746bac7850343da10ae020… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index 1db7cdd1f4..817fc3f3bb 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -161,7 +161,7 @@ static int make_socket_str_from_uri(struct sip_uri *uri, str *socket) } if(get_valid_proto_string(uri->proto, 0, 0, &sproto)<0) { - LM_WARN("unknown transport protocol - fall back to udp\n"); + LM_INFO("unknown transport protocol - fall back to udp\n"); sproto.s = "udp"; sproto.len = 3; }

3 years, 5 months

git:5.5:18e85c98: pv: test for HDR_ERROR_T after header name parsing

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 18e85c98bb6eebf9afe83aaa0a832d1c4af46e62 URL: https://github.com/kamailio/kamailio/commit/18e85c98bb6eebf9afe83aaa0a832d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-10T12:27:18+02:00 pv: test for HDR_ERROR_T after header name parsing (cherry picked from commit c264fbc66a4690b073c72ffa8fc095227ce0ae8b) --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/18e85c98bb6eebf9afe83aaa0a832d1… Patch: https://github.com/kamailio/kamailio/commit/18e85c98bb6eebf9afe83aaa0a832d1… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 103f9dd5ec..6ead708037 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3274,8 +3274,8 @@ int pv_parse_hdr_name(pv_spec_p sp, str *in) s.s = p; s.len = in->len+1; - if (parse_hname2_short(s.s, s.s + s.len, &hdr)==0) - { + parse_hname2_short(s.s, s.s + s.len, &hdr); + if(hdr.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", s.len, s.s); goto error; }

3 years, 5 months

git:5.5:b6428ca8: dialog: safety checks for bind addr fields

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: b6428ca86c821ddf74fd4ea8a17aecdce39934f4 URL: https://github.com/kamailio/kamailio/commit/b6428ca86c821ddf74fd4ea8a17aecd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-10T12:27:02+02:00 dialog: safety checks for bind addr fields - they can be null on non-local sockets - GH #2757 (cherry picked from commit 490ae559d2b77b13b3f3831e7ff1aa58980e4086) --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/b6428ca86c821ddf74fd4ea8a17aecd… Patch: https://github.com/kamailio/kamailio/commit/b6428ca86c821ddf74fd4ea8a17aecd… --- diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index 1bfcb2cad7..b6a49da2a4 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -802,6 +802,7 @@ int update_dialog_dbinfo_unsafe(struct dlg_cell * cell) int i; struct dlg_var *var; srjson_doc_t jdoc; + str sempty = str_init(""); db_val_t values[DIALOG_TABLE_COL_NO]; @@ -870,14 +871,25 @@ int update_dialog_dbinfo_unsafe(struct dlg_cell * cell) SET_STR_VALUE(values+6, cell->tag[DLG_CALLEE_LEG]); SET_PROPER_NULL_FLAG(cell->tag[DLG_CALLEE_LEG], values, 6); - LM_DBG("caller sock_info is %.*s, callee sock_info is %.*s\n", - cell->bind_addr[DLG_CALLER_LEG]->sock_str.len, - cell->bind_addr[DLG_CALLER_LEG]->sock_str.s, - cell->bind_addr[DLG_CALLEE_LEG]->sock_str.len, - cell->bind_addr[DLG_CALLEE_LEG]->sock_str.s); - SET_STR_VALUE(values+7, cell->bind_addr[DLG_CALLER_LEG]->sock_str); - SET_STR_VALUE(values+8, cell->bind_addr[DLG_CALLEE_LEG]->sock_str); + if(cell->bind_addr[DLG_CALLER_LEG]) { + LM_DBG("caller sock_info is %.*s\n", + cell->bind_addr[DLG_CALLER_LEG]->sock_str.len, + cell->bind_addr[DLG_CALLER_LEG]->sock_str.s); + SET_STR_VALUE(values+7, cell->bind_addr[DLG_CALLER_LEG]->sock_str); + } else { + LM_DBG("no caller sock_info\n"); + SET_STR_VALUE(values+7, sempty); + } + if(cell->bind_addr[DLG_CALLEE_LEG]) { + LM_DBG("callee sock_info is %.*s\n", + cell->bind_addr[DLG_CALLEE_LEG]->sock_str.len, + cell->bind_addr[DLG_CALLEE_LEG]->sock_str.s); + SET_STR_VALUE(values+8, cell->bind_addr[DLG_CALLEE_LEG]->sock_str); + } else { + LM_DBG("no callee sock_info\n"); + SET_STR_VALUE(values+8, sempty); + } SET_STR_VALUE(values+12, cell->cseq[DLG_CALLER_LEG]); SET_STR_VALUE(values+13, cell->cseq[DLG_CALLEE_LEG]);

3 years, 5 months

git:5.5:b5041e2c: core: kemi - check hdr type HDR_ERROR_T after parsing

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: b5041e2c4a44843318fcd69d092342e2b29532f4 URL: https://github.com/kamailio/kamailio/commit/b5041e2c4a44843318fcd69d092342e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-10T12:25:21+02:00 core: kemi - check hdr type HDR_ERROR_T after parsing (cherry picked from commit 785bbaa0f16f83353ad1d776816f439608a67858) --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/b5041e2c4a44843318fcd69d092342e… Patch: https://github.com/kamailio/kamailio/commit/b5041e2c4a44843318fcd69d092342e… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 0932339996..64d23296dc 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1988,7 +1988,8 @@ static int sr_kemi_hdr_append_after(sip_msg_t *msg, str *txt, str *hname) hbuf[hname->len] = ':'; hbuf[hname->len+1] = '\0'; - if (parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm)==0) { + parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm); + if(hfm.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", hname->len, hname->s); return -1; } @@ -2056,7 +2057,8 @@ int sr_kemi_hdr_remove(sip_msg_t *msg, str *hname) hbuf[hname->len] = ':'; hbuf[hname->len+1] = '\0'; - if (parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm)==0) { + parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm); + if(hfm.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", hname->len, hname->s); return -1; } @@ -2106,7 +2108,8 @@ static int sr_kemi_hdr_is_present(sip_msg_t *msg, str *hname) hbuf[hname->len] = ':'; hbuf[hname->len+1] = '\0'; - if (parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm)==0) { + parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm); + if(hfm.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", hname->len, hname->s); return -1; } @@ -2188,7 +2191,8 @@ static int sr_kemi_hdr_insert_before(sip_msg_t *msg, str *txt, str *hname) hbuf[hname->len] = ':'; hbuf[hname->len+1] = '\0'; - if (parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm)==0) { + parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm); + if(hfm.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", hname->len, hname->s); return -1; } @@ -2305,7 +2309,8 @@ static sr_kemi_xval_t* sr_kemi_hdr_get_mode(sip_msg_t *msg, str *hname, int idx, sr_kemi_xval_null(&_sr_kemi_xval, rmode); return &_sr_kemi_xval; } - if (parse_hname2_str(hname, &shdr)==0) { + parse_hname2_str(hname, &shdr); + if(shdr.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", hname->len, hname->s); sr_kemi_xval_null(&_sr_kemi_xval, rmode); return &_sr_kemi_xval; @@ -2426,7 +2431,8 @@ static int sr_kemi_hdr_match_content(sip_msg_t *msg, str *hname, str *op, return SR_KEMI_FALSE; } - if (parse_hname2_str(hname, &hfm)==0) { + parse_hname2_str(hname, &hfm); + if(hfm.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", hname->len, hname->s); return SR_KEMI_FALSE; }

3 years, 5 months

git:master:90fa160b: kamctl: update name to globalblocklist in EXTRA_TABLES

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 90fa160b5d4a7155fc3d82f39932ac0e9d74fae7 URL: https://github.com/kamailio/kamailio/commit/90fa160b5d4a7155fc3d82f39932ac0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-10T12:15:29+02:00 kamctl: update name to globalblocklist in EXTRA_TABLES - GH #2773 --- Modified: utils/kamctl/kamctlrc Modified: utils/kamctl/kamdbctl.base --- Diff: https://github.com/kamailio/kamailio/commit/90fa160b5d4a7155fc3d82f39932ac0… Patch: https://github.com/kamailio/kamailio/commit/90fa160b5d4a7155fc3d82f39932ac0… --- diff --git a/utils/kamctl/kamctlrc b/utils/kamctl/kamctlrc index 03232be783..db703c6ed8 100644 --- a/utils/kamctl/kamctlrc +++ b/utils/kamctl/kamctlrc @@ -123,7 +123,7 @@ # dialplan" ## Kamailio extra modules -# EXTRA_MODULES="imc cpl siptrace domainpolicy carrierroute userblacklist htable purple sca" +# EXTRA_MODULES="imc cpl siptrace domainpolicy carrierroute userblocklist htable purple sca" ## type of aliases used: DB - database aliases; UL - usrloc aliases diff --git a/utils/kamctl/kamdbctl.base b/utils/kamctl/kamdbctl.base index 4cfd11c4f9..093334c024 100644 --- a/utils/kamctl/kamdbctl.base +++ b/utils/kamctl/kamdbctl.base @@ -40,7 +40,7 @@ STANDARD_TABLES=${STANDARD_TABLES:-'version acc dbaliases domain domain_attrs acc_cdrs topos_d topos_t'} EXTRA_TABLES=${EXTRA_TABLES:-'imc_members imc_rooms cpl sip_trace domainpolicy carrierroute carrier_name domain_name carrierfailureroute userblocklist - globalblacklist htable purplemap uacreg pl_pipes mtree mtrees + globalblocklist htable purplemap uacreg pl_pipes mtree mtrees sca_subscriptions mohqcalls mohqueues rtpproxy rtpengine dr_gateways dr_rules dr_gw_lists dr_groups secfilter'} PRESENCE_TABLES=${PRESENCE_TABLES:-'presentity active_watchers watchers xcap

3 years, 5 months

[kamailio/kamailio] siptrace: fixed IPv6 without brackets (#2775)

by sergey-safarov

#### 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: - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Fixed socket addr like `udp:::1:2345` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2775 -- Commit Summary -- * siptrace: fixed IPv6 without brackets -- File Changes -- M src/modules/siptrace/siptrace.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2775.patch https://github.com/kamailio/kamailio/pull/2775.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/2775

3 years, 5 months

git:master:417eb2a7: siptrace: fixed IPv6 without brackets

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 417eb2a7052a9354712663cca9e3bc075a3f69c0 URL: https://github.com/kamailio/kamailio/commit/417eb2a7052a9354712663cca9e3bc0… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-10T12:05:49+02:00 siptrace: fixed IPv6 without brackets more details GH #2775 --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/417eb2a7052a9354712663cca9e3bc0… Patch: https://github.com/kamailio/kamailio/commit/417eb2a7052a9354712663cca9e3bc0… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 89a0618d02..13cc220457 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2133,7 +2133,7 @@ int siptrace_net_data_recv(sr_event_param_t *evp) sto.fromip.len = snprintf(sto.fromip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", siptrace_proto_name(nd->rcv->proto), - ip_addr2a(&nd->rcv->src_ip), (int)nd->rcv->src_port); + ip_addr2strz(&nd->rcv->src_ip), (int)nd->rcv->src_port); if(sto.fromip.len<0 || sto.fromip.len>=SIPTRACE_ADDR_MAX) { LM_ERR("failed to format toip buffer (%d)\n", sto.fromip.len); sto.fromip.s = SIPTRACE_ANYADDR; @@ -2143,7 +2143,7 @@ int siptrace_net_data_recv(sr_event_param_t *evp) } sto.toip.len = snprintf(sto.toip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", - siptrace_proto_name(nd->rcv->proto), ip_addr2a(&nd->rcv->dst_ip), + siptrace_proto_name(nd->rcv->proto), ip_addr2strz(&nd->rcv->dst_ip), (int)nd->rcv->dst_port); if(sto.toip.len<0 || sto.toip.len>=SIPTRACE_ADDR_MAX) { LM_ERR("failed to format toip buffer (%d)\n", sto.toip.len);

3 years, 5 months

Re: [sr-dev] [SR-Users] Releasing Kamailio v5.5.1

by RDB Programmer

Daniel, Will this release include the latest changes to mohqueue <https://github.com/kamailio/kamailio/tree/master/src/modules/mohqueue> that I pushed to the master on May 19? Bob > From: Daniel-Constantin Mierla <miconda(a)gmail.com> > Date: Wed, Jun 9, 2021 at 6:00 AM > Subject: [SR-Users] Releasing Kamailio v5.5.1 > To: Kamailio (SER) - Devel Mailing List <sr-dev(a)lists.kamailio.org>, > Kamailio (SER) - Users Mailing List <sr-users(a)lists.kamailio.org> > > > Hello, > > I am considering to release Kamailio v5.5.1 sometime next week, likely > on Tuesday or Wednesday (June 15 or 16, 2021). This is the usual heads up > notification to see if anyone is aware of issues not yet reported to bug > tracker and if yes, do it as soon as possible to give them a chance to > be fixed. > > Cheers, > Daniel > > -- > Daniel-Constantin Mierla -- www.asipto.com > www.twitter.com/miconda -- www.linkedin.com/in/miconda > > > > __________________________________________________________ > Kamailio - Users Mailing List - Non Commercial Discussions > * sr-users(a)lists.kamailio.org > Important: keep the mailing list in the recipients, do not reply only to > the sender! > Edit mailing list options or unsubscribe: > * https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users >

3 years, 5 months

[kamailio/kamailio] tcpops fixup failure (#2772)

by Julien Chavanton

### Description Kamailio does not start when doing fixup for tcpops. ``` tcp_keepalive_enable("$avp(caller_conid)", "60", "5", "2"); ``` ``` 0(1) ERROR: <core> [core/route.c:1166]: fix_actions(): fixing failed (code=-1) at cfg:/etc/kamailio/kamailio.cfg:160 ``` ### Troubleshooting I will try reverting the following commits ``` commit 02240711239149e2f5c4890a70ab158d10fa8187 Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 8 23:30:22 2021 +0200 tcpops: use fixup_igp_all() instead of fixup_igp_null() - needed for functions with many parameters commit 12fca1c369b6698cace66de171dcb166be8ae831 Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue May 4 13:30:21 2021 +0200 tcpops: use fixup function from core, remove internal wrapper - set also fixup free function in cmd exports ``` -- 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/2772

3 years, 5 months

git:master:5d03c923: core: kemi - added KSR.is_WSX() - return true of proto is WS or WSS

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5d03c9235f79ce4af35b6f79eddebae9f512f1d3 URL: https://github.com/kamailio/kamailio/commit/5d03c9235f79ce4af35b6f79eddebae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-09T14:48:19+02:00 core: kemi - added KSR.is_WSX() - return true of proto is WS or WSS --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/5d03c9235f79ce4af35b6f79eddebae… Patch: https://github.com/kamailio/kamailio/commit/5d03c9235f79ce4af35b6f79eddebae… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index bee8a98f07..065eba9c2c 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1155,6 +1155,18 @@ static int sr_kemi_core_is_proto_wss(sip_msg_t *msg) return (msg->rcv.proto == PROTO_WSS)?SR_KEMI_TRUE:SR_KEMI_FALSE; } +/** + * + */ +static int sr_kemi_core_is_proto_wsx(sip_msg_t *msg) +{ + if (msg->rcv.proto == PROTO_WSS) return SR_KEMI_TRUE; + if (msg->rcv.proto == PROTO_WS) return SR_KEMI_TRUE; + + return SR_KEMI_FALSE; +} + + /** * */ @@ -1888,6 +1900,11 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init(""), str_init("is_WSX"), + SR_KEMIP_BOOL, sr_kemi_core_is_proto_wsx, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init(""), str_init("is_SCTP"), SR_KEMIP_BOOL, sr_kemi_core_is_proto_sctp, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

3 years, 5 months

← Newer
1
...
21
22
23
24
25
26
27
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2021