sr-dev April 2025

sr-dev@lists.kamailio.org

14 participants
208 discussions

git:master:eff0a5d9: snmpstats: mibs/KAMAILIO-MIB relocated DEFVAL after DESCRIPTION
by Daniel-Constantin Mierla 07 Apr '25

07 Apr '25

Module: kamailio Branch: master Commit: eff0a5d9b39b371c2fdea0378a1f52002cba1e7f URL: https://github.com/kamailio/kamailio/commit/eff0a5d9b39b371c2fdea0378a1f520… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-07T13:20:32+02:00 snmpstats: mibs/KAMAILIO-MIB relocated DEFVAL after DESCRIPTION - follow better the definition specs - some tools complain otherwise --- Modified: src/modules/snmpstats/mibs/… [View More]

1 0

Info: Donating To Kamailio Project
by Daniel-Constantin Mierla 07 Apr '25

07 Apr '25

Hello! Over the years, there have been discussions about what options could be made available to donate to Kamailio project in order to support its required infrastructure, administrative or development of complex components. Creating a foundation or using a crowdfunding platform have been explored, trying to take in consideration the needed man power and overhead, the transparency and accountability. To move forward on this matter, the Kamailio management team has decided to use Open … [View More]

1 0

git:master:9bf0bb20: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 07 Apr '25

07 Apr '25

Module: kamailio Branch: master Commit: 9bf0bb20bcfe6409b6c02aea83175172914135b5 URL: https://github.com/kamailio/kamailio/commit/9bf0bb20bcfe6409b6c02aea8317517… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-04-07T09:46:10+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/9bf0bb20bcfe6409b6c02aea8317517… … [View More]Patch: https://github.com/kamailio/kamailio/commit/9bf0bb20bcfe6409b6c02aea8317517… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index c0385295106..4821b265a91 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -164,8 +164,9 @@ Daniel-Constantin Mierla 5.10. tm.reply 5.11. tm.reply_callid 5.12. tm.retransmit_reply - 5.13. tm.clean - 5.14. tm.stats + 5.13. tm.retransmit_reply_callid + 5.14. tm.clean + 5.15. tm.stats 6. Event Routes @@ -305,9 +306,10 @@ Daniel-Constantin Mierla 1.110. t_exists usage 1.111. t_cell_append_branches usage 1.112. Using “tm.retransmit_reply” - 1.113. event_route[tm:branch-failure:id] usage - 1.114. event_route[tm:local-request] usage - 1.115. event_route[tm:local-response] usage + 1.113. Using “tm.retransmit_reply_callid” + 1.114. event_route[tm:branch-failure:id] usage + 1.115. event_route[tm:local-request] usage + 1.116. event_route[tm:local-response] usage Chapter 1. Admin Guide @@ -452,8 +454,9 @@ Chapter 1. Admin Guide 5.10. tm.reply 5.11. tm.reply_callid 5.12. tm.retransmit_reply - 5.13. tm.clean - 5.14. tm.stats + 5.13. tm.retransmit_reply_callid + 5.14. tm.clean + 5.15. tm.stats 6. Event Routes @@ -3198,8 +3201,9 @@ reply_route { 5.10. tm.reply 5.11. tm.reply_callid 5.12. tm.retransmit_reply - 5.13. tm.clean - 5.14. tm.stats + 5.13. tm.retransmit_reply_callid + 5.14. tm.clean + 5.15. tm.stats 5.1. tm.list @@ -3306,14 +3310,27 @@ reply_route { kamcli rpc tm.retransmit_reply 1234:5678 ... -5.13. tm.clean +5.13. tm.retransmit_reply_callid + + Retransmit the reply for an existing SIP transaction. + + Parameters: + * callid - SIP Call-ID header + * cseq - SIP CSeq header + + Example 1.113. Using “tm.retransmit_reply_callid” +... +kamcli rpc tm.retransmit_reply_callid "abc-xyz" "10 INVITE" +... + +5.14. tm.clean Trigger a hard clean of expired transactions. Parameters: * none -5.14. tm.stats +5.15. tm.stats Gets information about current and past TM transaction handling. @@ -3336,7 +3353,7 @@ kamcli rpc tm.retransmit_reply 1234:5678 enabled with the t_on_branch_failure function. This event_route uses the BRANCH_FAILURE_ROUTE route type. - Example 1.113. event_route[tm:branch-failure:id] usage + Example 1.114. event_route[tm:branch-failure:id] usage ... request_route { ... @@ -3362,7 +3379,7 @@ event_route[tm:branch-failure:myroute] { The request can still be updated, i.e., changes are possible to R-URI ($ru), destination URI ($du) or the send socket ($fs). - Example 1.114. event_route[tm:local-request] usage + Example 1.115. event_route[tm:local-request] usage ... event_route [tm:local-request] { xlog("L_INFO", "Routing locally generated $rm to $ru\n"); @@ -3375,7 +3392,7 @@ event_route [tm:local-request] { Executed after the tm module sent a local generated, transaction stateful response. - Example 1.115. event_route[tm:local-response] usage + Example 1.116. event_route[tm:local-response] usage ... event_route[tm:local-response] { xlog("tm:local-response replied locally\n"); [View Less]

