sr-dev August 2020

sr-dev@lists.kamailio.org

17 participants
244 discussions

git:master:b28862bf: ims_ipsec_pcscf: delete unused tunnels

by Henning Westerholt

Module: kamailio Branch: master Commit: b28862bf5d6587abd810e0a8ad4cde0d93e28324 URL: https://github.com/kamailio/kamailio/commit/b28862bf5d6587abd810e0a8ad4cde0… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-08-20T11:47:44+02:00 ims_ipsec_pcscf: delete unused tunnels - ipsec_create - added a new function parameter to delete unused tunnels before creation of new ipsec connection. - added new global parameters for ipsec listen addresses. --- Modified: src/modules/ims_ipsec_pcscf/cmd.c Modified: src/modules/ims_ipsec_pcscf/cmd.h Modified: src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml Modified: src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c Modified: src/modules/ims_ipsec_pcscf/ipsec.c Modified: src/modules/ims_ipsec_pcscf/ipsec.h --- Diff: https://github.com/kamailio/kamailio/commit/b28862bf5d6587abd810e0a8ad4cde0… Patch: https://github.com/kamailio/kamailio/commit/b28862bf5d6587abd810e0a8ad4cde0…

3 years, 8 months

[kamailio/kamailio] Added compression for rtpengine (#2409)

by Sungtae Kim

#### 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/2409 -- Commit Summary -- * Added compression for rtpengine -- File Changes -- M src/modules/rtpengine/Makefile (2) A src/modules/rtpengine/compress.c (71) A src/modules/rtpengine/compress.h (27) M src/modules/rtpengine/config.c (3) M src/modules/rtpengine/config.h (1) M src/modules/rtpengine/rtpengine.c (64) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2409.patch https://github.com/kamailio/kamailio/pull/2409.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/2409

3 years, 8 months

[kamailio/kamailio] usrloc keepalive: with r2 enabled, registrar configured with usrloc keepalives will send OPTIONS to received param of first hop (#2447)

by George Diamantopoulos

### Description Consider the following setup: an edge proxy is configured with the path module, double rr is enabled (because the proxy is multihomed), add_path_received() is used to cope with NATted endpoints and the registrar is a separate kamailio instance residing on a private network. Contacts are saved successfully by the registrar, along with path information. INVITEs are first sent to the registrar which performs location lookup, and forwards the request based on the contact's Path. This part works as expected. However, things seem to fail when using the new keepalive functionality of the usrloc module on the registrar. The OPTIONS request is forwarded to the "received" parameter of the first Route header instead of the URI of the first Route header.  ### Troubleshooting #### SIP Traffic  EXAMPLES (check the first line printed by sngrep for L3/L4 info, public IPs have been censored): 1) INVITE is routed to $route_uri, ignoring the "received" parameter when doing a loose_route(): ``` 2020/08/18 19:58:29.918672 172.30.154.189:5060 -> 172.28.155.1:5060 INVITE sip:voip-test-user-04@2.2.2.2:5060 SIP/2.0 Via: SIP/2.0/UDP 172.30.154.189;branch=z9hG4bKa788.302fa172e9b1851973593c7f20d3586d.0 Route: <sip:172.28.155.1;lr;received=sip:2.2.2.2:5060;r2=on>,<sip:3.3.3.3;lr;received=sip:2.2.2.2:5060;r2=on> Via: SIP/2.0/UDP 172.30.152.3:5060;branch=z9hG4bK104f503d Max-Forwards: 69 From: "sbcpub-stage-test-01" <sip:1234567890@sip.domain>;tag=as77e25748 To: <sip:voip-test-user-04@sip.domain> Contact: <sip:1234567890@172.30.152.3:5060> Call-ID: 53d1089c6bc695875816e25a49da8a29(a)sip.domain CSeq: 102 INVITE Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO, PUBLISH, MESSAGE Supported: replaces, timer X-CID: ac32e4ae-580e164d(a)172.17.173.14 Remote-Party-ID: "sbcpub-stage-test-01" <sip:1234567890@sip.domain>;party=calling;privacy=off;screen=no Content-Type: application/sdp Content-Length: 346 X-Called-Username: voip-test-user-04 v=0 o=root 18222507 18222507 IN IP4 172.30.152.3 c=IN IP4 172.30.152.3 t=0 0 m=audio 16106 RTP/AVP 9 8 0 18 101 a=rtpmap:9 G722/8000 a=rtpmap:8 PCMA/8000 a=rtpmap:0 PCMU/8000 a=rtpmap:18 G729/8000 a=fmtp:18 annexb=no a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-16 a=ptime:20 a=maxptime:150 a=sendrecv ``` 2) OPTIONS is routed to "received" value of first Route header when doing keepalives using the usrloc module: ``` 2020/08/18 19:58:02.450949 172.30.154.189:5060 -> 2.2.2.2:5064 OPTIONS sip:voip-test-user-05@172.17.173.36:5064 SIP/2.0 Via: SIP/2.0/UDP 172.30.154.189:5060;branch=z9hG4bKx.1.1.0 Route: <sip:172.30.155.1;lr;received=sip:2.2.2.2:5064;r2=on>,<sip:3.3.3.3:6050;lr;received=sip:2.2.2.2:5064;r2=on> From: <sip:conn-revival@sip.domain>;tag=uloc-5f3be864-5d75-2-8617a458-5f3c089a-6e141-1.1 To: <sip:voip-test-user-05@sip.domain> Call-ID: ksrulka-1.1 CSeq: 80 OPTIONS Content-Length: 0 ``` #### usrloc entries The location entries for the examples above are as follows: ``` AoR: voip-test-user-04 Contacts: { Contact: { Address: sip:voip-test-user-04@2.2.2.2:5060 Expires: 47 Q: -1.000000 Call-ID: 34b4a487df71412e8e93a7a1c358d723 CSeq: 54 User-Agent: PolycomVVX-VVX_250-UA/6.3.0.14929 Received: sip:2.2.2.2:5060 Path: <sip:172.28.155.1;lr;received=sip:2.2.2.2:5060;r2=on>,<sip:3.3.3.3;lr;received=sip:2.2.2.2:5060;r2=on> State: CS_DIRTY Flags: 0 CFlags: 128 Socket: udp:172.30.154.189:5060 Methods: 8159 Ruid: uloc-5f3bf3b8-65c3-b7 Instance: [not set] Reg-Id: 0 Server-Id: 0 Tcpconn-Id: -1 Keepalive: 0 Last-Keepalive: 1597771086 KA-Roundtrip: 0 Last-Modified: 1597771086 } } AoR: voip-test-user-05 Contacts: { Contact: { Address: sip:voip-test-user-05@172.17.173.36:5064 Expires: 88 Q: -1.000000 Call-ID: 3279de38-f6ae2c18(a)172.17.173.36 CSeq: 17174 User-Agent: Cisco/SPA525G2-7.6.2e Received: sip:2.2.2.2:5064 Path: <sip:172.30.155.1;lr;received=sip:2.2.2.2:5064;r2=on>,<sip:3.3.3.3:6050;lr;received=sip:2.2.2.2:5064;r2=on> State: CS_DIRTY Flags: 0 CFlags: 128 Socket: udp:172.30.154.189:5060 Methods: 6815 Ruid: uloc-5f3be864-5d75-2 Instance: [not set] Reg-Id: 0 Server-Id: 0 Tcpconn-Id: -1 Keepalive: 0 Last-Keepalive: 1597771100 KA-Roundtrip: 0 Last-Modified: 1597771100 } } ``` ### Possible Solutions There are two ways I can thing of to mitigate this: * Modify the path module so that the received parameter is only set for the first Path header, which corresponds to the interface the request was received on. I believe this is the preferred way to deal with this, as I don't see the point in adding ";received" to both path entries when performing double "r2" path injection. * Or, make usrloc keepalive behave the same way as loose_route(). It seems loose_route will only honour the ";received=" parameter in a Route header only if it's the last remaining one? I'm not sure this is how it works, but somehow I get the desired behaviour with loose_route() On a sidenote, usrloc locally generated OPTIONS do not seem to be handled by the local-request event route. Is this intentional? AFAICT it would require engaging the tm module which will add some overhead...  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.4.0 (x86_64/linux) ``` built with this patch: https://github.com/kamailio/kamailio/commit/19128f2121d8b859a6a546dfdf2c085… * **Operating System**:  ``` Linux sbcpub0-stage-lhe0-cn1 4.19.0-8-amd64 #1 SMP Debian 4.19.98-1 (2020-01-26) 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/2447

3 years, 8 months

[kamailio/kamailio] Kamailio memory leak - versions 5.1.4 and 5.1.7 (#1895)

by Jay J

### Description Kamailio runs out of memory and stops processing requests. ``` ERROR: <core> [core/tcp_main.c:973]: tcpconn_new(): mem. allocation failure ERROR: <core> [core/tcp_main.c:4042]: handle_new_connect(): tcpconn_new failed, closing socket ERROR: uac [uac_reg.c:533]: reg_ht_add(): no more shm ERROR: uac [uac_reg.c:1347]: uac_reg_load_db(): Error adding reg to htable ``` ### Troubleshooting Restarting the Kamailio process resolves the issue #### Reproduction The issue occurs every 48 hours or so on the Kamailio instance #### Debugging Data ``` #kamcmd mod.stats all pkg Module: core { init_io_wait(475): 6480 init_dst_set(83): 32208 init_io_wait(524): 3576 yyparse(1782): 8 mk_new_net(52): 48 fix_param(1196): 128 route_new_list(200): 352 fix_expr(541): 616 exp_optimize_right(411): 40 fixup_regexp_null(213): 216 fix_param(1257): 352 yyparse(2729): 4872 mk_rval_expr1(2616): 68256 mk_elem(90): 976 mk_rval_expr2(2674): 321160 mk_rval_expr_v(2548): 768 mk_rval_expr_v(2537): 808136 mk_action(118): 196384 parse_params2(585): 560 set_mod_param_regex(121): 848 set_mod_param_regex(110): 264 tr_table_add(1875): 400 sr_cmd_exports_convert(235): 34160 register_module(280): 6192 load_module(496): 2072 new_sock_info(235): 176 new_sock_info(230): 3640 yyparse(642): 352 yyparse(1732): 288 add_alias(93): 80 add_alias(91): 128 yyparse(1446): 8 yyparse(2262): 296 yyparse(661): 416 subst_str(514): 416 subst_parser(301): 264 subst_parser(291): 2384 subst_parser(274): 960 pp_subst_add(57): 312 pp_define(1766): 1096 addstr(1399): 261168 str_hash_alloc(59): 512 pv_table_add(236): 22616 parse_pvname_list(1515): 2496 tr_new(1646): 1512 fix_match_rve(3028): 2152 pv_cache_add(347): 20664 fix_param(1162): 18936 init_modules(1026): 16 cnt_hash_add(383): 2048 db_do_init2(299): 336 dupl_string_name(72): 32 dupl_string(48): 144 new_db_id(272): 288 get_abs_pathname(262): 80 rpc_hash_add(146): 2048 pv_parse_format(1150): 40592 get_hdr_field(116): 232 parse_headers(320): 64 register_select_table(458): 104 rpc_hash_add(100): 26264 add_callback(59): 288 sr_wtimer_init(308): 136 cfg_new_group(79): 1160 cfg_declare(50): 4120 fix_socket_list(1509): 96 fix_sock_str(420): 912 fix_hostname(1301): 160 grp_hash_add(234): 952 pv_init_buffer(2055): 163840 pv_init_buffer(2045): 320 init_nonsip_hooks(43): 24 init_rlist(146): 40 route_add(124): 1784 str_hash_alloc(59): 768 rval_get_str(1256): 33648 init_counters(122): 128 cnt_hash_add(332): 26352 str_hash_alloc(59): 1280 Total: 2138200 } Module: ndb_redis { redis_parse_index(627): 88 pv_parse_redisc_name(704): 16496 redisc_add_server(257): 24064 Total: 40648 } Module: pv { tr_parse_string(2340): 64 tr_parse_string(2310): 192 tr_parse_string(2300): 192 tr_parse_string(2360): 32 tr_parse_string(2264): 544 add_var(65): 512 add_var(58): 2080 tr_parse_string(2275): 496 tr_parse_paramlist(2668): 32 Total: 4144 } Module: sqlops { sql_get_result(200): 64 pv_parse_dbr_name(134): 864 sql_init_con(83): 240 sqlops_tr_buffer_init(46): 2048 Total: 3216 } Module: textops { tr_txt_parse_re(212): 96 hname_fixup(2819): 616 fixup_method(2889): 1256 Total: 1968 } Module: xhttp_rpc { child_init(789): 832 Total: 832 } Module: db_mysql { db_mysql_new_connection(75): 4088 db_mysql_new_connection(65): 96 Total: 4184 } Module: auth { generate_random_secret(239): 32 generate_random_secret(238): 32 Total: 64 } Module: htable { pv_parse_ht_name(158): 160 fixup_ht_key(339): 88 Total: 248 } Module: xlog { xlog_fixup_helper(535): 17472 mod_init(214): 4104 xdbg_fixup_helper(500): 3352 Total: 24928 } Module: cnxcc { __alloc_redis(149): 24 __alloc_redis(146): 40 Total: 64 } Module: rtpengine { build_rtpp_socks(1611): 8 child_init(1768): 240 Total: 248 } Module: mangler { compile_expresions(557): 64 compile_expresions(541): 64 Total: 128 } Module: acc { parse_acc_extra(116): 672 Total: 672 } Module: rr { register_rrcb(61): 32 Total: 32 } Module: dialog { dlg_bridge_init_hdrs(66): 80 Total: 80 } Module: tm { Total: 0 } Module: uac { Total: 0 } Module: tls { Total: 0 } Module: sl { Total: 0 } Module: tmx { Total: 0 } Module: kex { Total: 0 } Module: usrloc { Total: 0 } Module: pike { Total: 0 } Module: websocket { Total: 0 } Module: cfgutils { Total: 0 } Module: nathelper { Total: 0 } Module: dispatcher { Total: 0 } ``` #### Log Messages ``` kamailio[6722]: ERROR: <core> [core/tcp_main.c:973]: tcpconn_new(): mem. allocation failure kamailio[6722]: ERROR: <core> [core/tcp_main.c:4042]: handle_new_connect(): tcpconn_new failed, closing socket kamailio[6722]: ERROR: tm [t_msgbuilder.c:1594]: build_uac_req(): no more shared memory (544) ``` ### Possible Solutions Restarting Kamailio ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.7 (x86_64/linux) 567df3 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: 567df3 compiled on 04:30:41 Mar 14 2019 with gcc 7.3.0 ``` * **Operating System**: ``` cat /etc/lsb-release DISTRIB_ID=Ubuntu DISTRIB_RELEASE=18.04 DISTRIB_CODENAME=bionic DISTRIB_DESCRIPTION="Ubuntu 18.04.2 LTS" ``` ``` 4.15.0-1034-aws #36-Ubuntu SMP Tue Mar 5 23:17:16 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux ``` ``` cat /proc/meminfo MemTotal: 4038176 kB MemFree: 130020 kB MemAvailable: 747324 kB Buffers: 15136 kB Cached: 2851248 kB SwapCached: 0 kB Active: 930936 kB Inactive: 2672836 kB Active(anon): 737672 kB Inactive(anon): 2097272 kB Active(file): 193264 kB Inactive(file): 575564 kB Unevictable: 0 kB Mlocked: 0 kB SwapTotal: 0 kB SwapFree: 0 kB Dirty: 120 kB Writeback: 0 kB AnonPages: 734064 kB Mapped: 2180672 kB Shmem: 2097544 kB Slab: 154288 kB SReclaimable: 101108 kB SUnreclaim: 53180 kB KernelStack: 4176 kB PageTables: 81940 kB NFS_Unstable: 0 kB Bounce: 0 kB WritebackTmp: 0 kB CommitLimit: 2019088 kB Committed_AS: 4529756 kB VmallocTotal: 34359738367 kB VmallocUsed: 0 kB VmallocChunk: 0 kB HardwareCorrupted: 0 kB AnonHugePages: 0 kB ShmemHugePages: 0 kB ShmemPmdMapped: 0 kB CmaTotal: 0 kB CmaFree: 0 kB HugePages_Total: 0 HugePages_Free: 0 HugePages_Rsvd: 0 HugePages_Surp: 0 Hugepagesize: 2048 kB DirectMap4k: 221184 kB DirectMap2M: 3973120 kB ``` Also, here is the output of "grep alloc qm_status.txt | awk '{ print substr( $0, 16, length($0) ) }' | sort | uniq -c | sort -k1n" (as per https://www.kamailio.org/wiki/tutorials/troubleshooting/memory): https://www.dropbox.com/s/act3whe6gumyzvj/alloc.txt?dl=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/issues/1895

3 years, 8 months

git:master:c960cac9: modules: readme files regenerated - uac ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: c960cac9a5621d0aaabe6b68f48bb988737c0b1c URL: https://github.com/kamailio/kamailio/commit/c960cac9a5621d0aaabe6b68f48bb98… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-08-18T18:01:18+02:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/c960cac9a5621d0aaabe6b68f48bb98… Patch: https://github.com/kamailio/kamailio/commit/c960cac9a5621d0aaabe6b68f48bb98…

3 years, 8 months

[kamailio/kamailio] uac: added uac_event_callback for kemi (#2445)

by tao-communications

#### 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) - [ ] 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/2445 -- Commit Summary -- * uac: added uac_event_callback for kemi -- File Changes -- M src/modules/uac/doc/uac_admin.xml (32) M src/modules/uac/uac.c (3) M src/modules/uac/uac_send.c (40) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2445.patch https://github.com/kamailio/kamailio/pull/2445.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/2445

3 years, 8 months

git:master:767d3ca8: uac: added uac_event_callback for kemi

by Yufei Tao

Module: kamailio Branch: master Commit: 767d3ca88a4e4fa093a6a81a36d95d116251b578 URL: https://github.com/kamailio/kamailio/commit/767d3ca88a4e4fa093a6a81a36d95d1… Author: Yufei Tao <yufei.tao(a)syntec.co.uk> Committer: Yufei Tao <yt100(a)hotmail.com> Date: 2020-08-17T15:09:24+01:00 uac: added uac_event_callback for kemi --- Modified: src/modules/uac/doc/uac_admin.xml Modified: src/modules/uac/uac.c Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/767d3ca88a4e4fa093a6a81a36d95d1… Patch: https://github.com/kamailio/kamailio/commit/767d3ca88a4e4fa093a6a81a36d95d1… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 64aabf2190..7029449ac3 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -593,6 +593,38 @@ modparam("uac", "reg_gc_interval", 60) </example> </section> + <section id="uac.p.event_callback"> + <title><varname>event_callback</varname> (str)</title> + <para> + The name of the function in the kemi configuration file (embedded + scripting language such as Lua, Python, ...) to be executed instead + of event_route[uac:reply] block. + </para> + <para> + The function receives a string parameter with the name of the event, + the value can be: 'uac:reply'. + </para> + <para> + <emphasis> + Default value is 'empty' (no function is executed for events). + </emphasis> + </para> + <example> + <title>Set <varname>event_callback</varname> parameter</title> + <programlisting format="linespecific"> + ... +modparam("uac", "event_callback", "ksr_uac_event") + +function ksr_uac_event(evname) + KSR.info("===== uac module triggered event: " .. evname .. "\n"); + return 1; +end + ... + </programlisting> + </example> + </section> + + </section> <section> diff --git a/src/modules/uac/uac.c b/src/modules/uac/uac.c index 3212960f4e..0988669f67 100644 --- a/src/modules/uac/uac.c +++ b/src/modules/uac/uac.c @@ -93,6 +93,8 @@ pv_spec_t auth_password_spec; str uac_default_socket = STR_NULL; struct socket_info * uac_default_sockinfo = NULL; +str uac_event_callback = STR_NULL; + static int w_replace_from(struct sip_msg* msg, char* p1, char* p2); static int w_restore_from(struct sip_msg* msg, char* p1, char* p2); static int w_replace_to(struct sip_msg* msg, char* p1, char* p2); @@ -178,6 +180,7 @@ static param_export_t params[] = { {"reg_active", INT_PARAM, &reg_active_param }, {"reg_gc_interval", INT_PARAM, &_uac_reg_gc_interval }, {"default_socket", PARAM_STR, &uac_default_socket}, + {"event_callback", PARAM_STR, &uac_event_callback}, {0, 0, 0} }; diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index 409980aea9..d906a1c27f 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -36,6 +36,7 @@ #include "../../core/parser/parse_to.h" #include "../../core/parser/contact/parse_contact.h" #include "../../core/fmsg.h" +#include "../../core/kemi.h" #include "auth.h" #include "auth_hdr.h" @@ -82,6 +83,8 @@ typedef struct _uac_send_info { static struct _uac_send_info _uac_req; +extern str uac_event_callback; + void uac_send_info_copy(uac_send_info_t *src, uac_send_info_t *dst) { memcpy(dst, src, sizeof(uac_send_info_t)); @@ -630,12 +633,27 @@ void uac_req_run_event_route(sip_msg_t *msg, uac_send_info_t *tp, int rcode) int rt, backup_rt; struct run_act_ctx ctx; sip_msg_t *fmsg; + sr_kemi_eng_t *keng = NULL; + int kemi_evroute = 0; + + if(uac_event_callback.s!=NULL && uac_event_callback.len>0) { + keng = sr_kemi_eng_get(); + if(keng==NULL) { + LM_DBG("event callback (%s) set, but no cfg engine\n", + uac_event_callback.s); + return; + } else { + kemi_evroute = 1; + } + } - rt = route_get(&event_rt, evrtname); - if (rt < 0 || event_rt.rlist[rt] == NULL) - { - LM_DBG("event_route[uac:reply] does not exist\n"); - return; + if (kemi_evroute==0) { + rt = route_get(&event_rt, evrtname); + if (rt < 0 || event_rt.rlist[rt] == NULL) + { + LM_DBG("event_route[uac:reply] does not exist\n"); + return; + } } uac_send_info_copy(tp, &_uac_req); @@ -652,7 +670,17 @@ void uac_req_run_event_route(sip_msg_t *msg, uac_send_info_t *tp, int rcode) backup_rt = get_route_type(); set_route_type(REQUEST_ROUTE); init_run_actions_ctx(&ctx); - run_top_route(event_rt.rlist[rt], fmsg, 0); + + if (kemi_evroute==1) { + str evrtname = str_init("uac:reply"); + + if(sr_kemi_route(keng, fmsg, EVENT_ROUTE, + &uac_event_callback, &evrtname)<0) { + LM_ERR("error running event route kemi callback\n"); + } + } else { + run_top_route(event_rt.rlist[rt], fmsg, 0); + } set_route_type(backup_rt); }

3 years, 8 months

git:master:deb886a6: Merge pull request #2445 from tao-communications/master

by GitHub

Module: kamailio Branch: master Commit: deb886a63ad2d9b62c78c56724db0a5f8031c73f URL: https://github.com/kamailio/kamailio/commit/deb886a63ad2d9b62c78c56724db0a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-08-18T17:54:53+02:00 Merge pull request #2445 from tao-communications/master uac: added uac_event_callback for kemi --- Modified: src/modules/uac/doc/uac_admin.xml Modified: src/modules/uac/uac.c Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/deb886a63ad2d9b62c78c56724db0a5… Patch: https://github.com/kamailio/kamailio/commit/deb886a63ad2d9b62c78c56724db0a5… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 64aabf2190..7029449ac3 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -593,6 +593,38 @@ modparam("uac", "reg_gc_interval", 60) </example> </section> + <section id="uac.p.event_callback"> + <title><varname>event_callback</varname> (str)</title> + <para> + The name of the function in the kemi configuration file (embedded + scripting language such as Lua, Python, ...) to be executed instead + of event_route[uac:reply] block. + </para> + <para> + The function receives a string parameter with the name of the event, + the value can be: 'uac:reply'. + </para> + <para> + <emphasis> + Default value is 'empty' (no function is executed for events). + </emphasis> + </para> + <example> + <title>Set <varname>event_callback</varname> parameter</title> + <programlisting format="linespecific"> + ... +modparam("uac", "event_callback", "ksr_uac_event") + +function ksr_uac_event(evname) + KSR.info("===== uac module triggered event: " .. evname .. "\n"); + return 1; +end + ... + </programlisting> + </example> + </section> + + </section> <section> diff --git a/src/modules/uac/uac.c b/src/modules/uac/uac.c index 3212960f4e..0988669f67 100644 --- a/src/modules/uac/uac.c +++ b/src/modules/uac/uac.c @@ -93,6 +93,8 @@ pv_spec_t auth_password_spec; str uac_default_socket = STR_NULL; struct socket_info * uac_default_sockinfo = NULL; +str uac_event_callback = STR_NULL; + static int w_replace_from(struct sip_msg* msg, char* p1, char* p2); static int w_restore_from(struct sip_msg* msg, char* p1, char* p2); static int w_replace_to(struct sip_msg* msg, char* p1, char* p2); @@ -178,6 +180,7 @@ static param_export_t params[] = { {"reg_active", INT_PARAM, &reg_active_param }, {"reg_gc_interval", INT_PARAM, &_uac_reg_gc_interval }, {"default_socket", PARAM_STR, &uac_default_socket}, + {"event_callback", PARAM_STR, &uac_event_callback}, {0, 0, 0} }; diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index 409980aea9..d906a1c27f 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -36,6 +36,7 @@ #include "../../core/parser/parse_to.h" #include "../../core/parser/contact/parse_contact.h" #include "../../core/fmsg.h" +#include "../../core/kemi.h" #include "auth.h" #include "auth_hdr.h" @@ -82,6 +83,8 @@ typedef struct _uac_send_info { static struct _uac_send_info _uac_req; +extern str uac_event_callback; + void uac_send_info_copy(uac_send_info_t *src, uac_send_info_t *dst) { memcpy(dst, src, sizeof(uac_send_info_t)); @@ -630,12 +633,27 @@ void uac_req_run_event_route(sip_msg_t *msg, uac_send_info_t *tp, int rcode) int rt, backup_rt; struct run_act_ctx ctx; sip_msg_t *fmsg; + sr_kemi_eng_t *keng = NULL; + int kemi_evroute = 0; + + if(uac_event_callback.s!=NULL && uac_event_callback.len>0) { + keng = sr_kemi_eng_get(); + if(keng==NULL) { + LM_DBG("event callback (%s) set, but no cfg engine\n", + uac_event_callback.s); + return; + } else { + kemi_evroute = 1; + } + } - rt = route_get(&event_rt, evrtname); - if (rt < 0 || event_rt.rlist[rt] == NULL) - { - LM_DBG("event_route[uac:reply] does not exist\n"); - return; + if (kemi_evroute==0) { + rt = route_get(&event_rt, evrtname); + if (rt < 0 || event_rt.rlist[rt] == NULL) + { + LM_DBG("event_route[uac:reply] does not exist\n"); + return; + } } uac_send_info_copy(tp, &_uac_req); @@ -652,7 +670,17 @@ void uac_req_run_event_route(sip_msg_t *msg, uac_send_info_t *tp, int rcode) backup_rt = get_route_type(); set_route_type(REQUEST_ROUTE); init_run_actions_ctx(&ctx); - run_top_route(event_rt.rlist[rt], fmsg, 0); + + if (kemi_evroute==1) { + str evrtname = str_init("uac:reply"); + + if(sr_kemi_route(keng, fmsg, EVENT_ROUTE, + &uac_event_callback, &evrtname)<0) { + LM_ERR("error running event route kemi callback\n"); + } + } else { + run_top_route(event_rt.rlist[rt], fmsg, 0); + } set_route_type(backup_rt); }

3 years, 8 months

[kamailio/kamailio] Fix missing "Route" header name in usrloc keepalive msgs (#2446)

by George Diamantopoulos

#### Pre-Submission Checklist    - [ ] 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  The keepalive functionality of the usrloc module seems to produce invalid messages when a location contact has Path information set. This should fix the issue. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2446 -- Commit Summary -- * Fix missing "Route" header name in usrloc keepalive msgs -- File Changes -- M src/modules/usrloc/ul_keepalive.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2446.patch https://github.com/kamailio/kamailio/pull/2446.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/2446

3 years, 8 months

git:5.4:19128f21: usrloc: print Route header name in keepalive when Path is present

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: 19128f2121d8b859a6a546dfdf2c0855b9bd9502 URL: https://github.com/kamailio/kamailio/commit/19128f2121d8b859a6a546dfdf2c085… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-18T17:51:33+02:00 usrloc: print Route header name in keepalive when Path is present - related to GH #2446 (cherry picked from commit d49d6b89ceb311598a89cfd789d180412b46a4af) --- Modified: src/modules/usrloc/ul_keepalive.c --- Diff: https://github.com/kamailio/kamailio/commit/19128f2121d8b859a6a546dfdf2c085… Patch: https://github.com/kamailio/kamailio/commit/19128f2121d8b859a6a546dfdf2c085… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index 4439e193c0..6d93717db5 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -43,7 +43,7 @@ static int ul_ka_send(str *kamsg, dest_info_t *kadst); /** - * + * _KAMETHOD_ _URI_ SIP/2.0\r\n Via: SIP/2.0/_PROTO_ _IP_:_PORT_;branch=z9hG4bKx._GCNT_._BCNT_.0\r\n __KAROUTES__ @@ -60,7 +60,7 @@ Content-Length: 0\r\n\r\n" #define ULKA_MSG "%.*s %.*s SIP/2.0\r\n" \ "Via: SIP/2.0/%.*s %.*s:%.*s;branch=z9hG4bKx.%u.%u.0\r\n" \ - "%.*s%.*s" \ + "%s%.*s%.*s" \ "From: <%.*s>;tag=%.*s-%x-%lx-%lx-%x.%x\r\n" \ "To: <sip:%.*s%s%.*s>\r\n" \ "Call-ID: " ULKA_CALLID_PREFIX "%u.%u\r\n" \ @@ -197,6 +197,7 @@ int ul_ka_urecord(urecord_t *ur) vaddr.len, vaddr.s, vport.len, vport.s, _ul_ka_counter, bcnt, + (uc->path.len>0)?"Route: ":"", (uc->path.len>0)?uc->path.len:0, (uc->path.len>0)?uc->path.s:"", (uc->path.len>0)?2:0,

3 years, 8 months

← Newer
1
...
12
13
14
15
16
17
18
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2020