sr-dev March 2023

sr-dev@lists.kamailio.org

14 participants
251 discussions

[kamailio/kamailio] nats: add a reply param to nats_publish and expose as nats_publish_request in KEMI (PR #3397)
by Seven Du 06 Apr '23

06 Apr '23

#### 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  I added `nats_publish_request` which calls the `natsConnection_PublishRequestString` to send a request to the NATS server with a `reply` string so the response can be easily replied back. I tested in Lua and the native route, not sure if it's the right way to implement. I can update docs if it sounds good. Thanks. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3397 -- Commit Summary -- * nats: add a reply param to nats_publish and expose as nats_publish_request in KEMI -- File Changes -- M src/modules/nats/nats_mod.c (18) M src/modules/nats/nats_mod.h (2) M src/modules/nats/nats_pub.c (52) M src/modules/nats/nats_pub.h (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3397.patch https://github.com/kamailio/kamailio/pull/3397.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3397 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3397(a)github.com>

3 11

[kamailio/kamailio] nat module crashes if app_lua initialize fail (Issue #3401)
by sznoname 05 Apr '23

05 Apr '23

### Description  nat module crashes if app_lua initialize fail. ### Troubleshooting #### Reproduction  kamailio.cfg ```txt ### kamailio5.6.4 debug=2 log_stderror=no memdbg=5 memlog=5 log_facility=LOG_LOCAL0 log_prefix="{$mt $hdr(CSeq) $ci} " children=4 auto_aliases=no enable_sctp=no # listen=udp:192.168.31.63:5060 # mpath="/usr/local/lib/kamailio/modules/" loadmodule "kex.so" loadmodule "corex.so" loadmodule "tm.so" loadmodule "tmx.so" loadmodule "sl.so" loadmodule "pv.so" loadmodule "xlog.so" loadmodule "ctl.so" loadmodule "cfg_rpc.so" loadmodule "nats.so" loadmodule "app_lua.so" # modparam("ctl", "binrpc", "unix:/run/kamailio/kamailio_ctl") modparam("nats", "nats_url", "nats://127.0.0.1:4222") modparam("nats", "num_publish_workers", 1) modparam("nats", "subject_queue_group", "sipserver:group") modparam("app_lua", "load", "/etc/kamailio/kamailio.lua") request_route { sl_send_reply("200", "OK"); } ``` kamailio.lua ```lua cjson = require "cjson" -- but without cjson ``` #### Debugging Data  gdb kamailio core ```txt Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `kamailio'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x00007f6691e9c62b in ?? () from /lib/x86_64-linux-gnu/libuv.so.1 [Current thread is 1 (Thread 0x7f6692ac9740 (LWP 82969))] bt #0 0x00007f6691e9c62b in ?? () from /lib/x86_64-linux-gnu/libuv.so.1 #1 0x00007f6691ea3856 in ?? () from /lib/x86_64-linux-gnu/libuv.so.1 #2 0x00007f6691ea398f in uv_poll_stop () from /lib/x86_64-linux-gnu/libuv.so.1 #3 0x00007f6691f48b81 in nats_destroy_workers () at nats_mod.c:601 #4 0x00007f6691f48c01 in mod_destroy () at nats_mod.c:614 #5 0x000055dad0bb4752 in destroy_modules () at core/sr_module.c:842 #6 0x000055dad0977132 in cleanup (show_status=0) at main.c:561 #7 0x000055dad0978d97 in shutdown_children (sig=15, show_status=0) at main.c:704 #8 0x000055dad0993c7b in main (argc=1, argv=0x7ffd4ca63688) at main.c:3093 bt full #0 0x00007f6691e9c62b in ?? () from /lib/x86_64-linux-gnu/libuv.so.1 No symbol table info available. #1 0x00007f6691ea3856 in ?? () from /lib/x86_64-linux-gnu/libuv.so.1 No symbol table info available. #2 0x00007f6691ea398f in uv_poll_stop () from /lib/x86_64-linux-gnu/libuv.so.1 No symbol table info available. #3 0x00007f6691f48b81 in nats_destroy_workers () at nats_mod.c:601 i = 0 worker = 0x7f668dceee10 pub_worker = 0x7f668dceeeb0 __func__ = "nats_destroy_workers" #4 0x00007f6691f48c01 in mod_destroy () at nats_mod.c:614 __func__ = "mod_destroy" #5 0x000055dad0bb4752 in destroy_modules () at core/sr_module.c:842 t = 0x7f6692368870 foo = 0x7f6692366d20 __func__ = "destroy_modules" #6 0x000055dad0977132 in cleanup (show_status=0) at main.c:561 memlog = 0 __func__ = "cleanup" #7 0x000055dad0978d97 in shutdown_children (sig=15, show_status=0) at main.c:704 __func__ = "shutdown_children" #8 0x000055dad0993c7b in main (argc=1, argv=0x7ffd4ca63688) at main.c:3093 cfg_stream = 0x55dad295c380 c = -1 r = 0 tmp = 0x100000000 <error: Cannot access memory at address 0x100000000> tmp_len = 0 port = 895 proto = 0 ahost = 0x0 aport = 0 options = 0x55dad0db4278 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 193248401 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0xc000 p = 0x0 --Type <RET> for more, q to quit, c to continue without paging-- st = {st_dev = 22, st_ino = 830, st_nlink = 2, st_mode = 16832, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 60, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1679270080, tv_nsec = 182554285}, st_mtim = {tv_sec = 1679531455, tv_nsec = 805444368}, st_ctim = {tv_sec = 1679531455, tv_nsec = 805444368}, __glibc_reserved = {0, 0, 0}} tbuf = "\000\000\000\000\000\000\000\000\377\377\377\377\000\000\000\000x\230ْf\177\000\000кܒf\177", '\000' <repeats 42 times>, "pvْf\177\000\000\r\000\000\000\000\000\000\000\230\341ɒf\177\000\000\230\066\246L\375\177\000\000H\355\350\320\332U\000\000 \260ܒf\177\000\000\256\217ڒf\177\000\000\001", '\000' <repeats 15 times>, "x\230ْf\177\000\000\300\370ڒf\177\000\000\274\032\255\222f\177\000\000\000\066\246L\375\177\000\000\001", '\000' <repeats 15 times>, "\230\066\246L\375\177\000\000ڱڒf\177\000\000\000\000\000\000\000\000\000\000"... option_index = 0 long_options = {{name = 0x55dad0db66e6 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x55dad0db1524 "version", has_arg = 0, flag = 0x0, val = 118}, { name = 0x55dad0db66eb "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x55dad0db66f1 "subst", has_arg = 1, flag = 0x0, val = 1025}, { name = 0x55dad0db66f7 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x55dad0db6700 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, { name = 0x55dad0db670a "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x55dad0db6714 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, { name = 0x55dad0db671f "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x55dad0db6728 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, { name = 0x55dad0db6733 "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x55dad0db6739 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, { name = 0x55dad0db6743 "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio 5.6.4 (x86_64/linux) a004cf ``` * **Operating System**:  ``` Debian11 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3401 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3401(a)github.com>

2 2

[kamailio/kamailio] Inactive video stream: can't find media IP in the message (Issue #3406)
by schoberw 05 Apr '23

05 Apr '23

### Description In some situations the other side UA must reply with an inactive media stream. E.g. if video was added but not supported by the other side. The UAS then must answer with an m=video 0 RTP/.. line. It seams that the video section must contain a c= line with an IP address for rtpengine to function. If there is no c line (no IP address) the SDP body cannot be parsed and thus no RTP proxy is invoked. ### Troubleshooting Not easy to reproduce since the answer must bei "wrong". Is it correct to reply an SDP body (media = video) like this? ``` m=video 0 RTP/AVPF 96 a=label:1 a=inactive a=mid:1 ``` Maybe not (but Audiocodes SBC lates LTS version does it) - so we are dependent on other side now that this service works. #### Reproduction reInvite with Video to a UA that has no video Support (e.g. Bria -> Snom). Drop the c line in the video part with some textops in 200 OK (just to reproduce of course). A -> B, connect the call A -> + video, B has no video support A presses hold #### Log Messages Incoming 200 OK after doing hold with an inactive video: ``` v=0 o=root 436040161 309284577 IN IP4 1.2.3.5 s=call t=0 0 m=audio 14200 RTP/AVPF 9 8 126 c=IN IP4 1.2.3.5 a=ptime:20 a=recvonly a=mid:0 a=rtpmap:9 G722/8000 a=rtpmap:8 PCMA/8000 a=rtpmap:126 telephone-event/8000 a=fmtp:126 0-15 m=video 0 RTP/AVPF 96 a=label:1 a=inactive a=mid:1 Mar 27 17:52:22 c5p05es2-1 /usr/sbin/kamailio[2938205]: ERROR: <core> [core/parser/sdp/sdp.c:490]: parse_sdp_session(): can't find media IP in the message Mar 27 17:52:22 c5p05es2-1 /usr/sbin/kamailio[2938205]: INFO: <script>: >>> Sending Reply: 200 OK (1.2.3.4:443 -> 100.108.48.38:65251) ``` Compare to working SDP parsing: ``` a=rtpmap:9 G722/8000 a=rtpmap:8 PCMA/8000 a=rtpmap:126 telephone-event/8000 a=fmtp:126 0-15 m=video 0 RTP/AVP 96 c=IN IP4 1.2.3.5 a=inactive a=mid:1 Mar 27 18:00:17 c5p05es2-1 /usr/sbin/kamailio[2942881]: INFO: <script>: ONREPLY_ROUTE[FORWARD] Mar 27 18:00:17 c5p05es2-1 /usr/sbin/kamailio[2942881]: INFO: <script>: ROUTE[RTPP_REPLY] Mar 27 18:00:17 c5p05es2-1 /usr/sbin/kamailio[2942881]: INFO: <script>: > 200 with video Mar 27 18:00:17 c5p05es2-1 /usr/sbin/kamailio[2942881]: INFO: <script>: > 200 with inactive video Mar 27 18:00:17 c5p05es2-1 /usr/sbin/kamailio[2942881]: INFO: <script>: > Remove inactive video Mar 27 18:00:17 c5p05es2-1 /usr/sbin/kamailio[2942881]: INFO: <script>: > Answer to WebRTC client: 200 - qijpuibkv6ufhnd282ks Mar 27 18:00:17 c5p05es2-1 /usr/sbin/kamailio[2942881]: INFO: <script>: >>> Sending Reply: 200 OK (91.237.65.14:443 -> 80.108.48.38:65388) ``` ### Possible Solutions Tried to fix in script: ``` if(sdp_with_media("video")) xlog("L_INFO", "> $rs with video"); if(sdp_with_active_media("video")) xlog("L_INFO", "> $rs with active video"); if(!sdp_with_active_media("video")) xlog("L_INFO", "> $rs with inactive video"); if(sdp_with_media("video") && !sdp_with_active_media("video")) { # try fix for RMT#60189 xlog("L_INFO", "> Remove inactive video"); sdp_remove_media("video"); msg_apply_changes(); # needed? } ``` But since sdpops cannot parse it cannot remove the buggy media, too. See the log: non of the xlog is logging. If there is inactive media the c line is not mandatory. The parser should accept this by adding a default IP of 0.0.0.0, if needed Doing tricks with textops is not a easy nor performant solution to accept this wrong SDP from other parties. ### Additional Information ``` version: kamailio 5.6.4 (x86_64/linux) 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: unknown compiled with gcc 10.2.1 ``` * **Operating System**: Debian Bullseye -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3406 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3406(a)github.com>

3 4

[kamailio/kamailio] Unable to change $td(to domain) in kamailio cancel requests (Issue #3409)
by premkumarramasamy 05 Apr '23

05 Apr '23

3 4

git:master:c7e228ea: pua: updates for the new t field names
by Daniel-Constantin Mierla 31 Mar '23

31 Mar '23

Module: kamailio Branch: master Commit: c7e228eae76a432ea93fac7e95f50fe50979d79e URL: https://github.com/kamailio/kamailio/commit/c7e228eae76a432ea93fac7e95f50fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-31T18:34:00+02:00 pua: updates for the new t field names --- Modified: src/modules/pua/send_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/c7e228eae76a432ea93fac7e95f50fe… Patch: https://github.com/kamailio/kamailio/commit/c7e228eae76a432ea93fac7e95f50fe… --- diff --git a/src/modules/pua/send_subscribe.c b/src/modules/pua/send_subscribe.c index 723507bb861..dc239c61b63 100644 --- a/src/modules/pua/send_subscribe.c +++ b/src/modules/pua/send_subscribe.c @@ -335,7 +335,7 @@ void subs_cback_func(struct cell *t, int cb_type, struct tmcb_params *ps) goto faked_error; } memset(callid, 0, sizeof(struct hdr_field)); - get_hdr_field(t->callid.s, t->callid.s + t->callid.len, callid); + get_hdr_field(t->callid_hdr.s, t->callid_hdr.s + t->callid_hdr.len, callid); hentity->call_id = callid->body; from = (struct hdr_field *) pkg_malloc(sizeof(struct hdr_field)); @@ -345,7 +345,7 @@ void subs_cback_func(struct cell *t, int cb_type, struct tmcb_params *ps) goto faked_error; } memset(from, 0, sizeof(struct hdr_field)); - get_hdr_field(t->from.s, t->from.s + t->from.len, from); + get_hdr_field(t->from_hdr.s, t->from_hdr.s + t->from_hdr.len, from); parse_to(from->body.s, from->body.s + from->body.len + 1, &FROM); if(FROM.uri.len <= 0) {

1 0

git:master:c321f28f: tm: use header attribute shortcuts to match inside t_lookup_callid()
by Daniel-Constantin Mierla 31 Mar '23

31 Mar '23

Module: kamailio Branch: master Commit: c321f28ff657c921b8de2b84e66908f281d35d78 URL: https://github.com/kamailio/kamailio/commit/c321f28ff657c921b8de2b84e66908f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-31T18:24:24+02:00 tm: use header attribute shortcuts to match inside t_lookup_callid() --- Modified: src/modules/tm/t_lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/c321f28ff657c921b8de2b84e66908f… Patch: https://github.com/kamailio/kamailio/commit/c321f28ff657c921b8de2b84e66908f… --- diff --git a/src/modules/tm/t_lookup.c b/src/modules/tm/t_lookup.c index 696dfacd0a..70574eb323 100644 --- a/src/modules/tm/t_lookup.c +++ b/src/modules/tm/t_lookup.c @@ -2163,14 +2163,14 @@ int t_is_local(struct sip_msg* p_msg) return is_local(t); } -/** lookup a transaction based on callid and cseq. +/** lookup an invite transaction based on callid and cseq. * The parameters are pure header field content only, - * e.g. "123(a)10.0.0.1" and "11" + * e.g. callid: "123(a)10.0.0.1" and cseq: "11" * @param trans - double pointer to the transaction, filled with a pointer * to the found transaction on success and with 0 if the * transaction was not found. * @param callid - callid for the searched transaction. - * @param cseq - cseq for the searched transaction. + * @param cseq - cseq number for the searched transaction. * @return -1 on error/not found, 1 if found. * Side-effects: sets T and T_branch (T_branch always to T_BR_UNDEFINED). */ @@ -2179,20 +2179,6 @@ int t_lookup_callid(struct cell ** trans, str callid, str cseq) { unsigned hash_index; struct entry* hash_bucket; - /* I use MAX_HEADER, not sure if this is a good choice... */ - char callid_header[MAX_HEADER]; - char cseq_header[MAX_HEADER]; - /* save return value of print_* functions here */ - char* endpos; - - /* need method, which is always INVITE in our case */ - /* CANCEL is only useful after INVITE */ - str invite_method; - char* invite_string = INVITE; - - invite_method.s = invite_string; - invite_method.len = INVITE_LEN; - /* lookup the hash index where the transaction is stored */ hash_index=hash(callid, cseq); @@ -2201,15 +2187,6 @@ int t_lookup_callid(struct cell ** trans, str callid, str cseq) { return -1; } - /* create header fields the same way tm does itself, then compare headers */ - endpos = print_callid_mini(callid_header, callid); - LM_DBG("created comparable call_id header field: >%.*s<\n", - (int)(endpos - callid_header), callid_header); - - endpos = print_cseq_mini(cseq_header, &cseq, &invite_method); - LM_DBG("created comparable cseq header field: >%.*s<\n", - (int)(endpos - cseq_header), cseq_header); - LOCK_HASH(hash_index); LM_DBG("just locked hash index %u, looking for transactions there:\n", hash_index); @@ -2219,10 +2196,19 @@ int t_lookup_callid(struct cell ** trans, str callid, str cseq) { clist_foreach(hash_bucket, p_cell, next_c){ prefetch_loc_r(p_cell->next_c, 1); + + if(p_cell->callid_val.s==NULL || p_cell->cseq_num.s==NULL + || p_cell->cseq_met.s==NULL) { + LM_CRIT("null shortcuts for matching attributes - t:%p cid:%p csn:%p csm:%p\n", + p_cell, p_cell->callid_val.s, p_cell->cseq_num.s, p_cell->cseq_met.s); + continue; + } /* compare complete header fields, casecmp to make sure invite=INVITE*/ - if ((strncmp(callid_header, p_cell->callid_hdr.s, p_cell->callid_hdr.len) == 0) - && (strncasecmp(cseq_header, p_cell->cseq_hdr_n.s, p_cell->cseq_hdr_n.len) - == 0)) { + if((callid.len==p_cell->callid_val.len) && (cseq.len==p_cell->cseq_num.len) + && (INVITE_LEN==p_cell->cseq_met.len) + && (strncmp(callid.s, p_cell->callid_val.s, callid.len)==0) + && (strncmp(cseq.s, p_cell->cseq_num.s, cseq.len)==0) + && (strncasecmp(INVITE, p_cell->cseq_met.s, INVITE_LEN)==0)) { LM_DBG("we have a match: callid=>>%.*s<< cseq=>>%.*s<<\n", p_cell->callid_hdr.len, p_cell->callid_hdr.s, p_cell->cseq_hdr_n.len, p_cell->cseq_hdr_n.s);

1 0

git:master:2bd1227b: tm: keep shortcut the cseq header method
by Daniel-Constantin Mierla 31 Mar '23

31 Mar '23

Module: kamailio Branch: master Commit: 2bd1227b2440dd376c18e6c964f569e0e9ba4730 URL: https://github.com/kamailio/kamailio/commit/2bd1227b2440dd376c18e6c964f569e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-31T18:24:24+02:00 tm: keep shortcut the cseq header method --- Modified: src/modules/tm/h_table.h Modified: src/modules/tm/t_lookup.c Modified: src/modules/tm/t_msgbuilder.c Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/2bd1227b2440dd376c18e6c964f569e… Patch: https://github.com/kamailio/kamailio/commit/2bd1227b2440dd376c18e6c964f569e… --- diff --git a/src/modules/tm/h_table.h b/src/modules/tm/h_table.h index fdf80fcb43..5ebba9b0fc 100644 --- a/src/modules/tm/h_table.h +++ b/src/modules/tm/h_table.h @@ -372,8 +372,11 @@ typedef struct cell str cseq_hdr_n; str to_hdr; + /* shortcuts inside above fields */ str callid_val; str cseq_num; + str cseq_met; + /* method shortcut -- for local transactions, pointer to * outbound buffer, for proxies transactions pointer to * original message; needed for reply matching */ diff --git a/src/modules/tm/t_lookup.c b/src/modules/tm/t_lookup.c index f4f929a811..696dfacd0a 100644 --- a/src/modules/tm/t_lookup.c +++ b/src/modules/tm/t_lookup.c @@ -1649,6 +1649,9 @@ static inline void init_new_t(struct cell *new_cell, struct sip_msg *p_msg) new_cell->cseq_num.s = get_cseq(shm_msg)->number.s; new_cell->cseq_num.len = get_cseq(shm_msg)->number.len; trim(&new_cell->cseq_num); + new_cell->cseq_met.s = get_cseq(shm_msg)->method.s; + new_cell->cseq_met.len = get_cseq(shm_msg)->method.len; + trim(&new_cell->cseq_met); new_cell->method=new_cell->uas.request->first_line.u.request.method; if (p_msg->REQ_METHOD==METHOD_INVITE){ diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index 4de65ffcf3..2e053341b1 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -1498,6 +1498,9 @@ static inline char* print_cseq(char* w, str* cseq, str* method, struct cell* t) t->cseq_num.s = t->cseq_hdr_n.s + CSEQ_LEN; t->cseq_num.len = cseq->len; trim(&t->cseq_num); + t->cseq_met.s = t->cseq_hdr_n.s + CSEQ_LEN + cseq->len + 1; + t->cseq_met.len = method->len; + trim(&t->cseq_met); return w; } diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index 3f3b7c3761..f35bf345f8 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -193,6 +193,9 @@ int uac_refresh_shortcuts(tm_cell_t *tcell, int branch, char *buf, int buf_len) tcell->cseq_num.s = cs->number.s; tcell->cseq_num.len = cs->number.len; trim(&tcell->cseq_num); + tcell->cseq_met.s = cs->method.s; + tcell->cseq_met.len = cs->method.len; + trim(&tcell->cseq_met); LM_DBG("cseq: [%.*s]\n", tcell->cseq_hdr_n.len, tcell->cseq_hdr_n.s); lreq.buf=0;

1 0

git:master:734fd291: sca: updates for the new t field names
by Daniel-Constantin Mierla 31 Mar '23

31 Mar '23

Module: kamailio Branch: master Commit: 734fd2910cd437205da870ad1e329eaefe2f043a URL: https://github.com/kamailio/kamailio/commit/734fd2910cd437205da870ad1e329ea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-31T18:24:24+02:00 sca: updates for the new t field names --- Modified: src/modules/sca/sca_notify.c --- Diff: https://github.com/kamailio/kamailio/commit/734fd2910cd437205da870ad1e329ea… Patch: https://github.com/kamailio/kamailio/commit/734fd2910cd437205da870ad1e329ea… --- diff --git a/src/modules/sca/sca_notify.c b/src/modules/sca/sca_notify.c index 04638ba7675..271e549f5c6 100644 --- a/src/modules/sca/sca_notify.c +++ b/src/modules/sca/sca_notify.c @@ -74,8 +74,8 @@ static void sca_notify_reply_cb( } return; - if(sca_uri_extract_aor(&t->to, &to_aor) < 0) { - LM_ERR("Failed to extract AoR from %.*s\n", STR_FMT(&t->to)); + if(sca_uri_extract_aor(&t->to_hdr, &to_aor) < 0) { + LM_ERR("Failed to extract AoR from %.*s\n", STR_FMT(&t->to_hdr)); return; } // t->to is the entire To header: "To: sip:....", so move to_aor.s ahead

1 0

git:master:ecd906da: lcr: updates for the new t field names
by Daniel-Constantin Mierla 31 Mar '23

31 Mar '23

Module: kamailio Branch: master Commit: ecd906dabbc5dc19d0fabb35d22320e2ba3fccf0 URL: https://github.com/kamailio/kamailio/commit/ecd906dabbc5dc19d0fabb35d22320e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-31T18:24:24+02:00 lcr: updates for the new t field names --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ecd906dabbc5dc19d0fabb35d22320e… Patch: https://github.com/kamailio/kamailio/commit/ecd906dabbc5dc19d0fabb35d22320e… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index 80b62f5d4c..a581c0b349 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -2830,8 +2830,8 @@ static void ping_callback(struct cell *t, int type, struct tmcb_params *ps) /* SIP URI is taken from the Transaction. * Remove the "To: <" (s+5) and the trailing >+new-line (s - 5 (To: <) * - 3 (>\r\n)). */ - uri.s = t->to.s + 5; - uri.len = t->to.len - 8; + uri.s = t->to_hdr.s + 5; + uri.len = t->to_hdr.len - 8; LM_DBG("OPTIONS %.*s finished with code <%d>\n", uri.len, uri.s, ps->code);

1 0

git:master:8f39d0ff: keepalive: updates for the new t field names
by Daniel-Constantin Mierla 31 Mar '23

31 Mar '23

Module: kamailio Branch: master Commit: 8f39d0ff741a3ba5819c6c0f96b8f575d30ab770 URL: https://github.com/kamailio/kamailio/commit/8f39d0ff741a3ba5819c6c0f96b8f57… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-31T18:24:24+02:00 keepalive: updates for the new t field names --- Modified: src/modules/keepalive/keepalive_core.c --- Diff: https://github.com/kamailio/kamailio/commit/8f39d0ff741a3ba5819c6c0f96b8f57… Patch: https://github.com/kamailio/kamailio/commit/8f39d0ff741a3ba5819c6c0f96b8f57… --- diff --git a/src/modules/keepalive/keepalive_core.c b/src/modules/keepalive/keepalive_core.c index df59553392f..ea16dfdc000 100644 --- a/src/modules/keepalive/keepalive_core.c +++ b/src/modules/keepalive/keepalive_core.c @@ -120,8 +120,8 @@ static void ka_options_callback( shm_free(uuid); ka_unlock_destination_list(); - uri.s = t->to.s + 5; - uri.len = t->to.len - 8; + uri.s = t->to_hdr.s + 5; + uri.len = t->to_hdr.len - 8; LM_DBG("OPTIONS request was finished with code %d (to %.*s)\n", ps->code, ka_dest->uri.len, ka_dest->uri.s); //uri.len, uri.s);

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
26
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 2023