sr-dev

sr-dev@lists.kamailio.org

14 participants
45296 discussions

git:master:099eceec: modules: readme files regenerated - ims_charging ... [skip ci]
by Kamailio Dev 24 Jan '24

24 Jan '24

Module: kamailio Branch: master Commit: 099eceecab7af118bfa0bdfca68a8c0b30cec6f0 URL: https://github.com/kamailio/kamailio/commit/099eceecab7af118bfa0bdfca68a8c0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-01-24T21:31:18+01:00 modules: readme files regenerated - ims_charging ... [skip ci] --- Modified: src/modules/ims_charging/README --- Diff: https://github.com/kamailio/kamailio/commit/099eceecab7af118bfa0bdfca68a8c0… Patch: https://github.com/kamailio/kamailio/commit/099eceecab7af118bfa0bdfca68a8c0… --- diff --git a/src/modules/ims_charging/README b/src/modules/ims_charging/README index 8e61583c0c4..b37cf9ae3a4 100644 --- a/src/modules/ims_charging/README +++ b/src/modules/ims_charging/README @@ -67,6 +67,8 @@ Carlos Ruiz Diaz 4.27. vendor_specific_chargeinfo (int) 4.28. vendor_specific_id (int) 4.29. strip_plus_from_e164 (int) + 4.30. use_pani_from_term_invite (int) + 4.31. node_func (int) 5. Functions @@ -125,8 +127,10 @@ Carlos Ruiz Diaz 1.27. vendor_specific_chargeinfoparameter usage 1.28. vendor_specific_idparameter usage 1.29. strip_plus_from_e164parameter usage - 1.30. Ro_CCR - 1.31. Ro_set_session_id_avp + 1.30. use_pani_from_term_inviteparameter usage + 1.31. node_funcparameter usage + 1.32. Ro_CCR + 1.33. Ro_set_session_id_avp Chapter 1. Admin Guide @@ -175,6 +179,8 @@ Chapter 1. Admin Guide 4.27. vendor_specific_chargeinfo (int) 4.28. vendor_specific_id (int) 4.29. strip_plus_from_e164 (int) + 4.30. use_pani_from_term_invite (int) + 4.31. node_func (int) 5. Functions @@ -378,6 +384,8 @@ Chapter 1. Admin Guide 4.27. vendor_specific_chargeinfo (int) 4.28. vendor_specific_id (int) 4.29. strip_plus_from_e164 (int) + 4.30. use_pani_from_term_invite (int) + 4.31. node_func (int) 4.1. hash_size(int) @@ -772,6 +780,34 @@ modparam("ims_charging", "vendor_specific_id", 10) modparam("ims_charging", "strip_plus_from_e164", 1) ... +4.30. use_pani_from_term_invite (int) + + P-Access-Network-Info is normally relevant for the "orig" scenario + where it's extracted from INVITE. This setting instruct Kamailio to + include it in "term" scenario too, where it might have been added to + the INVITE based on info from a REGISTER. Normally used to start a + charging session when the user is roaming. + + Default value is 0. + + Example 1.30. use_pani_from_term_inviteparameter usage +... +modparam("ims_charging", "use_pani_from_term_invite", 1) +... + +4.31. node_func (int) + + Defines what should be sent as Node-Functionality (862) in the Diameter + Ro request. Possible values are: 0 (S-CSCF), 1 (P-CSCF), 2 (I-CSCF), 3 + (MRFC), 4 (MGCF), 5 (BFCF) or 6 (AS) + + Default value is 0 (S-CSCF). + + Example 1.31. node_funcparameter usage +... +modparam("ims_charging", "node_func", 1) +... + 5. Functions 5.1. Ro_CCR(route_name, direction, reservation_units, @@ -799,7 +835,7 @@ outgoing_trunk_id) This method is executed asynchronously. See example on how to retrieve return value. - Example 1.30. Ro_CCR + Example 1.32. Ro_CCR ... xlog("L_DBG","Sending initial CCR Request for call\n"); Ro_CCR("RO_ASYNC_TERM_REPLY", "term", 30, "1", "1"); @@ -835,7 +871,7 @@ n"); This function can be used from REQUEST_ROUTE or ONREPLY_ROUTE. - Example 1.31. Ro_set_session_id_avp + Example 1.33. Ro_set_session_id_avp ... Ro_set_session_id_avp(); xlog("L_DBG","Ro session AVP has been set: $avp(ro_session_id)\n");