1 0

git:master:31e939a4: tm: docs for rpc tm.retransmit_reply_callid command
by Daniel-Constantin Mierla 07 Apr '25

07 Apr '25

Module: kamailio Branch: master Commit: 31e939a454b90bb6004073b8ad9e13fbcde2f8ca URL: https://github.com/kamailio/kamailio/commit/31e939a454b90bb6004073b8ad9e13f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-07T08:17:01+02:00 tm: docs for rpc tm.retransmit_reply_callid command --- Modified: src/modules/tm/doc/rpc.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:ba662a50: tm: added rpc command tm.retransmit_reply_callid
by Daniel-Constantin Mierla 07 Apr '25

07 Apr '25

Module: kamailio Branch: master Commit: ba662a50013a84e2d492460c3ae5cf80fc85c6f0 URL: https://github.com/kamailio/kamailio/commit/ba662a50013a84e2d492460c3ae5cf8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-07T08:17:01+02:00 tm: added rpc command tm.retransmit_reply_callid --- Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/t_reply.h Modified: src/modules/tm/tm.c --- Diff: https://… [View More]github.com/kamailio/kamailio/commit/ba662a50013a84e2d492460c3ae5cf8… Patch: https://github.com/kamailio/kamailio/commit/ba662a50013a84e2d492460c3ae5cf8… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 670260d93e8..7f3e70ae7cb 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -3123,6 +3123,50 @@ void rpc_reply_callid(rpc_t *rpc, void *c) } } +/* + * Syntax: + * + * ":tm.retransmit_reply:[response file]\n + * callid + * cseq + * \n" + */ +void rpc_retransmit_reply_callid(rpc_t *rpc, void *c) +{ + int ret; + tm_cell_t *trans; + tm_cell_t *orig_t = NULL; + int orig_branch; + str callid = {0, 0}; + str cseq = {0, 0}; + + if(rpc->scan(c, "S", &callid) < 1) { + rpc->fault(c, 400, "Call-ID expected"); + return; + } + + if(rpc->scan(c, "S", &cseq) < 1) { + rpc->fault(c, 400, "CSeq expected"); + return; + } + + tm_get_tb(&orig_t, &orig_branch); + if(t_lookup_callid(&trans, callid, cseq) < 0) { + rpc->fault(c, 404, "Transaction not found"); + return; + } + /* it is refcounted now */ + ret = t_retransmit_reply(trans); + UNREF(trans); + tm_set_tb(orig_t, orig_branch); + + if(ret < 0) { + LM_ERR("Reply retransmission failed\n"); + rpc->fault(c, 500, "Reply retransmission failed"); + return; + } +} + /* * Syntax: * diff --git a/src/modules/tm/t_reply.h b/src/modules/tm/t_reply.h index 0fe1c09eb81..5e3d0451768 100644 --- a/src/modules/tm/t_reply.h +++ b/src/modules/tm/t_reply.h @@ -227,6 +227,7 @@ void t_drop_replies(int v); void rpc_reply(rpc_t *rpc, void *c); void rpc_reply_callid(rpc_t *rpc, void *c); void rpc_retransmit_reply(rpc_t *rpc, void *c); +void rpc_retransmit_reply_callid(rpc_t *rpc, void *c); int faked_env(struct cell *t, struct sip_msg *msg, int is_async_env); struct sip_msg *fake_req(struct sip_msg *shmem_msg, int extra_flags, diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 0df18a8bd1b..b33c66f63fc 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -2869,6 +2869,11 @@ static const char *rpc_retransmit_reply_doc[2] = { 0 }; +static const char *rpc_retransmit_reply_callid_doc[2] = { + "Retransmit the transaction reply by call-id", + 0 +}; + static const char *rpc_reply_callid_doc[2] = { "Reply transaction by call-id", 0 @@ -2943,6 +2948,8 @@ static rpc_export_t tm_rpc[] = { {"tm.cancel", rpc_cancel, rpc_cancel_doc, 0}, {"tm.reply", rpc_reply, rpc_reply_doc, 0}, {"tm.retransmit_reply", rpc_retransmit_reply, rpc_retransmit_reply_doc, 0}, + {"tm.retransmit_reply_callid", rpc_retransmit_reply_callid, + rpc_retransmit_reply_callid_doc, 0}, {"tm.reply_callid", rpc_reply_callid, rpc_reply_callid_doc, 0}, {"tm.stats", tm_rpc_stats, tm_rpc_stats_doc, 0}, {"tm.hash_stats", tm_rpc_hash_stats, tm_rpc_hash_stats_doc, 0}, [View Less]

