sr-dev August 2021

sr-dev@lists.kamailio.org

19 participants
266 discussions

git:master:6da06e26: ruxc: added http_retry modparam

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6da06e2683b484c19eac27b757c1f2e565aa2e5d URL: https://github.com/kamailio/kamailio/commit/6da06e2683b484c19eac27b757c1f2e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-17T21:27:36+02:00 ruxc: added http_retry modparam --- Modified: src/modules/ruxc/doc/ruxc_admin.xml Modified: src/modules/ruxc/ruxc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6da06e2683b484c19eac27b757c1f2e… Patch: https://github.com/kamailio/kamailio/commit/6da06e2683b484c19eac27b757c1f2e… --- diff --git a/src/modules/ruxc/doc/ruxc_admin.xml b/src/modules/ruxc/doc/ruxc_admin.xml index 794301bc06..d0cd3bf7f7 100644 --- a/src/modules/ruxc/doc/ruxc_admin.xml +++ b/src/modules/ruxc/doc/ruxc_admin.xml @@ -121,6 +121,25 @@ modparam("ruxc", "http_tlsmode", 1) ... modparam("ruxc", "http_reuse", 1) ... +</programlisting> + </example> + </section> + <section id="ruxc.p.http_retry"> + <title><varname>http_retry</varname> (int)</title> + <para> + How many times to retry if the HTTP request does not get a 200ok response. + </para> + <para> + <emphasis> + Default value is 0 (no retry). + </emphasis> + </para> + <example> + <title>Set <varname>http_retry</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("ruxc", "http_retry", 2) +... </programlisting> </example> </section> diff --git a/src/modules/ruxc/ruxc_mod.c b/src/modules/ruxc/ruxc_mod.c index 02fa278859..13c4a54b52 100644 --- a/src/modules/ruxc/ruxc_mod.c +++ b/src/modules/ruxc/ruxc_mod.c @@ -41,6 +41,7 @@ MODULE_VERSION static int _ruxc_http_timeout = 5000; static int _ruxc_http_tlsmode = 0; static int _ruxc_http_reuse = 0; +static int _ruxc_http_retry = 0; static int mod_init(void); static int child_init(int); @@ -75,6 +76,7 @@ static param_export_t params[]={ {"http_timeout", PARAM_INT, &_ruxc_http_timeout}, {"http_tlsmode", PARAM_INT, &_ruxc_http_tlsmode}, {"http_reuse", PARAM_INT, &_ruxc_http_reuse}, + {"http_retry", PARAM_INT, &_ruxc_http_retry}, {0, 0, 0} }; @@ -135,6 +137,7 @@ static int ki_ruxc_http_get_helper(sip_msg_t *_msg, str *url, str *hdrs, v_http_request.timeout_write = _ruxc_http_timeout; v_http_request.tlsmode = _ruxc_http_tlsmode; v_http_request.reuse = _ruxc_http_reuse; + v_http_request.retry = _ruxc_http_retry; v_http_request.url = url->s; v_http_request.url_len = url->len; @@ -233,6 +236,7 @@ static int ki_ruxc_http_post_helper(sip_msg_t *_msg, str *url, str *body, str *h v_http_request.timeout_write = _ruxc_http_timeout; v_http_request.tlsmode = _ruxc_http_tlsmode; v_http_request.reuse = _ruxc_http_reuse; + v_http_request.retry = _ruxc_http_retry; v_http_request.url = url->s; v_http_request.url_len = url->len;

2 years, 8 months

uac_reg module use of l_uuid in Contact header

by Ross McKillop

