sr-dev April 2018

sr-dev@lists.kamailio.org

19 participants
257 discussions

[kamailio/kamailio] IPOPS is_in_subnet function doesn't match host address in cidr notation (#1250)
by kbdfck 03 Apr '18

03 Apr '18

### Description is_in_subnet function requires subnet param to be network address and fails for host address in cidr notation despite it is contained in corresponding subnet. For example, is_in_subnet("1.2.3.2", "1.2.3.0/30") returns true but is_in_subnet("1.2.3.2", "1.2.3.2/30") returns false, although 1.2.3.2 is present in 1.2.3.2/30 and 1.2.3.2 is allowed IP of 1.2.3.0/30 Of course, "1.2.3.2/30" this is not actually a subnet specification and rather is IP in CIDR notation, but sometimes it is required to check if some IP matches specified IP with CIDR. ### Possible Solutions It would be cool if is_in_subnet take such cases as matches. I think this should not break anything, because host IP and CIDR always define network containing specified host. Another solution would be separate function with more relaxed behavior... This happens on Kamailio 5.1 devel. -- 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/1250

2 2

git:master:1f675c68: ipops: mask subnet address when comparing
by Daniel-Constantin Mierla 03 Apr '18

03 Apr '18

Module: kamailio Branch: master Commit: 1f675c68b3ed2b2e0a497fecd942c9213f0de058 URL: https://github.com/kamailio/kamailio/commit/1f675c68b3ed2b2e0a497fecd942c92… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-03T09:11:37+02:00 ipops: mask subnet address when comparing - allow using full ip address when specifying subnet parameter - more flexibility on using values from sip message - GH #1250 --- Modified: src/modules/ipops/ipops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1f675c68b3ed2b2e0a497fecd942c92… Patch: https://github.com/kamailio/kamailio/commit/1f675c68b3ed2b2e0a497fecd942c92… --- diff --git a/src/modules/ipops/ipops_mod.c b/src/modules/ipops/ipops_mod.c index 2e1e990613..dd783180a6 100644 --- a/src/modules/ipops/ipops_mod.c +++ b/src/modules/ipops/ipops_mod.c @@ -390,7 +390,7 @@ int _ip_is_in_subnet_v4(struct in_addr *ip, char *net, size_t netlen, if (netmask == 32) ipv4_mask = 0xFFFFFFFF; else ipv4_mask = htonl(~(0xFFFFFFFF >> netmask)); - if ((ip->s_addr & ipv4_mask) == net_addr.s_addr) + if ((ip->s_addr & ipv4_mask) == (net_addr.s_addr & ipv4_mask)) return 1; return 0; } @@ -1456,4 +1456,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_ipops_exports); return 0; -} \ No newline at end of file +}

1 0