1 0

[kamailio/kamailio] Kamailio 2648eb3 buffer overflow crash (Issue #4204)
by CAPCOMIN 05 Apr '25

05 Apr '25

CAPCOMIN created an issue (kamailio/kamailio#4204)  ### Description  I am experimenting with fuzzing on Kamailio SIP. The messages in the attached file crash the Kamailio server. ### Troubleshooting #### Reproduction  You can build the image using this [dockerfile](https://github.com/profuzzbench/profuzzbench/blob/master/subjec…. I am running the server with a basic configuration (attached kamailio-basic.cfg), using the command: ``` ./src/kamailio -f ../kamailio-basic.cfg -L ./src/modules -Y runtime_dir -n 1 -D -E ``` [kamailio-basic.cfg.txt](https://github.com/user-attachments/files/19615271/… On the same machine, I am sending the malformed message using aflnet-replay: ``` aflnet-replay ~/sipcrash.txt SIP 5060 ``` [sipcrash.txt](https://github.com/user-attachments/files/19615274/sipcrash.t… #### Debugging Data  ``` root@d3fd59910480:/home/ubuntu/experiments/kamailio# ./src/kamailio -f ../kamailio-basic.cfg -L ./src/modules -Y runtime_dir -n 1 -D -E #!!! 0(139581) INFO: <core> [core/sctp_core.c:75]: sctp_core_check_support(): SCTP API not enabled - if you want to use it, load sctp module Listening on udp: 127.0.0.1 [127.0.0.1]:5060 Aliases: WARNING: no fork mode 0(139581) INFO: rr [./../outbound/api.h:52]: ob_load_api(): unable to import bind_ob - maybe module is not loaded 0(139581) INFO: rr [rr_mod.c:188]: mod_init(): outbound module not available 0(139581) INFO: <core> [main.c:2841]: main(): processes (at least): 4 - shm size: 67108864 - pkg size: 8388608 0(139581) INFO: <core> [core/udp_server.c:154]: probe_max_receive_buffer(): SO_RCVBUF is initially 212992 0(139581) INFO: <core> [core/udp_server.c:206]: probe_max_receive_buffer(): SO_RCVBUF is finally 425984 0(139581) WARNING: {1 1 REGISTER 1-670(a)127.0.0.1} sanity [sanity.c:612]: check_cl(): content length header missing in request ================================================================= ==139581==ERROR: AddressSanitizer: global-buffer-overflow on address 0x000001d5e560 at pc 0x000000fcbc2f bp 0x7ffd115433d0 sp 0x7ffd115433c8 READ of size 1 at 0x000001d5e560 thread T0 #0 0xfcbc2e in skip_uri /home/ubuntu/experiments/kamailio/src/core/parser/contact/contact.c:53:10 #1 0xfcbc2e in parse_contacts /home/ubuntu/experiments/kamailio/src/core/parser/contact/contact.c:210:7 #2 0xfcdd18 in contact_parser /home/ubuntu/experiments/kamailio/src/core/parser/contact/parse_contact.c:55:7 #3 0xfcdd18 in parse_contact /home/ubuntu/experiments/kamailio/src/core/parser/contact/parse_contact.c:84:6 #4 0x7f0fe32590c4 in parse_message /home/ubuntu/experiments/kamailio/src/modules/registrar/sip_msg.c:125:26 #5 0x7f0fe3266f2f in save /home/ubuntu/experiments/kamailio/src/modules/registrar/save.c:897:6 #6 0x695413 in do_action /home/ubuntu/experiments/kamailio/src/core/action.c:1082:4 #7 0x6ce894 in run_actions /home/ubuntu/experiments/kamailio/src/core/action.c:1581:7 #8 0x6d161c in run_actions_safe /home/ubuntu/experiments/kamailio/src/core/action.c:1645:8 #9 0x5f8b1a in rval_get_int /home/ubuntu/experiments/kamailio/src/core/rvalue.c:915:9 #10 0x603507 in rval_expr_eval_int /home/ubuntu/experiments/kamailio/src/core/rvalue.c:1913:8 #11 0x60259f in rval_expr_eval_int /home/ubuntu/experiments/kamailio/src/core/rvalue.c:1921:8 #12 0x691381 in do_action /home/ubuntu/experiments/kamailio/src/core/action.c:1052:10 #13 0x6ce894 in run_actions /home/ubuntu/experiments/kamailio/src/core/action.c:1581:7 #14 0x6924cb in do_action /home/ubuntu/experiments/kamailio/src/core/action.c:700:8 #15 0x6ce894 in run_actions /home/ubuntu/experiments/kamailio/src/core/action.c:1581:7 #16 0x6d19fd in run_top_route /home/ubuntu/experiments/kamailio/src/core/action.c:1666:8 #17 0xb16ce6 in receive_msg /home/ubuntu/experiments/kamailio/src/core/receive.c:423:8 #18 0x7886fb in udp_rcv_loop /home/ubuntu/experiments/kamailio/src/core/udp_server.c:543:4 #19 0x4f9ab0 in main_loop /home/ubuntu/experiments/kamailio/src/main.c:1480:10 #20 0x51b219 in main /home/ubuntu/experiments/kamailio/src/main.c:2863:6 #21 0x7f0fe79b2082 in __libc_start_main /build/glibc-e2p3jK/glibc-2.31/csu/../csu/libc-start.c:308:16 #22 0x43479d in _start (/home/ubuntu/experiments/kamailio/src/kamailio+0x43479d) 0x000001d5e560 is located 0 bytes to the right of global variable 'buf' defined in 'core/udp_server.c:425:14' (0x1d4e560) of size 65536 SUMMARY: AddressSanitizer: global-buffer-overflow /home/ubuntu/experiments/kamailio/src/core/parser/contact/contact.c:53:10 in skip_uri Shadow bytes around the buggy address: 0x0000803a3c50: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0x0000803a3c60: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0x0000803a3c70: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0x0000803a3c80: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0x0000803a3c90: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 =>0x0000803a3ca0: 00 00 00 00 00 00 00 00 00 00 00 00[f9]f9 f9 f9 0x0000803a3cb0: f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 0x0000803a3cc0: f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 0x0000803a3cd0: f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 0x0000803a3ce0: f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 0x0000803a3cf0: f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 Shadow byte legend (one shadow byte represents 8 application bytes): Addressable: 00 Partially addressable: 01 02 03 04 05 06 07 Heap left redzone: fa Freed heap region: fd Stack left redzone: f1 Stack mid redzone: f2 Stack right redzone: f3 Stack after return: f5 Stack use after scope: f8 Global redzone: f9 Global init order: f6 Poisoned by user: f7 Container overflow: fc Array cookie: ac Intra object redzone: bb ASan internal: fe Left alloca redzone: ca Right alloca redzone: cb Shadow gap: cc ==139581==ABORTING ``` #### Log Messages  In the Debugging Data #### SIP Traffic  [traffic.txt](https://github.com/user-attachments/files/19615184/traffic.txt) ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.5.0-dev2 (x86_64/linux) 2648eb-dirty flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, 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: 2648eb -dirty compiled on 11:51:00 May 5 2024 with afl-clang-fast clang version 10.0.0-4ubuntu1 ``` * **Operating System**:  ``` Linux d3fd59910480 5.15.0-125-generic #135~20.04.1-Ubuntu SMP Mon Oct 7 13:56:22 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4204 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4204(a)github.com> [View Less]

1 1

[kamailio/kamailio] Problems with ims_ipsec_pcscf and closed tcp connections (Issue #4138)
by Atanas Bakalov 05 Apr '25

05 Apr '25

### Description Let's assume we have a MO call from UE to P-CSCF that's over ipsec. Let's assume the picked ports are like UE(6101) -> P-CSCF(6100) We have also set tcp_connection_lifetime to be 20 sec. 20 sec after INVITE connection is RST from Kamailio as expected. Then ( > 20sec later) an INVITE response comes from B side, and must be delivered to the UE. Kamailio opens a new connection and tries to establish a connection from 5060 (standard port)->6101 instead of 6100(P-CSCF) -… [View More]

3 3

[kamailio/kamailio] pua_json : add support for as-feature-event (PR #4195)
by ThomasSevestre 04 Apr '25

04 Apr '25

#### 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 … [View More]

2 9

git:master:c858cecb: pua_json: add support for as-feature-event
by Henning Westerholt 04 Apr '25

04 Apr '25

Module: kamailio Branch: master Commit: c858cecb4d6589bc53c474b0520a5d060bd3c55b URL: https://github.com/kamailio/kamailio/commit/c858cecb4d6589bc53c474b0520a5d0… Author: Thomas <1258170+ThomasSevestre(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-04-04T18:04:27+02:00 pua_json: add support for as-feature-event --- Modified: src/modules/pua_json/defs.h Modified: src/modules/pua_json/pua_json_publish.c --- Diff: https://github.com/… [View More]kamailio/kamailio/commit/c858cecb4d6589bc53c474b0520a5d0… Patch: https://github.com/kamailio/kamailio/commit/c858cecb4d6589bc53c474b0520a5d0… --- diff --git a/src/modules/pua_json/defs.h b/src/modules/pua_json/defs.h index ebf0ba4a0b9..ad5a8eb1eb0 100644 --- a/src/modules/pua_json/defs.h +++ b/src/modules/pua_json/defs.h @@ -68,12 +68,20 @@ #define MWI_JSON_FROM "From" #define MWI_JSON_TO "To" +#define AS_FEATURE_JSON_CALLID "Call-ID" +#define AS_FEATURE_JSON_FROM "From" +#define AS_FEATURE_JSON_FROM_USER "From-User" +#define AS_FEATURE_JSON_FROM_REALM "From-Realm" +#define AS_FEATURE_JSON_DND_STATUS "DND-Status" +#define AS_FEATURE_JSON_EXPIRES "Expires" + #define TO_TAG_BUFFER_SIZE 128 #define FROM_TAG_BUFFER_SIZE 128 #define SENDER_BUFFER_SIZE 1024 #define DIALOGINFO_BODY_BUFFER_SIZE 8192 #define MWI_BODY_BUFFER_SIZE 2048 #define PRESENCE_BODY_BUFFER_SIZE 4096 +#define AS_FEATURE_BODY_BUFFER_SIZE 4096 #define MWI_BODY_VOICE_MESSAGE \ "Messages-Waiting: %.*s\r\nMessage-Account: %.*s\r\nVoice-Message: " \ @@ -139,4 +147,12 @@ </dialog>\ </dialog-info>" +#define AS_FEATURE_BODY \ + "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\ +<DoNotDisturbEvent xmlns=\"http://www.ecma-international.org/standards/ecma-323/csta/ed3\">\ +<device>%.*s</device>\ +<doNotDisturbOn>%.*s</doNotDisturbOn>\ +</DoNotDisturbEvent>\ +" + #endif /* _PUA_JSON_DEFS_H_ */ diff --git a/src/modules/pua_json/pua_json_publish.c b/src/modules/pua_json/pua_json_publish.c index 359c5071858..3444210f39f 100644 --- a/src/modules/pua_json/pua_json_publish.c +++ b/src/modules/pua_json/pua_json_publish.c @@ -38,6 +38,7 @@ extern int pua_include_entity; str str_event_message_summary = str_init("message-summary"); str str_event_dialog = str_init("dialog"); str str_event_presence = str_init("presence"); +str str_event_as_feature_event = str_init("as-feature-event"); str str_username_col = str_init("username"); str str_domain_col = str_init("domain"); @@ -359,6 +360,62 @@ int pua_json_publish_dialoginfo_to_presentity(struct json_object *json_obj) return ret; } +int pua_json_publish_as_feature_to_presentity(struct json_object *json_obj) +{ + int ret = 1; + int len; + str event = str_init("as-feature-event"); + str from = {0, 0}; + str from_user = {0, 0}; + str from_realm = {0, 0}; + str callid = {0, 0}; + str dnd_status = {0, 0}; + int expires = 0; + str as_feature_body = {0, 0}; + + char *body = (char *)pkg_malloc(AS_FEATURE_BODY_BUFFER_SIZE); + + if(body == NULL) { + LM_ERR("Error allocating buffer for publish\n"); + ret = -1; + goto error; + } + + json_api.extract_field(json_obj, AS_FEATURE_JSON_CALLID, &callid); + + json_api.extract_field(json_obj, AS_FEATURE_JSON_FROM, &from); + json_api.extract_field(json_obj, AS_FEATURE_JSON_FROM_USER, &from_user); + json_api.extract_field(json_obj, AS_FEATURE_JSON_FROM_REALM, &from_realm); + + json_api.extract_field(json_obj, AS_FEATURE_JSON_DND_STATUS, &dnd_status); + + struct json_object *ExpiresObj = + json_api.get_object(json_obj, AS_FEATURE_JSON_EXPIRES); + if(ExpiresObj != NULL) { + expires = json_object_get_int(ExpiresObj); + } + + if(!from_user.len || !dnd_status.len) { + LM_ERR("missing one of From-User / DND-Status\n"); + goto error; + } + + len = snprintf(body, AS_FEATURE_BODY_BUFFER_SIZE, AS_FEATURE_BODY, + from_user.len, from_user.s, dnd_status.len, dnd_status.s); + + as_feature_body.s = body; + as_feature_body.len = len; + + pua_json_update_presentity(&event, &from_realm, &from_user, &callid, &from, + &as_feature_body, expires, 1, 1); + +error: + + if(body) + pkg_free(body); + + return ret; +} int pua_json_publish(struct sip_msg *msg, char *json) { @@ -391,6 +448,11 @@ int pua_json_publish(struct sip_msg *msg, char *json) event_package.len) == 0) { ret = pua_json_publish_presence_to_presentity(json_obj); + } else if(event_package.len == str_event_as_feature_event.len + && strncmp(event_package.s, str_event_as_feature_event.s, + event_package.len) + == 0) { + ret = pua_json_publish_as_feature_to_presentity(json_obj); } } [View Less]

1 0

git:master:330543f4: github: pull_request, always use scripts from master [skip ci]
by Victor Seva 03 Apr '25

03 Apr '25

Module: kamailio Branch: master Commit: 330543f46cbb6bf815ebf77c98378314091197ce URL: https://github.com/kamailio/kamailio/commit/330543f46cbb6bf815ebf77c9837831… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-04-03T14:37:14+02:00 github: pull_request, always use scripts from master [skip ci] --- Modified: .github/workflows/pull_request.yml --- Diff: https://github.com/kamailio/kamailio/… [View More]commit/330543f46cbb6bf815ebf77c9837831… Patch: https://github.com/kamailio/kamailio/commit/330543f46cbb6bf815ebf77c9837831… --- diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index cdfd9f3a3fd..35dda521756 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -23,15 +23,25 @@ jobs: permissions: contents: read # to fetch code (actions/checkout) steps: + - name: Check out scripts folder to the runner + uses: actions/checkout@v4 + with: + ref: master + path: actions + sparse-checkout: | + .github/scripts/check-cmake-format.sh + sparse-checkout-cone-mode: false - name: Check out the repository to the runner uses: actions/checkout@v4 with: + path: source ref: ${{ github.event.pull_request.head.sha }} - uses: awalsh128/cache-apt-pkgs-action(a)v1.5.0 with: packages: cmake-format - name: Run scripts/check-cmake-format.sh - run: ./.github/scripts/check-cmake-format.sh + run: ${{ github.workspace }}/actions/.github/scripts/check-cmake-format.sh + working-directory: ${{ github.workspace }}/source env: ref: ${{ github.event.pull_request.head.sha }} FETCH_DEPTH: 50 @@ -40,12 +50,22 @@ jobs: permissions: contents: read # to fetch code (actions/checkout) steps: + - name: Check out scripts folder to the runner + uses: actions/checkout@v4 + with: + ref: master + path: actions + sparse-checkout: | + .github/scripts/check-commit.sh + sparse-checkout-cone-mode: false - name: Check out the repository to the runner uses: actions/checkout@v4 with: + path: source ref: ${{ github.event.pull_request.head.sha }} - name: Run scripts/check-commit.sh - run: ./.github/scripts/check-commit.sh + run: ${{ github.workspace }}/actions/.github/scripts/check-commit.sh + working-directory: ${{ github.workspace }}/source env: ref: ${{ github.event.pull_request.head.sha }} FETCH_DEPTH: 50 [View Less]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2025