I've been trying to work out how to set the username element of the contact header in uac_reg outbound REGISTER requests and it seems it's hard coded in the source (uac_reg.c:990) to use the l_uuid. I'm curious why l_uuid is used here and not l_username which feels like it should be more consistent with the use of r_username? My C skills are sufficient to let me patch this locally for my application, but I wondered what the reason for this design decision is or if it's actually a very long lived 'bug' as it feels like l_username is the 'right' thing to use here? Alternatively, perhaps this would be considered a feature request to make it configurable via another parameter in the database (probably beyond my C unless I modelled it on the pull request that added contact_addr (#2470) Ross

2 years, 8 months

[kamailio/kamailio] kazoo : fix routing of reply events (#2786)

by kageds

success events should be routed to onreply_route[] failure events should be routed to failure_route[]   #### Pre-Submission Checklist    - [x] 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) - [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 Kazoo cfg files use onreply_route[] and failure_route[] to handle the replies from AMQP and the module was sending the replies to the main route and therefore the scripts were not receiving the responses You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2786 -- Commit Summary -- * kazoo : fix routing of reply events -- File Changes -- M src/modules/kazoo/kz_amqp.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2786.patch https://github.com/kamailio/kamailio/pull/2786.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/2786

2 years, 8 months

git:master:fb2eee3e: kazoo : fix routing of reply events

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: fb2eee3e175040fef5e76cbed11430976f62df32 URL: https://github.com/kamailio/kamailio/commit/fb2eee3e175040fef5e76cbed114309… Author: Alan Evans <alan(a)kageds.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-16T20:08:11+02:00 kazoo : fix routing of reply events success events should be routed to onreply_route[] failure events should be routed to failure_route[] --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/fb2eee3e175040fef5e76cbed114309… Patch: https://github.com/kamailio/kamailio/commit/fb2eee3e175040fef5e76cbed114309… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 8076315dfd..5685f5a845 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -2498,24 +2498,24 @@ void kz_amqp_fire_connection_event(char *event, char* host, char* zone) void kz_amqp_cb_ok(kz_amqp_cmd_ptr cmd) { - int n = route_lookup(&main_rt, cmd->cb_route); + int n = route_lookup(&onreply_rt, cmd->cb_route); if(n==-1) { /* route block not found in the configuration file */ return; } - struct action *a = main_rt.rlist[n]; + struct action *a = onreply_rt.rlist[n]; tmb.t_continue(cmd->t_hash, cmd->t_label, a); ksr_msg_env_reset(); } void kz_amqp_cb_error(kz_amqp_cmd_ptr cmd) { - int n = route_lookup(&main_rt, cmd->err_route); + int n = route_lookup(&failure_rt, cmd->err_route); if(n==-1) { /* route block not found in the configuration file */ return; } - struct action *a = main_rt.rlist[n]; + struct action *a = failure_rt.rlist[n]; tmb.t_continue(cmd->t_hash, cmd->t_label, a); ksr_msg_env_reset(); }

2 years, 8 months

[kamailio/kamailio] TLSA Undefined Symbol __dlclose (#2815)

by Tim Chubb

### Description Building TLSA module on ubuntu 18.04 results in a compiler warning and an undefined symbol error when attempting to load module. ### Troubleshooting #### Reproduction Make module and attempt to load it  #### Debugging Data  ``` N/A ``` #### Log Messages  Compiler output ``` CC (gcc) [M tlsa.so] tls_util.o CC (gcc) [M tlsa.so] tls_domain.o CC (gcc) [M tlsa.so] tls_locking.o CC (gcc) [M tlsa.so] tls_rand.o CC (gcc) [M tlsa.so] tls_map.o CC (gcc) [M tlsa.so] tls_cfg.o CC (gcc) [M tlsa.so] tls_select.o CC (gcc) [M tlsa.so] tls_server.o CC (gcc) [M tlsa.so] tls_dump_vf.o CC (gcc) [M tlsa.so] tls_init.o CC (gcc) [M tlsa.so] tls_rpc.o CC (gcc) [M tlsa.so] tls_config.o CC (gcc) [M tlsa.so] tls_bio.o CC (gcc) [M tlsa.so] tls_ct_wrq.o CC (gcc) [M tlsa.so] tlsa_mod.o CC (gcc) [M tlsa.so] tls_verify.o LD (gcc) [M tlsa.so] tlsa.so /usr/lib/gcc/x86_64-linux-gnu/7/../../../x86_64-linux-gnu/libcrypto.a(dso_dlfcn.o): In function `dlfcn_globallookup': (.text+0x11): warning: Using 'dlopen' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking ``` Kamailio Log ``` Aug 9 11:21:04 kamtest kamailio: ERROR: <core> [core/sr_module.c:570]: load_module(): could not open module </usr/local/lib64/kamailio/modules/tlsa.so>: /usr/local/lib64/kamailio/modules/tlsa.so: undefined symbol: __dlclose Aug 9 11:21:04 kamtest kamailio: CRITICAL: <core> [core/cfg.y:3683]: yyerror_at(): parse error in config file /etc/kamailio/parameters/modules.cfg, line 7, column 12-20: failed to load module Aug 9 11:21:04 kamtest kamailio: ERROR: <core> [core/modparam.c:181]: set_mod_param_regex(): No module matching <tlsa> found ``` #### SIP Traffic  ``` N/A ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.6.0-dev0 (x86_64/linux) 0a5307-dirty flags: 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_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED 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: 0a5307 -dirty compiled on 10:36:16 Aug 9 2021 with gcc 7.5.0 ``` * **Operating System**:  ``` Linux kamtest 4.15.0-144-generic #148-Ubuntu SMP Sat May 8 02:33:43 UTC 2021 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/2815

2 years, 8 months

git:master:22a72f3a: core: ip addr - use POSIX INET6_ADDRSTRLEN and INET_ADDRSTRLEN to define sizes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 22a72f3a7725d56f00e22bdc52d44bd53da7c091 URL: https://github.com/kamailio/kamailio/commit/22a72f3a7725d56f00e22bdc52d44bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-13T08:57:10+02:00 core: ip addr - use POSIX INET6_ADDRSTRLEN and INET_ADDRSTRLEN to define sizes - set the values of IP4_MAX_STR_SIZE and IP6_MAX_STR_SIZE based on them, if defined, or to 15 and 45 - cope with IPv6 with IPv4 tunneling representation (RFC 4291 section 2.2) - cover the requirements of using inet_ntop() - GH #2823 --- Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/22a72f3a7725d56f00e22bdc52d44bd… Patch: https://github.com/kamailio/kamailio/commit/22a72f3a7725d56f00e22bdc52d44bd… --- diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index 546c822423..132f653255 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -510,8 +510,20 @@ int hostent2su(union sockaddr_union* su, /* maximum size of a str returned by ip_addr2str */ -#define IP6_MAX_STR_SIZE 39 /*1234:5678:9012:3456:7890:1234:5678:9012*/ -#define IP4_MAX_STR_SIZE 15 /*123.456.789.012*/ +/* POSIX INET6_ADDRSTRLEN (RFC 4291 section 2.2) - IPv6 with IPv4 tunneling + * (39): 1234:5678:9012:3456:7890:1234:5678:9012 + * (45): ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255 */ +#ifdef INET6_ADDRSTRLEN +#define IP6_MAX_STR_SIZE (INET6_ADDRSTRLEN-1) +#else +#define IP6_MAX_STR_SIZE 45 +#endif +/*123.456.789.123*/ +#ifdef INET_ADDRSTRLEN +#define IP4_MAX_STR_SIZE (INET_ADDRSTRLEN-1) +#else +#define IP4_MAX_STR_SIZE 15 +#endif /* converts a raw ipv6 addr (16 bytes) to ascii */ int ip6tosbuf(unsigned char* ip6, char* buff, int len);

2 years, 8 months

[kamailio/kamailio] Kami Lua retrieving variable in configuration file (#2822)

by jpskriver

### Description Suppose that there is an variable define in `kamailio-basic-kemi.cfg` with: ``` #!define MYVAR 1.2.3.4 ``` Then in the `kamailio-basic-kemi-lua.lua` - How can we get that variable? ### Possible Solutions Is there any alternative solution like set global via app_lua parameter, example: ``` modparam("app_lua", "load", "/usr/local/etc/kamailio/lua/myscript.lua") modparam("app_lua", "varset", "pstngw=s:sip:10.10.10.10") ``` -- 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/2822

2 years, 8 months

[kamailio/kamailio] Kamailio unable to relay ACK (response to 200 OK) with TCP connection (#2814)

by jpskriver

### Description The ACK that response to 200 OK was NAT relayed by Kamailio if using TCP protocol, then got this issue from log ```pending write on new connection 0x14a595095d40 sock 16 (-1/539 bytes written) (err: 11 - Resource temporarily unavailable)```  ### Troubleshooting #### Reproduction * Using KAMI with Lua for routing config. * make call between 2 sip clients, the receiver has been registered with TCP #### Debugging Data * With the same scenario with UDP, it work fine. *  ``` (paste your debugging data here) ``` #### Log Messages  ``` Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: <script>: ROUTE RELAY BEGIN:----------------------------------------------------------- Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: tm [t_lookup.c:1327]: t_newtran(): msg (0x14a5999f0b38) id=3/4784 global id=2/4784 T start=0xffffffffffffffff Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: tm [t_lookup.c:497]: t_lookup_request(): start searching: hash=41830, isACK=1 Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: tm [t_lookup.c:455]: matching_3261(): RFC3261 transaction matching failed - via branch [z9hG4bKQe8H61SrNcaXD] Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: tm [t_lookup.c:675]: t_lookup_request(): no transaction found Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: tm [t_funcs.c:286]: t_relay_to(): forwarding ACK statelessly Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: <core> [core/crypto/md5utils.c:67]: MD5StringArray(): MD5 calculated: 66c47e5249a7009267e0cd264863c247 Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: <core> [core/msg_translator.c:1797]: check_boundaries(): no multi-part body Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: <core> [core/forward.c:577]: forward_request(): Sending:#012ACK sip:Joe%20Biden@14.186.XXX.XX:60791;transport=TCP SIP/2.0#015#012Via: SIP/2.0/TCP 188.166.XXX.XX:5060;branch=z9hG4bK663a.66c47e5249a7009267e0cd264863c247.0#015#012Via: SIP/2.0/UDP 127.0.0.2;received=127.0.0.2;rport=5060;branch=z9hG4bKQe8H61SrNcaXD#015#012Max-Forwards: 69#015#012From: "Donald Trump" <sip:33123456789@127.0.0.2>;tag=mUNavKm60XZte#015#012To: <sip:5512345@127.0.0.3:5060;transport=udp>;tag=bd21bf6b#015#012Call-ID: 0e846d85-720e-123a-45a5-ea0e9328da5f#015#012CSeq: 39612479 ACK#015#012Contac t: <sip:gw+KamGW@127.0.0.2:5060;transport=udp;gw=KamGW>#015#012Content-Length: 0#015#012#015#012. Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: <core> [core/forward.c:578]: forward_request(): orig. len=557, new_len=539, proto=2 Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: app_lua [app_lua_api.c:489]: sr_lua_reload_script(): No need to reload [/path-to-lua/routing.lua] is version 0 Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: app_lua [app_lua_api.c:673]: app_lua_run_ex(): executing Lua function: [[ksr_onsend_route]] Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: app_lua [app_lua_api.c:675]: app_lua_run_ex(): lua top index is: 0 Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: <core> [core/tcp_main.c:1993]: tcp_send(): no open tcp connection found, opening new one Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: <core> [core/ip_addr.c:577]: print_ip(): tcpconn_new: new tcp connection: 14.186.47.222 Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: <core> [core/tcp_main.c:1175]: tcpconn_new(): on port 60791, type 2, socket -1 Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: <core> [core/tcp_main.c:1494]: tcpconn_add(): hashes: 1566:2785:0, 4 Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: <core> [core/tcp_main.c:2886]: tcpconn_1st_send(): pending write on new connection 0x14a595095d40 sock 16 (-1/539 bytes written) (err: 11 - Resource temporar ily unavailable) Aug 7 10:35:53 testnode1 /usr/local/sbin/kamailio[4806]: DEBUG: <core> [core/tcp_main.c:3792]: handle_ser_child(): read response= 14a595095d40, 5, fd 55 from 12 (4784) Aug 7 10:35:53 testnode1 /usr/local/sbin/kamailio[4806]: DEBUG: <core> [core/io_wait.h:375]: io_watch_add(): DBG: io_watch_add(0x55f0338266a0, 55, 2, 0x14a595095d40), fd_no=41 Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: app_lua [app_lua_api.c:1003]: sr_kemi_lua_exec_func_ex(): param[0] for: xdbg is str: ROUTE RELAY END:-------------------------------------------------------- --- ``` #### SIP Traffic ![image](https://user-images.githubusercontent.com/85822466/128597726-0f64fdec-9b45-4ef6-b480-f5c0b3f21600.png) ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio -v version: kamailio 5.5.1 (x86_64/linux) 7abebb flags: 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_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED 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: 7abebb compiled on 07:46:14 Jun 27 2021 with gcc 8.3.0 ``` * **Operating System**:  Debian 10.10 ``` root@testnode1:~# uname -a Linux testnode1 4.19.0-12-cloud-amd64 #1 SMP Debian 4.19.152-1 (2020-10-18) 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/2814

2 years, 8 months

[kamailio/kamailio] tm: restore xavps & flags after rebuilding message (#2821)

by lazedo

#### 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 setting via xavp in tm:local-request has no effect ``` xavp_via_params = "via" event_route[tm:local-request] { $xavp(via=>xi) = "something" via_add_xavp_params("1"); } reply_route { $var(vd) = $sel(via.params["xi"]); xlog("L_INFO", "$ci|log|core|reply $rm this should be true => ('$var(vd)' == 'something')\n"); } ``` #### Changes changed t_run_local_req and moved restore xavps & flags to the end, after the messages changes are applied. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2821 -- Commit Summary -- * tm: restore xavps & flags after rebuilding message -- File Changes -- M src/modules/tm/uac.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2821.patch https://github.com/kamailio/kamailio/pull/2821.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/2821

2 years, 8 months

git:master:7ee642c5: tm: restore xavps & flags after rebuilding message

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7ee642c58991e594f38247ab0751fadd07ce758c URL: https://github.com/kamailio/kamailio/commit/7ee642c58991e594f38247ab0751fad… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-11T19:44:40+02:00 tm: restore xavps & flags after rebuilding message --- Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/7ee642c58991e594f38247ab0751fad… Patch: https://github.com/kamailio/kamailio/commit/7ee642c58991e594f38247ab0751fad… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index ad6a74c8cb..9cbc9d5f88 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -300,10 +300,6 @@ static inline int t_run_local_req( set_route_type( backup_route_type ); p_onsend=0; - /* restore original environment */ - tm_xdata_swap(new_cell, &backup_xd, 1); - setsflagsval(sflag_bk); - if (unlikely(ra_ctx.run_flags&DROP_R_F)) { LM_DBG("tm:local-request dropped msg. to %.*s\n", lreq.dst_uri.len, lreq.dst_uri.s); @@ -372,6 +368,10 @@ static inline int t_run_local_req( } clean: + /* restore original environment */ + tm_xdata_swap(new_cell, &backup_xd, 1); + setsflagsval(sflag_bk); + /* clean local msg structure */ if (unlikely(lreq.new_uri.s)) {

2 years, 8 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2021