[kamailio/kamailio] Double SPACE after in the VIA WSS (#1491)
by ovoshlook 02 Apr '18

02 Apr '18

### Description Hi. Seems lime that after WSS in the VIA kamailio adds double SPACE It makes kamailio incompatable with jssip.net (tried 5.1.2 and 5.0.6 versions) Looks like this happens with advertise address added on the interface #### Reproduction Just connect to kamailio via WSS with advertized address and try to make incoming call into WSS client #### Debugging Data I just put this link to JsSIP.net here https://groups.google.com/forum/#!topic/jssip/2lDyqgvZgrY Also here is a string of my VIA header that gives issue SIP/2.0/WSS 1.2.3.4:5061;branch=z9hG4bKd302.4c862421515641e7b59b9f3ba7f8eab4.1 Thant can be checked here https://www.textmagic.com/free-tools/unicode-detector Log INVITE from the browser (only added \r\n at the end of the each string because of notepad++ not shows it after copying): INVITE sip:2hsq8ob4@daotd6p7hil4.invalid;transport=ws SIP/2.0\r\n Record-Route: <sip:1.2.3.4:5061;transport=ws;r2=on;lr;ftag=as7c4d457d;nat=yes>\r\n Record-Route: <sip:1.2.3.4;r2=on;lr;ftag=as7c4d457d;nat=yes>\r\n Via: SIP/2.0/WSS 1.2.3.4:5061;branch=z9hG4bK110e.476a7e8aa7db8de3a4d7b01aed1e7ef5.1\r\n Via: SIP/2.0/UDP 10.1.1.138:5060;rport=5060;branch=z9hG4bK7122bcfb\r\n Max-Forwards: 69\r\n From: "test" <sip:test@10.1.1.138>;tag=as7c4d457d\r\n To: <sip:test2@10.1.1.38:5060>\r\n Contact: <sip:test@10.1.1.138:5060>\r\n Call-ID: 2ec6d77f5a56ca0f59ab0d2118d2f7d5@10.1.1.138:5060\r\n CSeq: 102 INVITE\r\n User-Agent: Asterisk PBX 15.3.0\r\n Date: Mon, 02 Apr 2018 10:30:57 GMT\r\n Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO, PUBLISH, MESSAGE\r\n Supported: replaces, timer\r\n Content-Type: application/sdp\r\n Content-Length: 642\r\n \r\n v=0\r\n o=root 1538180518 1538180518 IN IP4 1.2.3.4\r\n s=Asterisk PBX 15.3.0\r\n c=IN IP4 1.2.3.4\r\n t=0 0\r\n a=group:BUNDLE audio\r\n m=audio 31858 RTP/SAVPF 8 0 101\r\n a=maxptime:150\r\n a=rtpmap:8 PCMA/8000\r\n a=rtpmap:0 PCMU/8000\r\n a=rtpmap:101 telephone-event/8000\r\n a=fmtp:101 0-16\r\n a=sendrecv\r\n a=rtcp:31859\r\n a=rtcp-mux\r\n a=setup:actpass\r\n a=mid:audio\r\n a=fingerprint:sha-1 95:6F:40:F2:76:B3:E3:1E:DA:29:04:60:F1:F7:0A:DA:5E:D4:67:9F\r\n a=ice-ufrag:eSuU9ztd\r\n a=ice-pwd:j693abw9QWiaX81TlbvyHBD8FU\r\n a=candidate:5Qp8pvPCHLmm6iUU 1 UDP 2130706431 1.2.3.4 31858 typ host\r\n a=candidate:5Qp8pvPCHLmm6iUU 2 UDP 2130706430 1.2.3.4 31859 typ host\r\n Actually i did not found any information about is it MUST be only one sace at the Grammar of SIP message based on RFC 2234 but I may be wrong. ``` #### 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/1491

2 5

git:master:5362d0f7: dialog: merged functions related to loading records from db
by Daniel-Constantin Mierla 02 Apr '18

02 Apr '18

Module: kamailio Branch: master Commit: 5362d0f78ef1542a882b96bc1b04285d1b2e69c1 URL: https://github.com/kamailio/kamailio/commit/5362d0f78ef1542a882b96bc1b04285… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-02T17:57:42+02:00 dialog: merged functions related to loading records from db - select operation was done in a dedicated function without a good reason, result being processed in another one --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/5362d0f78ef1542a882b96bc1b04285… Patch: https://github.com/kamailio/kamailio/commit/5362d0f78ef1542a882b96bc1b04285…

1 0

[kamailio/kamailio] Segmentation fault Dialog RPC (#1482)
by pars3c1 02 Apr '18

02 Apr '18

### Description Hi all, i’m using kamailio 4.4.6 , and when I call the rpc dialog “profile_list_dlgs” , sometimes I have a segmentation fault. Can you help me to understand why it happened ? Thanks for your support  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` This is the dump: Program terminated with signal 11, Segmentation fault. #0 0x00007f49ee062e07 in internal_rpc_print_dlg (rpc=0x7f49ed99e9c0, c=0x7f49ed99e960, dlg=0x7f49ef89ba38, with_context=0) at dialog.c:1548 1548 if (pl->profile->has_value) { Missing separate debuginfos, use: debuginfo-install glibc-2.12-1.192.el6.x86_64 keyutils-libs-1.4-5.el6.x86_64 krb5-libs-1.10.3-57.el6.x86_64 libcom_err-1.41.12-22.el6.x86_64 libselinux-2.0.94-7.el6.x86_64 libxml2-2.7.6-21.el6_8.1.x86_64 lua-5.1.4-4.1.el6.x86_64 mysql-libs-5.1.73-7.el6.x86_64 nss-softokn-freebl-3.14.3-23.3.el6_8.x86_64 openssl-1.0.1e-48.el6_8.3.x86_64 zlib-1.2.3-29.el6.x86_64 (gdb) bt full #0 0x00007f49ee062e07 in internal_rpc_print_dlg (rpc=0x7f49ed99e9c0, c=0x7f49ed99e960, dlg=0x7f49ef89ba38, with_context=0) at dialog.c:1548 rpc_cb = {rpc = 0x3031ea0, c = 0x400} h = 0x2d21e60 sh = 0x2d1db70 ssh = 0x2d20050 pl = 0x7f49ef18c588 var = 0x0 __FUNCTION__ = "internal_rpc_print_dlg" #1 0x00007f49ee0637b3 in internal_rpc_profile_print_dlgs (rpc=0x7f49ed99e9c0, c=0x7f49ed99e960, profile_name=0x7fff65fcb1a0, value=0x0) at dialog.c:1681 profile = 0x7f49ee5aca88 ph = 0x7f49eeb5b670 i = 2 #2 0x00007f49ee063e64 in rpc_profile_print_dlgs (rpc=0x7f49ed99e9c0, c=0x7f49ed99e960) at dialog.c:1785 profile_name = {s = 0x3031e80 "outbound", len = 8} value = {s = 0x0, len = 0} #3 0x00007f49ed78960f in jsonrpc_dispatch (msg=0x7fff65fcc5a0, s1=0x0, s2=0x0) at jsonrpc-s_mod.c:1098 rpce = 0x7f4a13212d30 ctx = 0x7f49ed99e960 ret = 0 nj = 0x3031ab0 val = {s = 0x3032030 "dlg.profile_list", len = 16} __FUNCTION__ = "jsonrpc_dispatch" #4 0x000000000041f75d in do_action (h=0x7fff65fcc4c0, a=0x7f4a13189e28, msg=0x7fff65fcc5a0) at action.c:1054 ``` #### Log Messages  ``` the result to the commands p *pl and p *pl->profile #0 0x00007f49ee062e07 in internal_rpc_print_dlg (rpc=0x7f49ed99e9c0, c=0x7f49ed99e960, dlg=0x7f49ef89ba38, with_context=0) at dialog.c:1548 1548 if (pl->profile->has_value) { Missing separate debuginfos, use: debuginfo-install glibc-2.12-1.192.el6.x86_64 keyutils-libs-1.4-5.el6.x86_64 krb5-libs-1.10.3-57.el6.x86_64 libcom_err-1.41.12-22.el6.x86_64 libselinux-2.0.94-7.el6.x86_64 libxml2-2.7.6-21.el6_8.1.x86_64 lua-5.1.4-4.1.el6.x86_64 mysql-libs-5.1.73-7.el6.x86_64 nss-softokn-freebl-3.14.3-23.3.el6_8.x86_64 openssl-1.0.1e-48.el6_8.3.x86_64 zlib-1.2.3-29.el6.x86_64 (gdb) p *pl $1 = {hash_linker = {value = {s = 0x113ef180024 <Address 0x113ef180024 out of bounds>, len = -277948848}, dlg = 0x7f49ef18c5b8, puid = "\n\000\000\000-5a9\303\305\030\357I\177\000\000S\000\000\000\060\062\060\063in_routing\000CR=6@", puid_len = 1598313555, expires = 3977578104333875508, flags = 876097589, linker = 0x422d30263936313d, next = 0x3d50542c36343d4f, prev = 0x52542c3634303730, hash = 1028345429}, next = 0x50542c36343d4f42, profile = 0x542c36343037303d} (gdb) p *pl->profile Cannot access memory at address 0x542c36343037303d ``` #### 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/1482

2 5

git:master:6d2312b8: topos: skip local generated request not part of a dialog
by Daniel-Constantin Mierla 02 Apr '18

02 Apr '18

Module: kamailio Branch: master Commit: 6d2312b8b0913f2f48e0f951c9578924e1d14f1d URL: https://github.com/kamailio/kamailio/commit/6d2312b8b0913f2f48e0f951c957892… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-02T08:46:09+02:00 topos: skip local generated request not part of a dialog --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6d2312b8b0913f2f48e0f951c957892… Patch: https://github.com/kamailio/kamailio/commit/6d2312b8b0913f2f48e0f951c957892… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index ec960d0a44..558fd9853d 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -399,6 +399,13 @@ int tps_msg_sent(sr_event_param_t *evp) local = 1; } + if(local==1 && dialog==0) { + if((get_cseq(&msg)->method_id) & (METHOD_OPTIONS|METHOD_NOTIFY)) { + /* skip local out-of-dialog requests (e.g., keepalive) */ + goto done; + } + } + tps_request_sent(&msg, dialog, local); } else { /* reply */

1 0

git:master:127beb37: sqlops: exported sql_query_async() to kemi framework
by Daniel-Constantin Mierla 01 Apr '18

01 Apr '18

Module: kamailio Branch: master Commit: 127beb37ff647bc721407b9fa1d5cd61c20dd17d URL: https://github.com/kamailio/kamailio/commit/127beb37ff647bc721407b9fa1d5cd6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-31T13:09:25+02:00 sqlops: exported sql_query_async() to kemi framework --- Modified: src/modules/sqlops/sqlops.c --- Diff: https://github.com/kamailio/kamailio/commit/127beb37ff647bc721407b9fa1d5cd6… Patch: https://github.com/kamailio/kamailio/commit/127beb37ff647bc721407b9fa1d5cd6… --- diff --git a/src/modules/sqlops/sqlops.c b/src/modules/sqlops/sqlops.c index dbad0c78c3..d2d20cc7df 100644 --- a/src/modules/sqlops/sqlops.c +++ b/src/modules/sqlops/sqlops.c @@ -452,6 +452,24 @@ static int ki_sqlops_query(sip_msg_t *msg, str *scon, str *squery, str *sres) return sqlops_do_query(scon, squery, sres); } +static int ki_sqlops_query_async(sip_msg_t *msg, str *scon, str *squery) +{ + sql_con_t *con = NULL; + + if (scon == NULL || scon->s == NULL || scon->len<=0) { + LM_ERR("invalid connection name\n"); + return -1; + } + + con = sql_get_connection(scon); + if(con==NULL) { + LM_ERR("invalid connection [%.*s]\n", scon->len, scon->s); + return -1; + } + + return sql_do_query_async(con, squery); +} + static int ki_sqlops_reset_result(sip_msg_t *msg, str *sres) { sqlops_reset_result(sres); @@ -508,6 +526,11 @@ static sr_kemi_t sr_kemi_sqlops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("sqlops"), str_init("sql_query_async"), + SR_KEMIP_INT, ki_sqlops_query_async, + { SR_KEMIP_STR, SR_KEMIP_STR, 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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2018