1 0

[kamailio/kamailio] ims_charging: Add option to get and use P-Access-Network-Info for terminating scenario (PR #3726)
by Morten Tryfoss 24 Jan '24

24 Jan '24

Add option to get and use P-Access-Network-Info for the terminating scenario, for use of billing in roaming cases where the PANI header is already known. Currently PANI is only used for the originating scenario. Fixed partly implemented config option to specific role of diameter client. It was currently hardcoded to S-CSCF.  #### 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) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3726 -- Commit Summary -- * ims_charging: Add option to get and use P-Access-Network-Info for terminating scenario -- File Changes -- M src/modules/ims_charging/Ro_data.c (2) M src/modules/ims_charging/config.h (2) M src/modules/ims_charging/doc/ims_charging_admin.xml (41) M src/modules/ims_charging/ims_charging_mod.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3726.patch https://github.com/kamailio/kamailio/pull/3726.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3726 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3726(a)github.com>

1 1

git:master:76cd7979: ims_charging: Add option to get and use P-Access-Network-Info for terminating scenario (#3726)
by GitHub 24 Jan '24

24 Jan '24

Module: kamailio Branch: master Commit: 76cd7979aae176b3fde3b3d73975629b06cd509c URL: https://github.com/kamailio/kamailio/commit/76cd7979aae176b3fde3b3d73975629… Author: Morten Tryfoss <morten(a)tryfoss.no> Committer: GitHub <noreply(a)github.com> Date: 2024-01-24T21:16:08+01:00 ims_charging: Add option to get and use P-Access-Network-Info for terminating scenario (#3726) Add option to configure node functionality for Ro requests --- Modified: src/modules/ims_charging/Ro_data.c Modified: src/modules/ims_charging/config.h Modified: src/modules/ims_charging/doc/ims_charging_admin.xml Modified: src/modules/ims_charging/ims_charging_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/76cd7979aae176b3fde3b3d73975629… Patch: https://github.com/kamailio/kamailio/commit/76cd7979aae176b3fde3b3d73975629…

1 0

git:master:ba36c65d: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 24 Jan '24

24 Jan '24

Module: kamailio Branch: master Commit: ba36c65dfb2a6608dd7d51422a7ed021206bcae3 URL: https://github.com/kamailio/kamailio/commit/ba36c65dfb2a6608dd7d51422a7ed02… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-01-24T17:32:06+01:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/ba36c65dfb2a6608dd7d51422a7ed02… Patch: https://github.com/kamailio/kamailio/commit/ba36c65dfb2a6608dd7d51422a7ed02… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 41dced573d2..18a3efe552e 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -1891,7 +1891,7 @@ modparam("tm", "failover_reply_codes", "code=403;code=488;class=5") ... if (!t_relay()) { - sl_reply_error(); + send_reply_error(); break; }; ...

1 0

git:master:d26b0bef: tm: docs - update to use send_reply_error() when t_relay() fails
by Daniel-Constantin Mierla 24 Jan '24

24 Jan '24

Module: kamailio Branch: master Commit: d26b0bef2e76be55c5cb099520f221487d362b48 URL: https://github.com/kamailio/kamailio/commit/d26b0bef2e76be55c5cb099520f2214… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-24T17:17:23+01:00 tm: docs - update to use send_reply_error() when t_relay() fails - the transaction might be already created and needs a stateful reply --- Modified: src/modules/tm/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/d26b0bef2e76be55c5cb099520f2214… Patch: https://github.com/kamailio/kamailio/commit/d26b0bef2e76be55c5cb099520f2214… --- diff --git a/src/modules/tm/doc/functions.xml b/src/modules/tm/doc/functions.xml index 15643ed5d47..741505ec2d2 100644 --- a/src/modules/tm/doc/functions.xml +++ b/src/modules/tm/doc/functions.xml @@ -42,7 +42,7 @@ ... if (!t_relay()) { - sl_reply_error(); + send_reply_error(); break; }; ...

1 0

git:master:76b7beef: sl: do not send error reply if message marked with delayed-reply flag
by Daniel-Constantin Mierla 24 Jan '24

24 Jan '24

Module: kamailio Branch: master Commit: 76b7beef6d089272b749aa53f29e100711aa4c50 URL: https://github.com/kamailio/kamailio/commit/76b7beef6d089272b749aa53f29e100… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-24T10:31:07+01:00 sl: do not send error reply if message marked with delayed-reply flag --- Modified: src/modules/sl/sl.c Modified: src/modules/sl/sl_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/76b7beef6d089272b749aa53f29e100… Patch: https://github.com/kamailio/kamailio/commit/76b7beef6d089272b749aa53f29e100… --- diff --git a/src/modules/sl/sl.c b/src/modules/sl/sl.c index 83eb8bac0d3..ef0f0b56f3d 100644 --- a/src/modules/sl/sl.c +++ b/src/modules/sl/sl.c @@ -340,6 +340,10 @@ static int ki_send_reply_error(sip_msg_t *msg) LM_INFO("message marked with final-reply flag\n"); return -2; } + if(msg->msg_flags & FL_DELAYED_REPLY) { + LM_INFO("message marked with delayed-reply flag\n"); + return -3; + } if(sl_bind_tm != 0 && tmb.t_reply_error != NULL) { ret = tmb.t_reply_error(msg); diff --git a/src/modules/sl/sl_funcs.c b/src/modules/sl/sl_funcs.c index 29ef6835e22..5f9ac40991f 100644 --- a/src/modules/sl/sl_funcs.c +++ b/src/modules/sl/sl_funcs.c @@ -416,6 +416,10 @@ int sl_reply_error(struct sip_msg *msg) LM_INFO("message marked with final-reply flag\n"); return -2; } + if(msg->msg_flags & FL_DELAYED_REPLY) { + LM_INFO("message marked with delayed-reply flag\n"); + return -3; + } ret = err2reason_phrase( prev_ser_error, &sip_error, err_buf, sizeof(err_buf), "SL");

1 0

git:master:09c75716: tm: mark request with delayed reply flag
by Daniel-Constantin Mierla 24 Jan '24

24 Jan '24

Module: kamailio Branch: master Commit: 09c75716530f7d8be2671e5823dca5b640cad45a URL: https://github.com/kamailio/kamailio/commit/09c75716530f7d8be2671e5823dca5b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-24T10:26:45+01:00 tm: mark request with delayed reply flag --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/09c75716530f7d8be2671e5823dca5b… Patch: https://github.com/kamailio/kamailio/commit/09c75716530f7d8be2671e5823dca5b… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 0147bf44579..31aa25338e3 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -1844,16 +1844,26 @@ static int _w_t_relay_to( if(res <= 0) { if(res != E_CFG) { LM_ERR("t_forward_noack failed\n"); - /* let us save the error code, we might need it later - * when the failure_route has finished (Miklos) */ + if(get_kr() == REQ_ERR_DELAYED) { + p_msg->msg_flags |= FL_DELAYED_REPLY; + } } + /* let us save the error code, we might need it later + * when the failure_route has finished (Miklos) */ tm_error = ser_error; return -1; } return 1; } - if(is_route_type(REQUEST_ROUTE)) - return t_relay_to(p_msg, proxy, force_proto, 0 /* no replication */); + if(is_route_type(REQUEST_ROUTE)) { + res = t_relay_to(p_msg, proxy, force_proto, 0 /* no replication */); + if(res < 0) { + if(get_kr() == REQ_ERR_DELAYED) { + p_msg->msg_flags |= FL_DELAYED_REPLY; + } + } + return res; + } LM_CRIT("unsupported route type: %d\n", get_route_type()); return 0; }

1 0

git:master:5c8cfdd8: core: parser - internal flag to mark delayed local replies
by Daniel-Constantin Mierla 24 Jan '24

24 Jan '24

Module: kamailio Branch: master Commit: 5c8cfdd803e81a592bf9fdeb208b13404e96da25 URL: https://github.com/kamailio/kamailio/commit/5c8cfdd803e81a592bf9fdeb208b134… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-24T10:23:01+01:00 core: parser - internal flag to mark delayed local replies --- Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/5c8cfdd803e81a592bf9fdeb208b134… Patch: https://github.com/kamailio/kamailio/commit/5c8cfdd803e81a592bf9fdeb208b134… --- diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 303c8c04248..45e7eb1a714 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -133,7 +133,8 @@ 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) /* final reply sent */ +#define FL_FINAL_REPLY (1ULL << 32) /* local final reply sent */ +#define FL_DELAYED_REPLY (1ULL << 33) /* local reply sending delayed */ #define FL_MTU_FB_MASK (FL_MTU_TCP_FB | FL_MTU_TLS_FB | FL_MTU_SCTP_FB)

1 0

git:master:236c56f5: tm: prefixed global kill reason variable
by Daniel-Constantin Mierla 24 Jan '24

24 Jan '24

Module: kamailio Branch: master Commit: 236c56f5f4c11fb867e545f830182b386f0a0c66 URL: https://github.com/kamailio/kamailio/commit/236c56f5f4c11fb867e545f830182b3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-24T09:19:57+01:00 tm: prefixed global kill reason variable --- Modified: src/modules/tm/h_table.c --- Diff: https://github.com/kamailio/kamailio/commit/236c56f5f4c11fb867e545f830182b3… Patch: https://github.com/kamailio/kamailio/commit/236c56f5f4c11fb867e545f830182b3… --- diff --git a/src/modules/tm/h_table.c b/src/modules/tm/h_table.c index 2d21eb12eca..7ee7c67470c 100644 --- a/src/modules/tm/h_table.c +++ b/src/modules/tm/h_table.c @@ -52,7 +52,7 @@ - sizeof(((tm_cell_t *)0)->md5))) -static enum kill_reason kr; +static enum kill_reason _tm_kr; /* pointer to the big table where all the transaction data lives */ struct s_table *_tm_table; @@ -64,18 +64,18 @@ struct s_table *tm_get_table(void) void reset_kr(void) { - kr = 0; + _tm_kr = 0; } void set_kr(enum kill_reason _kr) { - kr |= _kr; + _tm_kr |= _kr; } enum kill_reason get_kr() { - return kr; + return _tm_kr; }

1 0

git:5.7:893e9ea4: tls_wolfssl: clean-up; remove OpenSSL-isms
by S-P Chan 24 Jan '24

24 Jan '24

Module: kamailio Branch: 5.7 Commit: 893e9ea4364f60c32a5477c5b75bdc24b619dd52 URL: https://github.com/kamailio/kamailio/commit/893e9ea4364f60c32a5477c5b75bdc2… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-24T15:53:01+08:00 tls_wolfssl: clean-up; remove OpenSSL-isms (cherry-pick from 3d0e7521c6de4023b6595685fc306129ef57b8ac) --- Modified: src/modules/tls_wolfssl/tls_cfg.c Modified: src/modules/tls_wolfssl/tls_cfg.h Modified: src/modules/tls_wolfssl/tls_domain.c Modified: src/modules/tls_wolfssl/tls_init.c Modified: src/modules/tls_wolfssl/tls_init.h Modified: src/modules/tls_wolfssl/tls_rpc.c Modified: src/modules/tls_wolfssl/tls_server.c Modified: src/modules/tls_wolfssl/tls_util.c Modified: src/modules/tls_wolfssl/tls_util.h Modified: src/modules/tls_wolfssl/tls_wolfssl_mod.c Removed: src/modules/tls_wolfssl/tls_dump_vf.c Removed: src/modules/tls_wolfssl/tls_dump_vf.h Removed: src/modules/tls_wolfssl/tls_map.c Removed: src/modules/tls_wolfssl/tls_map.h --- Diff: https://github.com/kamailio/kamailio/commit/893e9ea4364f60c32a5477c5b75bdc2… Patch: https://github.com/kamailio/kamailio/commit/893e9ea4364f60c32a5477c5b75bdc2…

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