sr-dev March 2019

sr-dev@lists.kamailio.org

28 participants
323 discussions

[kamailio/kamailio] Unwanted INVITE while using TMCB_ACK_NEG_IN callback (#1871)
by Ionut Ionita 13 Mar '19

13 Mar '19

I am trying to catch all messages belonging to a transaction in siptrace module. To achieve this I am registering TMCB_REQUEST_SENT, TMCB_RESPONSE_IN, TMCB_RESPONSE_SENT and TMCB_ACK_NEG_IN callbacks each time sip_trace() is called from the script. 2xx INVITE transactions are traced ok but I'm having issue in the following scenario: UAC KAMAILIO UAS --------------INVITE(1)-------> <--------------100(2)------- --------------INVITE(3)-------> <--------------491(4)---------- --------------ACK(5)----------> <--------------491(6)---------- --------------ACK(7)----------> ### Troubleshooting As I said I am registering a callback for TMCB_ACK_NEG_IN and as expected message # 7 is traced, but the callback is also called once more, for message # 4 as I understand from the trace. After investigation, the place in tm from where the callback is called is t_reply.c:2290 in reply received, just after the ACK is sent to UAS. #### Reproduction  To reproduce the issue register a TMCB_ACK_NEG_IN in any kamailio module and create a scenario in which KAMAILIO will issue a hop-by-hop ACK. #### Debugging Data  This dump is generated with abort from the callback. ``` #0 0x00007f6f16a77428 in __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:54 resultvar = 0 pid = 12031 selftid = 12031 #1 0x00007f6f16a7902a in __GI_abort () at abort.c:89 save_stage = 2 act = {__sigaction_handler = {sa_handler = 0x7becee, sa_sigaction = 0x7becee}, sa_mask = {__val = { 140114966526974, 140722638021392, 140115098302455, 140115090541944, 206158430256, 140722638021232, 140722638021008, 140722638021024, 18, 0, 12031, 8121608, 140115075184984, 0, 0, 34359738368}}, sa_flags = 248410608, sa_restorer = 0x0} sigs = {__val = {32, 0 <repeats 15 times>}} #2 0x00007f6f0ecc4c04 in trace_tm_neg_ack_in (t=0x7f6f0f1bcc68, type=4096, ps=0x7ffc8ad9e450) at siptrace.c:1466 __func__ = "trace_tm_neg_ack_in" #3 0x00007f6f1542be24 in run_trans_callbacks_internal (cb_lst=0x7f6f0f1bcce0, type=4096, trans=0x7f6f0f1bcc68, params=0x7ffc8ad9e450) at t_hooks.c:260 cbp = 0x7f6f0f1bc9f8 backup_from = 0xae6370 <def_list+16> backup_to = 0xae6378 <def_list+24> backup_dom_from = 0xae6380 <def_list+32> backup_dom_to = 0xae6388 <def_list+40> backup_uri_from = 0xae6360 <def_list> backup_uri_to = 0xae6368 <def_list+8> backup_xavps = 0xb2ea00 <_xavp_list_head> __func__ = "run_trans_callbacks_internal" #4 0x00007f6f1542c0d7 in run_trans_callbacks_off_params (type=4096, trans=0x7f6f0f1bcc68, p=0x7ffc8ad9e450) at t_hooks.c:315 No locals. #5 0x00007f6f153e1fb2 in reply_received (p_msg=0x7f6f1633c478) at t_reply.c:2291 msg_status = 491 last_uac_status = 0 ack = 0x7f6f0f1c0660 "ACK sip:49721555789@127.0.0.1:5062 SIP/2.0\r\nVia: SIP/2.0/UDP 127.0.0.1;branch=z9hG4bK625b.8be9496fad933213a6fef88939ddcf84.0\r\nFrom: freenet.testaccount.45 <sip:freenet.testaccount.45@voip-test.test".---Type <return> to continue, or q <return> to quit--- .. ack_len = 343 branch = 0 reply_status = 3 onreply_route = 1 cancel_data = {cancel_bitmap = 0, reason = {cause = 0, u = {text = {s = 0x0, len = 7041898}, e2e_cancel = 0x0, packed_hdrs = {s = 0x0, len = 7041898}}}} uac = 0x7f6f0f1bce78 t = 0x7f6f0f1bcc68 lack_dst = {send_sock = 0xa79a56 <buf+406>, to = {s = {sa_family = 39442, sa_data = "\247\000\000\000\000\000\060\345ي\374\177\000"}, sin = {sin_family = 39442, sin_port = 167, sin_addr = {s_addr = 0}, sin_zero = "0\345ي\374\177\000"}, sin6 = { sin6_family = 39442, sin6_port = 167, sin6_flowinfo = 0, sin6_addr = {__in6_u = { __u6_addr8 = "0\345ي\374\177\000\000\022\254k\000\000\000\000", __u6_addr16 = {58672, 35545, 32764, 0, 44050, 107, 0, 0}, __u6_addr32 = {2329535792, 32764, 7056402, 0}}}, sin6_scope_id = 8500896}}, id = 0, proto = -48 '\320', send_flags = {f = 5684, blst_imask = 32623}} backup_user_from = 0x1 backup_user_to = 0x6 backup_domain_from = 0x7ffc8ad9e650 backup_domain_to = 0x7f6f16a977f7 <__fprintf+135> backup_uri_from = 0xa79a0a <buf+330> backup_uri_to = 0x4 backup_xavps = 0xa6008 replies_locked = 1 branch_ret = 0 prev_branch = 0 blst_503_timeout = 12031 hf = 0x6a00f4 <qm_info+46> onsend_params = {req = 0x7f6f0f1beb30, rpl = 0x7f6f1633c478, param = 0x7f6f0f1bca08, code = -2, flags = 2, branch = 0, t_rbuf = 0x7f6f0f1bce88, dst = 0x7f6f0f1bced8, send_buf = { s = 0x7f6f0f1c0660 "ACK sip:49721555789@127.0.0.1:5062 SIP/2.0\r\nVia: SIP/2.0/UDP 127.0.0.1;branch=z9hG4bK625b.8be9496fad933213a6fef88939ddcf84.0\r\nFrom: freenet.testaccount.45 <sip:freenet.testaccount.45@test---Type <return> to continue, or q <return> to quit--- "..., len = 343}} ctx = {rec_lev = 10984022, run_flags = 0, last_retcode = 10983946, jmp_env = {{__jmpbuf = {32394306984, 140114718097409, 10984022, 10983954, 10983948, 7270476, 8500896, 4}, __mask_was_saved = 10983940, __saved_mask = {__val = {1, 10983946, 6, 10983948, 7270406, 679888, 1064904, 1068184, 8, 70, 8121608, 10983948, 140115090286248, 10984022, 10983940, 140722638022224}}}}} bctx = 0x3000000030 keng = 0x0 __func__ = "reply_received" ``` #### SIP Traffic  ``` INVITE sip:49721555789@127.0.0.1 SIP/2.0 Via: SIP/2.0/UDP 127.0.0.1:5061;branch=z9hG4bK-4313-1-0 From: freenet.testaccount.45 <sip:freenet.testaccount.45@xxxxxxxxxxxx:5061>;tag=1 To: <sip:49721555789@xxxxxxxxxxxxx> Call-ID: 1-4313(a)127.0.0.1 CSeq: 2 INVITE Contact: sip:49721555789@127.0.0.1:5061 Max-Forwards: 70 Content-Length: 0 X-Siptrace-Fromip: udp:127.0.0.1:5061 X-Siptrace-Toip: udp:127.0.0.1:5060 X-Siptrace-Time: 1551199601 871170 X-Siptrace-Method: INVITE X-Siptrace-Dir: in SIP/2.0 100 trying -- your call is important to us Via: SIP/2.0/UDP 127.0.0.1:5061;branch=z9hG4bK-4313-1-0 From: freenet.testaccount.45 <sip:freenet.testaccount.45@xxxxxxxxxxxxxx:5061>;tag=1 To: <sip:49721555789@xxxxxxxxxxxxxxxxx> Call-ID: 1-4313(a)127.0.0.1 CSeq: 2 INVITE Server: kamailio (5.3.0-dev2 (x86_64/linux)) Content-Length: 0 X-Siptrace-Fromip: udp:127.0.0.1:5060 X-Siptrace-Toip: udp:127.0.0.1:5061 X-Siptrace-Time: 1551199601 871872 X-Siptrace-Method: INVITE X-Siptrace-Dir: out INVITE sip:49721555789@127.0.0.1:5062 SIP/2.0 Record-Route: <sip:127.0.0.1;lr;did=959.7082> Via: SIP/2.0/UDP 127.0.0.1;branch=z9hG4bKd89f.a1985a4b6648b7b274edce82de763f18.0 Via: SIP/2.0/UDP 127.0.0.1:5061;branch=z9hG4bK-4313-1-0 From: freenet.testaccount.45 <sip:freenet.testaccount.45@xxxxxxxxxxxxxxxxxx:5061>;tag=1 To: <sip:49721555789@xxxxxxxxxxxxxxxxxxx> Call-ID: 1-4313(a)127.0.0.1 CSeq: 2 INVITE Contact: sip:49721555789@127.0.0.1:5061 Max-Forwards: 69 Content-Length: 0 X-Siptrace-Fromip: udp:127.0.0.1:5060 X-Siptrace-Toip: udp:127.0.0.1:5062 X-Siptrace-Time: 1551199601 872145 X-Siptrace-Method: INVITE X-Siptrace-Dir: out SIP/2.0 491 Irgendwas1 Via: SIP/2.0/UDP 127.0.0.1;branch=z9hG4bKd89f.a1985a4b6648b7b274edce82de763f18.0, SIP/2.0/UDP 127.0.0.1:5061;branch=z9hG4bK-4313-1-0 From: freenet.testaccount.45 <sip:freenet.testaccount.45@voip-test.1und1.de:5061>;tag=1 To: <sip:49721555789@voip-test.1und1.de>;tag=1 Call-ID: 1-4313(a)127.0.0.1 CSeq: 2 INVITE Contact: <sip:127.0.0.1:5062;transport=UDP> Content-Length: 0 X-Siptrace-Fromip: udp:127.0.0.1:5062 X-Siptrace-Toip: udp:127.0.0.1:5060 X-Siptrace-Time: 1551199601 872350 X-Siptrace-Method: INVITE X-Siptrace-Dir: in ACK sip:49721555789@127.0.0.1:5062 SIP/2.0 Via: SIP/2.0/UDP 127.0.0.1;branch=z9hG4bKd89f.a1985a4b6648b7b274edce82de763f18.0 From: freenet.testaccount.45 <sip:freenet.testaccount.45@voip-test.1und1.de:5061>;tag=1 To: <sip:49721555789@voip-test.1und1.de>;tag=1 Call-ID: 1-4313(a)127.0.0.1 CSeq: 2 ACK Max-Forwards: 69 Content-Length: 0 X-Siptrace-Fromip: udp:127.0.0.1:5060 X-Siptrace-Toip: udp:127.0.0.1:5062 X-Siptrace-Time: 1551199601 872417 X-Siptrace-Method: ACK X-Siptrace-Dir: out ``` ### Possible Solutions I think the solution is to avoid calling these callbacks from that location, since the callback is called TMCB_ACK_NEG_IN not NEG_OUT. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.0-dev2 (x86_64/linux) 5bd547-dirty flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, 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: 5bd547 -dirty compiled on 16:25:01 Feb 26 2019 with gcc 5.4.0 ``` * **Operating System**:  ``` Linux DXBU-FVC2J42 4.10.0-38-generic #42~16.04.1-Ubuntu SMP Tue Oct 10 16:32:20 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/1871

2 2

git:master:5e48786a: Merge pull request #1890 from ionutionita92/issue-1871
by GitHub 13 Mar '19

13 Mar '19

Module: kamailio Branch: master Commit: 5e48786aef8e8d46ef936fc111d6b926acf79635 URL: https://github.com/kamailio/kamailio/commit/5e48786aef8e8d46ef936fc111d6b92… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-03-13T14:28:13+01:00 Merge pull request #1890 from ionutionita92/issue-1871 tm: remove unnecessary TMCB_ACK_NEG_IN callback call --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/5e48786aef8e8d46ef936fc111d6b92… Patch: https://github.com/kamailio/kamailio/commit/5e48786aef8e8d46ef936fc111d6b92… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 33910e1f8c..202b8d826f 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -2303,14 +2303,6 @@ int reply_received( struct sip_msg *p_msg ) t, &onsend_params); } } - if (unlikely(has_tran_tmcbs(t, TMCB_ACK_NEG_IN))){ - INIT_TMCB_ONSEND_PARAMS(onsend_params, - t->uas.request, p_msg, &uac->request, - &uac->request.dst, ack, ack_len, - TMCB_LOCAL_F, branch, TYPE_LOCAL_ACK); - run_trans_callbacks_off_params(TMCB_ACK_NEG_IN, - t, &onsend_params); - } shm_free(ack); } } else if (is_local(t) /*&& 200 <= msg_status < 300*/) {

1 0

git:master:cd6ef63a: tm: remove unnecessary TMCB_ACK_NEG_IN callback call
by iionita 13 Mar '19

13 Mar '19

Module: kamailio Branch: master Commit: cd6ef63a1eb5951ccb38276a91e150187702b352 URL: https://github.com/kamailio/kamailio/commit/cd6ef63a1eb5951ccb38276a91e1501… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: iionita <ionut-razvan.ionita(a)1and1.ro> Date: 2019-03-12T16:19:01+02:00 tm: remove unnecessary TMCB_ACK_NEG_IN callback call - TMCB_ACK_NEG_IN was called in an if branch where the initial condition was the message to be an INVITE; this was not affecting anything for the moment since this callback wasn't used but in case some piece of code would have used this callback it would be called not only for hop-by-hop ACKs but also INVITEs Closes #1871 --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/cd6ef63a1eb5951ccb38276a91e1501… Patch: https://github.com/kamailio/kamailio/commit/cd6ef63a1eb5951ccb38276a91e1501… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 33910e1f8c..202b8d826f 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -2303,14 +2303,6 @@ int reply_received( struct sip_msg *p_msg ) t, &onsend_params); } } - if (unlikely(has_tran_tmcbs(t, TMCB_ACK_NEG_IN))){ - INIT_TMCB_ONSEND_PARAMS(onsend_params, - t->uas.request, p_msg, &uac->request, - &uac->request.dst, ack, ack_len, - TMCB_LOCAL_F, branch, TYPE_LOCAL_ACK); - run_trans_callbacks_off_params(TMCB_ACK_NEG_IN, - t, &onsend_params); - } shm_free(ack); } } else if (is_local(t) /*&& 200 <= msg_status < 300*/) {

1 0

Planning next IRC devel meeting
by Daniel-Constantin Mierla 12 Mar '19

12 Mar '19

Hello, wondering if we we should do a new IRC devel meeting in the near future to sync on development plans. One of the decisions we should take is whether we should target to release the new major version (5.3) before the summer holidays or we leave it for the autumn. If many wants to do it, then a first proposal for a date would be: March 07, 2019, at 15:00 UTC (16:00 Berlin time). As usual, I created a wiki page to track the availability and the topics that should be approched: * https://www.kamailio.org/wiki/devel/irc-meetings/2019a Feel free to add yourself there, propose topics, etc... 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 6

git:master:0bf9c5d7: modules: readme files regenerated - secfilter ... [skip ci]
by Kamailio Dev 12 Mar '19

12 Mar '19

Module: kamailio Branch: master Commit: 0bf9c5d7c4ead4d71e0ae041d41cbf144ce1df86 URL: https://github.com/kamailio/kamailio/commit/0bf9c5d7c4ead4d71e0ae041d41cbf1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-03-12T14:01:42+01:00 modules: readme files regenerated - secfilter ... [skip ci] --- Modified: src/modules/secfilter/README --- Diff: https://github.com/kamailio/kamailio/commit/0bf9c5d7c4ead4d71e0ae041d41cbf1… Patch: https://github.com/kamailio/kamailio/commit/0bf9c5d7c4ead4d71e0ae041d41cbf1…

1 0

git:master:7d7c5b1d: secfilter: added locks and an RPC command to reset stats
by Jose Luis Verdeguer 12 Mar '19

12 Mar '19

Module: kamailio Branch: master Commit: 7d7c5b1d19bc21e0b4552e74ae80ca21b741248c URL: https://github.com/kamailio/kamailio/commit/7d7c5b1d19bc21e0b4552e74ae80ca2… Author: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2019-03-12T13:51:31+01:00 secfilter: added locks and an RPC command to reset stats --- Modified: src/modules/secfilter/doc/secfilter_admin.xml Modified: src/modules/secfilter/secfilter.c Modified: src/modules/secfilter/secfilter.h Modified: src/modules/secfilter/secfilter_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/7d7c5b1d19bc21e0b4552e74ae80ca2… Patch: https://github.com/kamailio/kamailio/commit/7d7c5b1d19bc21e0b4552e74ae80ca2…

1 0

git:master:d8662226: secfilter: update readme [skip ci]
by Jose Luis Verdeguer 12 Mar '19

12 Mar '19

Module: kamailio Branch: master Commit: d86622266baa51eda6d324cde6ddbf01dea6ab19 URL: https://github.com/kamailio/kamailio/commit/d86622266baa51eda6d324cde6ddbf0… Author: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2019-03-12T13:51:31+01:00 secfilter: update readme [skip ci] --- Modified: src/modules/secfilter/doc/secfilter_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d86622266baa51eda6d324cde6ddbf0… Patch: https://github.com/kamailio/kamailio/commit/d86622266baa51eda6d324cde6ddbf0… --- diff --git a/src/modules/secfilter/doc/secfilter_admin.xml b/src/modules/secfilter/doc/secfilter_admin.xml index c5bf63d5e6..4e599fd7e5 100644 --- a/src/modules/secfilter/doc/secfilter_admin.xml +++ b/src/modules/secfilter/doc/secfilter_admin.xml @@ -609,6 +609,26 @@ </example> </section> + <section id="secfilter.r.stats"> + <title> + <function moreinfo="none">secfilter.stats</function> + </title> + + <para> + Print statistics of blocked and allowed messages. + </para> + + <example> + <title><function>secfilter.stats</function> usage</title> + + <programlisting format="linespecific"> + ... + &kamcmd; secfilter.stats + ... + </programlisting> + </example> + </section> + <section id="secfilter.r.add_dst"> <title> <function moreinfo="none">secfilter.add_dst</function> @@ -760,5 +780,94 @@ </para> </section> </section> + + <section> + <title>Some examples</title> + + <section> + <title>Print data</title> + + <example> + <title>kamcmd secfilter.print ua</title> + + <programlisting format="linespecific"> + ... +User-agent +========== +[+] Blacklisted + ----------- + 0001 -> friendly-scanner + 0002 -> pplsip + 0003 -> sipcli + 0004 -> sundayddr + 0005 -> iWar + 0006 -> sipsak + 0007 -> VaxSIPUserAgent + 0008 -> SimpleSIP + 0009 -> SIP Call + 0010 -> Ozeki + 0011 -> VoIPSec + 0012 -> SIPScan + 0013 -> Conaito + 0014 -> UsaAirport + 0015 -> PortSIP VoIP SDK + 0016 -> zxcvfdf11 + 0017 -> fdgddfg546df4g8d5f + +[+] Whitelisted + ----------- + 0001 -> my custom ua + ... + </programlisting> + </example> + </section> + + <section> + <title>Statistics</title> + + <example> + <title>kamcmd secfilter.stats</title> + + <programlisting format="linespecific"> + ... +Blocked messages (blacklist) +============================ +[+] By user-agent : 1256 +[+] By country : 45 +[+] By from domain : 0 +[+] By to domain : 0 +[+] By contact domain: 1 +[+] By IP address : 2552 +[+] By from name : 0 +[+] By to name : 0 +[+] By contact name : 0 +[+] By from user : 316 +[+] By to user : 134 +[+] By contact user : 0 + +Allowed messages (whitelist) +============================ +[+] By user-agent : 0 +[+] By country : 478 +[+] By from domain : 0 +[+] By to domain : 0 +[+] By contact domain: 0 +[+] By IP address : 0 +[+] By from name : 0 +[+] By to name : 0 +[+] By contact name : 0 +[+] By from user : 0 +[+] By to user : 0 +[+] By contact user : 0 + +Other blocked messages +====================== +[+] Destinations : 0 +[+] SQL injection : 213 + ... + </programlisting> + </example> + </section> + </section> </chapter>

1 0

git:master:60b2fcb2: secfilter: print statistics of blocked and allowed messages using RPC commands
by Jose Luis Verdeguer 12 Mar '19

12 Mar '19

Module: kamailio Branch: master Commit: 60b2fcb2da7bcda734178d0de4d94ce00c423b30 URL: https://github.com/kamailio/kamailio/commit/60b2fcb2da7bcda734178d0de4d94ce… Author: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2019-03-12T13:51:31+01:00 secfilter: print statistics of blocked and allowed messages using RPC commands --- Modified: src/modules/secfilter/secfilter.c Modified: src/modules/secfilter/secfilter.h Modified: src/modules/secfilter/secfilter_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/60b2fcb2da7bcda734178d0de4d94ce… Patch: https://github.com/kamailio/kamailio/commit/60b2fcb2da7bcda734178d0de4d94ce…

1 0

[kamailio/kamailio] secfilter: print statistics of blocked and allowed messages using RPC commands (#1888)
by Jose Luis Verdeguer 12 Mar '19

12 Mar '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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1888 -- Commit Summary -- * secfilter: print statistics of blocked and allowed messages using RPC commands -- File Changes -- M src/modules/secfilter/doc/secfilter_admin.xml (109) M src/modules/secfilter/secfilter.c (86) M src/modules/secfilter/secfilter.h (30) M src/modules/secfilter/secfilter_rpc.c (44) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1888.patch https://github.com/kamailio/kamailio/pull/1888.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/1888

1 1

git:master:b50159d6: secfilter: avoid dereferences null
by Jose Luis Verdeguer 12 Mar '19

12 Mar '19

Module: kamailio Branch: master Commit: b50159d60dec4ffc671e424cc849e4cde4e9bfb5 URL: https://github.com/kamailio/kamailio/commit/b50159d60dec4ffc671e424cc849e4c… Author: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2019-03-12T11:13:41+01:00 secfilter: avoid dereferences null --- Modified: src/modules/secfilter/secfilter.c --- Diff: https://github.com/kamailio/kamailio/commit/b50159d60dec4ffc671e424cc849e4c… Patch: https://github.com/kamailio/kamailio/commit/b50159d60dec4ffc671e424cc849e4c… --- diff --git a/src/modules/secfilter/secfilter.c b/src/modules/secfilter/secfilter.c index 4816c4ad9d..d229031f30 100644 --- a/src/modules/secfilter/secfilter.c +++ b/src/modules/secfilter/secfilter.c @@ -424,6 +424,10 @@ static int check_user(struct sip_msg *msg, int type) if(res != 0) { return res; } + + if (user.s == NULL || domain.s == NULL) { + return -1; + } nlen = name.len; ulen = user.len; @@ -434,9 +438,11 @@ static int check_user(struct sip_msg *msg, int type) while(list) { if(name.len > list->s.len) name.len = list->s.len; - res = cmpi_str(&list->s, &name); - if(res == 0) { - return 4; + if (name.s != NULL) { + res = cmpi_str(&list->s, &name); + if(res == 0) { + return 4; + } } if(user.len > list->s.len) user.len = list->s.len; @@ -453,9 +459,11 @@ static int check_user(struct sip_msg *msg, int type) while(list) { if(name.len > list->s.len) name.len = list->s.len; - res = cmpi_str(&list->s, &name); - if(res == 0) { - return -4; + if (name.s != NULL) { + res = cmpi_str(&list->s, &name); + if(res == 0) { + return -4; + } } if(user.len > list->s.len) user.len = list->s.len;

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2019