sr-dev

sr-dev@lists.kamailio.org

13 participants
44202 discussions

[kamailio/kamailio] ims_qos_npn: fixed issues in 3GPP-User-Location-Information decoding to P-Access-Network-Info header value (PR #3936)

by Dragos Vingarzan

#### 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:  - [ ] 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/3936 -- Commit Summary -- * ims_qos_npn: fixed issues in 3GPP-User-Location-Information decoding to P-Access-Network-Info header value -- File Changes -- M src/modules/ims_qos_npn/rx_avp.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3936.patch https://github.com/kamailio/kamailio/pull/3936.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3936 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3936(a)github.com>

4 months, 3 weeks

git:master:7bba70f8: ims_qos_npn: fixed issues in 3GPP-User-Location-Information decoding to P-Access-Network-Info header value

by Dragos Vingarzan

Module: kamailio Branch: master Commit: 7bba70f82f9b9928d24e2312025d48aa0ed6a441 URL: https://github.com/kamailio/kamailio/commit/7bba70f82f9b9928d24e2312025d48a… Author: Dragos Vingarzan <vingarzan(a)gmail.com> Committer: Dragos Vingarzan <dragos(a)neatpath.net> Date: 2024-08-21T13:14:43+02:00 ims_qos_npn: fixed issues in 3GPP-User-Location-Information decoding to P-Access-Network-Info header value --- Modified: src/modules/ims_qos_npn/rx_avp.c --- Diff: https://github.com/kamailio/kamailio/commit/7bba70f82f9b9928d24e2312025d48a… Patch: https://github.com/kamailio/kamailio/commit/7bba70f82f9b9928d24e2312025d48a… --- diff --git a/src/modules/ims_qos_npn/rx_avp.c b/src/modules/ims_qos_npn/rx_avp.c index a2fd3188efe..ca553852648 100644 --- a/src/modules/ims_qos_npn/rx_avp.c +++ b/src/modules/ims_qos_npn/rx_avp.c @@ -1592,6 +1592,8 @@ char *rx_avp_get_access_class(int32_t ip_can_type, int32_t rat_type) return "3GPP-NR-OTHERSAT"; case 1039: return "3GPP-NR-REDCAP"; + case 1040: + return "3GPP-NR-EREDCAP"; case 2000: return "3GPP2-1X"; case 2001: @@ -1605,7 +1607,7 @@ char *rx_avp_get_access_class(int32_t ip_can_type, int32_t rat_type) switch(ip_can_type) { case -1: default: - snprintf(unknown, 64, "UNKNOWN-IP-CAN-Type-%d/RAT-Type-%d", + snprintf(unknown, 64, "UNKNOWN-IP-CAN-Type-%d-RAT-Type-%d", ip_can_type, rat_type); return unknown; case 1: @@ -2026,6 +2028,9 @@ int rx_avp_process_3gpp_user_location_information(AAAMessage *rar, str *dst) // Fallback to IP-CAN-Type and RAT-Type dst->len += snprintf(dst->s + dst->len, MAX_PANI_LEN - dst->len, "%s;network-provided", c_access_class); + } else { + dst->len += snprintf(dst->s + dst->len, MAX_PANI_LEN - dst->len, + ";network-provided"); } LOG(L_INFO, "P-Access-Network-Info from Diameter is [%.*s]\n", dst->len,

4 months, 3 weeks

git:master:a5f4feae: modules: readme files regenerated - corex ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: a5f4feaec7f61d9c8ce54bdd42634220d116f116 URL: https://github.com/kamailio/kamailio/commit/a5f4feaec7f61d9c8ce54bdd4263422… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-08-21T09:46:11+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/a5f4feaec7f61d9c8ce54bdd4263422… Patch: https://github.com/kamailio/kamailio/commit/a5f4feaec7f61d9c8ce54bdd4263422… --- diff --git a/src/modules/corex/README b/src/modules/corex/README index 8986ee4df23..fa4a34ce706 100644 --- a/src/modules/corex/README +++ b/src/modules/corex/README @@ -64,7 +64,8 @@ Muhammad Shahzad Shafi 4.23. via_reply_add_xavp_params(flags) 4.24. is_faked_msg() 4.25. is_socket_name(sockname) - 4.26. forward_reply() + 4.26. forward_uac() + 4.27. forward_reply() 5. RPC Commands @@ -120,9 +121,10 @@ Muhammad Shahzad Shafi 1.30. via_reply_add_xavp_params usage 1.31. is_faked_msg usage 1.32. is_socket_name usage - 1.33. forward_reply usage - 1.34. event_route[network:msg] use cases - 1.35. Sample PERL code for do_compress and do_uncompress + 1.33. forward_uac usage + 1.34. forward_reply usage + 1.35. event_route[network:msg] use cases + 1.36. Sample PERL code for do_compress and do_uncompress Chapter 1. Admin Guide @@ -171,7 +173,8 @@ Chapter 1. Admin Guide 4.23. via_reply_add_xavp_params(flags) 4.24. is_faked_msg() 4.25. is_socket_name(sockname) - 4.26. forward_reply() + 4.26. forward_uac() + 4.27. forward_reply() 5. RPC Commands @@ -390,7 +393,8 @@ modparam("corex", "nio_msg_avp", "$avp(msg)") 4.23. via_reply_add_xavp_params(flags) 4.24. is_faked_msg() 4.25. is_socket_name(sockname) - 4.26. forward_reply() + 4.26. forward_uac() + 4.27. forward_reply() 4.1. append_branch([ uri, [ q ] ]) @@ -810,13 +814,33 @@ event_route[dispatcher:dst-down] { } ... -4.26. forward_reply() +4.26. forward_uac() + + Forward received request with a single Via header, the one added by + Kamailio, the other ones being removed. Useful in cases when its reply + should not be sent back (e.g., the reply was already sent out from + Kamailio). + + This function can be used in REQUEST_ROUTE. + + Example 1.33. forward_uac usage +... +request_route { + ... + sl_send_reply("200", "OK"); + $du = "sip:mirror.com:5080"; + forward_uac(); + ... +} +... + +4.27. forward_reply() Forward received reply on demand. This function can be used in CORE_ONREPLY_ROUTE. - Example 1.33. forward_reply usage + Example 1.34. forward_reply usage ... route[reply] { forward_reply(); @@ -999,7 +1023,7 @@ route[reply] { Next is a basic usage example where encoding and decoding is done using PERL. - Example 1.34. event_route[network:msg] use cases + Example 1.35. event_route[network:msg] use cases ... loadmodule "app_perl.so" loadmodule "corex.so" @@ -1030,7 +1054,7 @@ event_route[network:msg] { } ... - Example 1.35. Sample PERL code for do_compress and do_uncompress + Example 1.36. Sample PERL code for do_compress and do_uncompress ... use strict; use warnings;

4 months, 3 weeks

git:master:3debbb5a: corex: docs for forward_uac() function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3debbb5a608c135c628799546ee95c96abe18824 URL: https://github.com/kamailio/kamailio/commit/3debbb5a608c135c628799546ee95c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-21T09:30:50+02:00 corex: docs for forward_uac() function --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3debbb5a608c135c628799546ee95c9… Patch: https://github.com/kamailio/kamailio/commit/3debbb5a608c135c628799546ee95c9… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index 3d6ff893808..61529f94335 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -977,6 +977,34 @@ event_route[dispatcher:dst-down] { xinfo("matched local socket name\n"); } ... +</programlisting> + </example> + </section> + <section id="corex.f.forward_uac"> + <title> + <function moreinfo="none">forward_uac()</function> + </title> + <para> + Forward received request with a single Via header, the one added + by &kamailio;, the other ones being removed. Useful in cases when + its reply should not be sent back (e.g., the reply was already sent + out from &kamailio;). + </para> + <para> + This function can be used in REQUEST_ROUTE. + </para> + <example> + <title><function>forward_uac</function> usage</title> + <programlisting format="linespecific"> +... +request_route { + ... + sl_send_reply("200", "OK"); + $du = "sip:mirror.com:5080"; + forward_uac(); + ... +} +... </programlisting> </example> </section>

4 months, 3 weeks

git:master:f41b8ee9: core: helper function to forward request specifying message build mode

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f41b8ee9990aaee7423505b6216e46b574825c83 URL: https://github.com/kamailio/kamailio/commit/f41b8ee9990aaee7423505b6216e46b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-20T14:22:56+02:00 core: helper function to forward request specifying message build mode --- Modified: src/core/forward.c Modified: src/core/forward.h --- Diff: https://github.com/kamailio/kamailio/commit/f41b8ee9990aaee7423505b6216e46b… Patch: https://github.com/kamailio/kamailio/commit/f41b8ee9990aaee7423505b6216e46b… --- diff --git a/src/core/forward.c b/src/core/forward.c index 0276f8a5a2e..1d2b1d5d650 100644 --- a/src/core/forward.c +++ b/src/core/forward.c @@ -482,14 +482,15 @@ int check_self_port(unsigned short port, unsigned short proto) * - send_info->send_flags is filled from the message * - if the send_socket member is null, a send_socket will be * chosen automatically + * mbmode - message build mode (for build_req_buf_from_sip_req()) * WARNING: don't forget to zero-fill all the unused members (a non-zero * random id along with proto==PROTO_TCP can have bad consequences, same for * a bogus send_socket value) * * return: 0 (E_OK) on success; negative (E_*) on failure */ -int forward_request(struct sip_msg *msg, str *dst, unsigned short port, - struct dest_info *send_info) +int forward_request_mode(struct sip_msg *msg, str *dst, unsigned short port, + struct dest_info *send_info, unsigned int mbmode) { unsigned int len; char *buf; @@ -582,7 +583,7 @@ int forward_request(struct sip_msg *msg, str *dst, unsigned short port, if(buf) pkg_free(buf); send_info->proto = proto; - buf = build_req_buf_from_sip_req(msg, &len, send_info, 0); + buf = build_req_buf_from_sip_req(msg, &len, send_info, mbmode); if(!buf) { LM_ERR("building failed\n"); ret = E_OUT_OF_MEM; /* most probable */ @@ -686,6 +687,13 @@ int forward_request(struct sip_msg *msg, str *dst, unsigned short port, } +int forward_request(struct sip_msg *msg, str *dst, unsigned short port, + struct dest_info *send_info) +{ + return forward_request_mode(msg, dst, port, send_info, 0); +} + + int update_sock_struct_from_via( union sockaddr_union *to, struct sip_msg *msg, struct via_body *via) { diff --git a/src/core/forward.h b/src/core/forward.h index 7b51e1a5559..a90ce3446ce 100644 --- a/src/core/forward.h +++ b/src/core/forward.h @@ -80,6 +80,8 @@ int check_self(str *host, unsigned short port, unsigned short proto); int check_self_port(unsigned short port, unsigned short proto); int forward_request(struct sip_msg *msg, str *dst, unsigned short port, struct dest_info *send_info); +int forward_request_mode(struct sip_msg *msg, str *dst, unsigned short port, + struct dest_info *send_info, unsigned int mbmode); int update_sock_struct_from_via( union sockaddr_union *to, struct sip_msg *msg, struct via_body *via);

4 months, 3 weeks

git:master:ed8486de: corex: new function forward_uac()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ed8486de52c29996f64496dcce0f44941cff49d3 URL: https://github.com/kamailio/kamailio/commit/ed8486de52c29996f64496dcce0f449… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-21T09:23:14+02:00 corex: new function forward_uac() - send out with only one Via, the one added by Kamailio, simulating a request sent by the initial UAC - useful when the reply is not wanted to be sent back (e.g., it was sent back from Kamailio) --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ed8486de52c29996f64496dcce0f449… Patch: https://github.com/kamailio/kamailio/commit/ed8486de52c29996f64496dcce0f449… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index de2fb03b5fd..2b06231f734 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -37,6 +37,7 @@ #include "../../core/onsend.h" #include "../../core/forward.h" #include "../../core/dns_cache.h" +#include "../../core/data_lump.h" #include "../../core/parser/parse_uri.h" #include "../../core/parser/parse_param.h" @@ -49,6 +50,7 @@ MODULE_VERSION static int nio_intercept = 0; +static int w_forward_uac(sip_msg_t *msg, char *p1, char *p2); static int w_forward_reply(sip_msg_t *msg, char *p1, char *p2); static int w_append_branch(sip_msg_t *msg, char *su, char *sq); static int w_send_udp(sip_msg_t *msg, char *su, char *sq); @@ -113,6 +115,8 @@ static tr_export_t mod_trans[] = { }; static cmd_export_t cmds[] = { + {"forward_uac", (cmd_function)w_forward_uac, 0, + 0, 0, REQUEST_ROUTE}, {"forward_reply", (cmd_function)w_forward_reply, 0, 0, 0, CORE_ONREPLY_ROUTE}, {"append_branch", (cmd_function)w_append_branch, 0, @@ -267,6 +271,61 @@ static void mod_destroy(void) { } +/** + * forward request like initial uac sender, with only one via + */ +static int w_forward_uac(sip_msg_t *msg, char *p1, char *p2) +{ + int ret; + dest_info_t dst; + sip_uri_t *u; + sip_uri_t next_hop; + sr_lump_t *anchor; + hdr_field_t *hf; + + if(msg == NULL) { + LM_WARN("invalid msg parameter\n"); + return -1; + } + + if(parse_headers(msg, HDR_EOH_F, 0) == -1) { + LM_ERR("error while parsing message\n"); + return -1; + } + /* remove incoming Via headers */ + for(hf = msg->headers; hf; hf = hf->next) { + if(hf->type != HDR_VIA_T) { + continue; + } + anchor = del_lump(msg, hf->name.s - msg->buf, hf->len, 0); + if(anchor == 0) { + LM_ERR("cannot remove Via header\n"); + return -1; + } + } + + init_dest_info(&dst); + if(msg->dst_uri.len) { + ret = parse_uri(msg->dst_uri.s, msg->dst_uri.len, &next_hop); + u = &next_hop; + } else { + ret = parse_sip_msg_uri(msg); + u = &msg->parsed_uri; + } + if(ret < 0) { + LM_ERR("forward - bad uri dropping packet\n"); + return -1; + } + dst.proto = u->proto; + ret = forward_request_mode( + msg, &u->host, u->port_no, &dst, BUILD_NO_VIA1_UPDATE); + if(ret >= 0) { + return 1; + } + + return -1; +} + /** * forward reply based on via */

4 months, 3 weeks

git:master:e0f10477: core: explicit unsigned long long for internal flag constants

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e0f10477728922cefbbff9d23d846cd5912eb148 URL: https://github.com/kamailio/kamailio/commit/e0f10477728922cefbbff9d23d846cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-20T13:05:42+02:00 core: explicit unsigned long long for internal flag constants --- Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/e0f10477728922cefbbff9d23d846cd… Patch: https://github.com/kamailio/kamailio/commit/e0f10477728922cefbbff9d23d846cd…

4 months, 3 weeks

git:master:9ff1080c: core: new internal flags to skip adding received/rport in incoming via

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9ff1080cc6452343e6bc2de00350b2f7bcecf6d2 URL: https://github.com/kamailio/kamailio/commit/9ff1080cc6452343e6bc2de00350b2f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-20T12:26:10+02:00 core: new internal flags to skip adding received/rport in incoming via --- Modified: src/core/msg_translator.c Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/9ff1080cc6452343e6bc2de00350b2f… Patch: https://github.com/kamailio/kamailio/commit/9ff1080cc6452343e6bc2de00350b2f… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index f26abd2e79d..5028accb1fb 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -212,6 +212,24 @@ static int check_via_address( return -1; } +/* check if rport has to be added or updated in Via + * - return 1 on true; 0 on false */ +int rport_test(struct sip_msg *msg) +{ + if(msg->msg_flags & FL_VIA_NORECEIVED) { + return 0; + } + /* check if rport needs to be updated: + * - if FL_FORCE_RPORT is set add it (and del. any previous version) + * - if via already contains an rport add it and overwrite the previous + * rport value if present (if you don't want to overwrite the previous + * version remove the comments) */ + if(((msg->msg_flags | global_req_flags) & FL_FORCE_RPORT) + || (msg->via1->rport /*&& msg->via1->rport->value.s==0*/)) { + return 1; + } + return 0; +} /* check if IP address in Via != source IP address of signaling, * or the sender requires adding rport or received values */ @@ -219,6 +237,9 @@ int received_test(struct sip_msg *msg) { int rcvd; + if(msg->msg_flags & FL_VIA_NORECEIVED) { + return 0; + } rcvd = msg->via1->received || msg->via1->rport || check_via_address(&msg->rcv.src_ip, &msg->via1->host, msg->via1->port, received_dns); @@ -230,6 +251,9 @@ int received_via_test(struct sip_msg *msg) { int rcvd; + if(msg->msg_flags & FL_VIA_NORECEIVED) { + return 0; + } rcvd = (check_via_address(&msg->rcv.src_ip, &msg->via1->host, msg->via1->port, received_dns) != 0); @@ -2039,7 +2063,7 @@ char *build_req_buf_from_sip_req(struct sip_msg *msg, struct lump *path_anchor; struct lump *path_lump; str branch; - unsigned int flags; + msg_flags_t flags; unsigned int udp_mtu; struct dest_info di; int ret; @@ -2108,13 +2132,8 @@ char *build_req_buf_from_sip_req(struct sip_msg *msg, } } - /* check if rport needs to be updated: - * - if FL_FORCE_RPORT is set add it (and del. any previous version) - * - if via already contains an rport add it and overwrite the previous - * rport value if present (if you don't want to overwrite the previous - * version remove the comments) */ - if((flags & FL_FORCE_RPORT) - || (msg->via1->rport /*&& msg->via1->rport->value.s==0*/)) { + /* check if rport needs to be updated */ + if(rport_test(msg)) { if((rport_buf = rport_builder(msg, &rport_len)) == 0) { LM_ERR("rport_builder failed\n"); goto error00; /* free everything */ @@ -2518,8 +2537,7 @@ char *build_res_buf_from_sip_req(unsigned int code, str *text, str *new_tag, } } /* check if rport needs to be updated */ - if(((msg->msg_flags | global_req_flags) & FL_FORCE_RPORT) - || (msg->via1->rport /*&& msg->via1->rport->value.s==0*/)) { + if(rport_test(msg)) { if((rport_buf = rport_builder(msg, &rport_len)) == 0) { LM_ERR("rport_builder failed\n"); goto error01; /* free everything */ diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 45e7eb1a714..0627754446a 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -133,8 +133,9 @@ typedef enum request_method /* WARNING: Value (1 << 31) is reserved for use in kamailio * nat_traversal module (flag FL_DO_KEEPALIVE)! */ -#define FL_FINAL_REPLY (1ULL << 32) /* local final reply sent */ -#define FL_DELAYED_REPLY (1ULL << 33) /* local reply sending delayed */ +#define FL_FINAL_REPLY (1ULL << 32) /* local final reply sent */ +#define FL_DELAYED_REPLY (1ULL << 33) /* local reply sending delayed */ +#define FL_VIA_NORECEIVED (1ULL << 34) /* no received test for incoming Via */ #define FL_MTU_FB_MASK (FL_MTU_TCP_FB | FL_MTU_TLS_FB | FL_MTU_SCTP_FB)

4 months, 3 weeks

Re: [kamailio/kamailio] rtpengine: export API for other modules (GH #3949) (3d002d5)

by Henning Westerholt

Yes, I commented it in the other issue. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/3d002d561e82b8bb71b225da708bdfd… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/3d002d561e82b8bb71b225da708bdfd9ce504335/145517761(a)github.com>

4 months, 3 weeks

Re: [kamailio/kamailio] rtpengine: export API for other modules (GH #3949) (3d002d5)

by Farzaneh Soltanzadeh

Thanks for merging the PR. It seems that the referenced PR is wrong. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/3d002d561e82b8bb71b225da708bdfd… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/3d002d561e82b8bb71b225da708bdfd9ce504335/145516854(a)github.com>

4 months, 3 weeks

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev