sr-dev January 2024

sr-dev@lists.kamailio.org

19 participants
311 discussions

[kamailio/kamailio] parser/contact: Change addition order to the end of list (PR #3698)

by Xenofon Karamanos

#### 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) - [ ] 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 - [x] Related to issue #3653 #### Description  - Contacts are now added at the end of the list. - hfl(Contact)[index] is now returning in the correct order. Currently, if a sip message contains multiple Contacts or just 2, let's say ``` Contact: <sip:bob0@example.com>;expires=3600,<sip:bob1@example.com>;expires=3600,<sip:bob2@example.com>;expires=3600 Contact: <sip:bob3@example.com>;expires=3600,<sip:bob4@example.com>;expires=3600,<sip:bob5@example.com>;expires=3600 ``` contacts are stored in the reversed order, ie bob2, bob1,bob0 and bob5,bob4,bob3. This can be seen with a simple config file such as: ``` #kamailio.cfg ... request_route { ... xlog("L_INFO", "Contact headers: $hfl(Contact)\n"); xlog("L_INFO", "Contact headers 0: $(hfl(Contact)[0])\n"); xlog("L_INFO", "Contact headers 1: $(hfl(Contact)[1])\n"); xlog("L_INFO", "Contact headers 2: $(hfl(Contact)[2])\n"); xlog("L_INFO", "Contact headers 3: $(hfl(Contact)[3])\n"); xlog("L_INFO", "Contact headers 4: $(hfl(Contact)[4])\n"); xlog("L_INFO", "Contact headers 5: $(hfl(Contact)[5])\n"); xlog("L_INFO", "Contact headers 6: $(hfl(Contact)[6])\n"); xlog("L_INFO", "Contact headers 7: $(hfl(Contact)[7])\n"); xlog("L_INFO", "Contact headers -1: $(hfl(Contact)[-1])\n"); xlog("L_INFO", "Contact headers -2: $(hfl(Contact)[-2])\n"); xlog("L_INFO", "Contact headers -3: $(hfl(Contact)[-3])\n"); xlog("L_INFO", "Contact headers -4: $(hfl(Contact)[-4])\n"); xlog("L_INFO", "Contact headers -5: $(hfl(Contact)[-5])\n"); xlog("L_INFO", "Contact headers -6: $(hfl(Contact)[-6])\n"); ``` that prints in the log all the contacts reversed: ``` Contact headers: <sip:bob2@example.com>;expires=3600 Contact headers 0: <sip:bob2@example.com>;expires=3600 Contact headers 1: <sip:bob1@example.com>;expires=3600 Contact headers 2: <sip:bob0@example.com>;expires=3600 Contact headers 3: <sip:bob5@example.com>;expires=3600 Contact headers 4: <sip:bob4@example.com>;expires=3600 Contact headers 5: <sip:bob3@example.com>;expires=3600 Contact headers 6: <null> Contact headers 7: <null> Contact headers -1: <sip:bob3@example.com>;expires=3600 Contact headers -2: <sip:bob4@example.com>;expires=3600 Contact headers -3: <sip:bob5@example.com>;expires=3600 Contact headers -4: <sip:bob0@example.com>;expires=3600 Contact headers -5: <sip:bob1@example.com>;expires=3600 Contact headers -6: <sip:bob2@example.com>;expires=3600 ``` This PR fixes and produces: ``` Contact headers: <sip:bob0@example.com>;expires=3600 Contact headers 0: <sip:bob0@example.com>;expires=3600 Contact headers 1: <sip:bob1@example.com>;expires=3600 Contact headers 2: <sip:bob2@example.com>;expires=3600 Contact headers 3: <sip:bob3@example.com>;expires=3600 Contact headers 4: <sip:bob4@example.com>;expires=3600 Contact headers 5: <sip:bob5@example.com>;expires=3600 Contact headers 6: <null> Contact headers 7: <null> Contact headers -1: <null> Contact headers -2: <sip:bob5@example.com>;expires=3600 Contact headers -3: <sip:bob4@example.com>;expires=3600 Contact headers -4: <sip:bob3@example.com>;expires=3600 Contact headers -5: <sip:bob2@example.com>;expires=3600 Contact headers -6: <sip:bob1@example.com>;expires=3600 ``` The `contact headers -1: <null>` if fixed via #3697. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3698 -- Commit Summary -- * parser/contact: Change addition order to the end of list -- File Changes -- M src/core/parser/contact/contact.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3698.patch https://github.com/kamailio/kamailio/pull/3698.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3698 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3698(a)github.com>

11 months, 2 weeks

[kamailio/kamailio] pv: hfl(name)[N] for negative index bug (Issue #3653)

by Xenofon Karamanos

### Description I am working on extending $hfl and $hflc to support some more headers. During some experimentation, I stumbled into some weird behavior regarding $(hfl(Route)[-1]) and negative indexing of $hfl pseudo-variable (also for Via, Contact). Per the [docs ](https://www.kamailio.org/wikidocs/cookbooks/devel/pseudovariables/#hflname-header-field-with-list-of-bodies ): -1 index should print the last header found and so on (as stated by $hdr $hfl). Right now, -1 produces null, and from -2 and onwards it prints correctly from the last one to the first one. ### Troubleshooting #### Reproduction ``` #kamailio.cfg ... request_route { xlog("L_INFO", "Route headers hdr: $hdr(Route)\n"); xlog("L_INFO", "Route headers hfl: $hfl(Route)\n"); xlog("L_INFO", "Route headers count: $hflc(Route)\n"); xlog("L_INFO", "Route headers 0: $(hfl(Route)[0])\n"); xlog("L_INFO", "Route headers 1: $(hfl(Route)[1])\n"); xlog("L_INFO", "Route headers 4: $(hfl(Route)[4])\n"); xlog("L_INFO", "Route headers -1: $(hfl(Route)[-1])\n"); xlog("L_INFO", "Route headers -2: $(hfl(Route)[-2])\n"); xlog("L_INFO", "Route headers -3: $(hfl(Route)[-3])\n"); ... } ``` Seng a SIP message containing Route (but also applicable for VIA, Contact headers): ``` OPTIONS_MSG_2CONTACTS="OPTIONS sip:example.com SIP/2.0 Via: SIP/2.0/UDP 192.168.1.100:5060;branch=z9hG4bK123456789 Max-Forwards: 70 From: <sip:bob@example.com>;tag=123456789 To: <sip:alice@example.com> Call-ID: 987654321(a)192.168.1.100 CSeq: 1 OPTIONS Contact: <sip:bob@example.com>;expires=3600,<sip:bob2@example.com>;expires=3600,<sip:bob3@example.com>;expires=3600 Route: <sip:server1.example.com;lr;ftag=1234>, <sip:server2.example.com;lr;ftag=5678>, <sip:server3.example.com;lr;ftag=9012> Route: <sip:server4.example.com;lr;ftag=1234>, <sip:server5.example.com;lr;ftag=5678> Content-Length: 0 " echo -e "$OPTIONS_MSG_2CONTACTS" | nc -u localhost 5060 ``` See logs for logging details. #### Log Messages  ``` INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers hdr: <sip:server1.example.com;lr;ftag=1234>, <sip:server2.example.com;lr;ftag=5678>, <sip:server3.example.com;lr;ftag=9012> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers hfl: <sip:server1.example.com;lr;ftag=1234> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers count: 5 INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers 0: <sip:server1.example.com;lr;ftag=1234> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers 1: <sip:server2.example.com;lr;ftag=5678> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers 4: <sip:server5.example.com;lr;ftag=5678> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers -1: <null> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers -2: <sip:server5.example.com;lr;ftag=5678> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers -3: <sip:server4.example.com;lr;ftag=1234> ``` ### Possible Solutions  In https://github.com/kamailio/kamailio/blob/e59c4415707f0995a0d5315b5601ae518…, the count should start at 0 ie. ``` n=0; // not n=1; ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3653 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3653(a)github.com>

11 months, 2 weeks

[kamailio/kamailio] libbcg729-dev dependency of dpkg-checkbuilddeps can not install on ubuntu 18.04 (Issue #3703)

by faratell

Hello to all. I have tried to install VoLTE Setup with Kamailio IMS on Ubuntu 18.04 from https://open5gs.org/open5gs/docs/tutorial/02-VoLTE-setup/ in step 16, Install RTPEngine, dpkg-checkbuilddeps have dependencies: libbcg729-dev, which is not in the repository of ubuntu 18.04 to install. How can install it? dpkg-checkbuilddeps: error: Unmet build dependencies: libbcg729-dev sudo apt install libbcg729-dev Reading package lists... Done Building dependency tree Reading state information... Done E: Unable to locate package libbcg729-dev -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3703 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3703(a)github.com>

11 months, 2 weeks

git:master:b3ed254a: modules: readme files regenerated - siputils ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: b3ed254a85bd9528342d07c87791ee00f5d70622 URL: https://github.com/kamailio/kamailio/commit/b3ed254a85bd9528342d07c87791ee0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-01-08T12:31:30+01:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/b3ed254a85bd9528342d07c87791ee0… Patch: https://github.com/kamailio/kamailio/commit/b3ed254a85bd9528342d07c87791ee0… --- diff --git a/src/modules/siputils/README b/src/modules/siputils/README index 7c888199788..5ca3d55ce80 100644 --- a/src/modules/siputils/README +++ b/src/modules/siputils/README @@ -103,7 +103,8 @@ Gabriel Vasile 4.37. contact_param_decode(pname) 4.38. contact_param_decode_uri(pname) 4.39. contact_param_rm(pname) - 4.40. hdr_date_check(tdiff) + 4.40. contact_param_check(pname) + 4.41. hdr_date_check(tdiff) 5. Exported pseudo-variables @@ -163,7 +164,8 @@ Gabriel Vasile 1.46. contact_param_decode usage 1.47. contact_param_decode_ruri usage 1.48. contact_param_rm usage - 1.49. hdr_date_check usage + 1.49. contact_param_check usage + 1.50. hdr_date_check usage Chapter 1. Admin Guide @@ -228,7 +230,8 @@ Chapter 1. Admin Guide 4.37. contact_param_decode(pname) 4.38. contact_param_decode_uri(pname) 4.39. contact_param_rm(pname) - 4.40. hdr_date_check(tdiff) + 4.40. contact_param_check(pname) + 4.41. hdr_date_check(tdiff) 5. Exported pseudo-variables @@ -442,7 +445,8 @@ modparam("siputils", "e164_max_len", 20) 4.37. contact_param_decode(pname) 4.38. contact_param_decode_uri(pname) 4.39. contact_param_rm(pname) - 4.40. hdr_date_check(tdiff) + 4.40. contact_param_check(pname) + 4.41. hdr_date_check(tdiff) 4.1. options_reply() @@ -1129,7 +1133,24 @@ if (is_method("REGISTER") and src_ip == 1.2.3.4) { } ... -4.40. hdr_date_check(tdiff) +4.40. contact_param_check(pname) + + This function returns true (1) if the URI inside the Contact header + contains the parameter with the name 'pname'. Otherwise it returns + false (-1). + + Meaning of the parameters is as follows: + * pname - name of the URI parameter. + + This function can be used from ANY_ROUTE. + + Example 1.49. contact_param_check usage +... +if (contact_param_check("myparam")) { +} +... + +4.41. hdr_date_check(tdiff) Returns true if sip message has Date header and its value is lower than 'NOW() - tdiff'. @@ -1140,7 +1161,7 @@ if (is_method("REGISTER") and src_ip == 1.2.3.4) { This function can be used from ANY_ROUTE. - Example 1.49. hdr_date_check usage + Example 1.50. hdr_date_check usage ... if (!hdr_date_check("10")) { sl_send_reply("403", "Outdated date");

11 months, 2 weeks

git:master:257cfe9b: siputils: docs for contact_param_check() function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 257cfe9be9327054fb381a48df9605444ea8e6fd URL: https://github.com/kamailio/kamailio/commit/257cfe9be9327054fb381a48df96054… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-08T12:25:32+01:00 siputils: docs for contact_param_check() function --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/257cfe9be9327054fb381a48df96054… Patch: https://github.com/kamailio/kamailio/commit/257cfe9be9327054fb381a48df96054… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index d2197b1c3f4..ad30a1a9f6e 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -1372,6 +1372,35 @@ if (is_method("REGISTER") and src_ip == 1.2.3.4) { contact_param_rm("myparam"); } ... +</programlisting> + </example> + </section> + <section id="siputils.f.contact_param_check"> + <title> + <function moreinfo="none">contact_param_check(pname)</function> + </title> + <para> + This function returns true (1) if the URI inside the Contact + header contains the parameter with the name 'pname'. Otherwise it + returns false (-1). + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>pname</emphasis> - name of the URI parameter. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>contact_param_check</function> usage</title> + <programlisting format="linespecific"> +... +if (contact_param_check("myparam")) { +} +... </programlisting> </example> </section>

11 months, 2 weeks

git:master:eef07574: siputils: new function to check existence of a contact uri param

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: eef07574be8499b517e4c333a36d618c608253ef URL: https://github.com/kamailio/kamailio/commit/eef07574be8499b517e4c333a36d618… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-08T12:13:14+01:00 siputils: new function to check existence of a contact uri param --- Modified: src/modules/siputils/contact_ops.c Modified: src/modules/siputils/contact_ops.h Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/eef07574be8499b517e4c333a36d618… Patch: https://github.com/kamailio/kamailio/commit/eef07574be8499b517e4c333a36d618…

11 months, 2 weeks

git:master:9d8037bf: lcr: rename function parameters to avoid shadowing the global variable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9d8037bfd71996cfae756a030cdc3dd139162863 URL: https://github.com/kamailio/kamailio/commit/9d8037bfd71996cfae756a030cdc3dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-08T09:17:22+01:00 lcr: rename function parameters to avoid shadowing the global variable --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9d8037bfd71996cfae756a030cdc3dd… Patch: https://github.com/kamailio/kamailio/commit/9d8037bfd71996cfae756a030cdc3dd…

11 months, 2 weeks

git:master:ecca625f: rtpengine: renamed function parameters to avoid shadowing the global variable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ecca625fd265d0484165d7a56e958a634103b09a URL: https://github.com/kamailio/kamailio/commit/ecca625fd265d0484165d7a56e958a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-08T09:06:36+01:00 rtpengine: renamed function parameters to avoid shadowing the global variable --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/ecca625fd265d0484165d7a56e958a6… Patch: https://github.com/kamailio/kamailio/commit/ecca625fd265d0484165d7a56e958a6… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index ac545b891ab..11745d6b863 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -605,16 +605,16 @@ struct module_exports exports = { /* check if the node is already queried */ static int is_queried_node(struct rtpp_node *node, - struct rtpp_node **queried_nodes_ptr, int queried_nodes) + struct rtpp_node **queried_nodes_list, int queried_nodes) { int i; - if(!queried_nodes_ptr) { + if(!queried_nodes_list) { return 0; } for(i = 0; i < queried_nodes; i++) { - if(node == queried_nodes_ptr[i]) { + if(node == queried_nodes_list[i]) { return 1; } } @@ -3631,7 +3631,7 @@ static struct rtpp_set *select_rtpp_set(unsigned int id_set) * run the selection algorithm and return the new selected node */ static struct rtpp_node *select_rtpp_node_new(str callid, str viabranch, - int do_test, struct rtpp_node **queried_nodes_ptr, int queried_nodes) + int do_test, struct rtpp_node **queried_nodes_list, int queried_nodes) { struct rtpp_node *node; unsigned i, sum, sumcut, weight_sum; @@ -3695,7 +3695,7 @@ static struct rtpp_node *select_rtpp_node_new(str callid, str viabranch, /* Select only between enabled machines */ if(!node->rn_disabled - && !is_queried_node(node, queried_nodes_ptr, queried_nodes)) { + && !is_queried_node(node, queried_nodes_list, queried_nodes)) { weight_sum += node->rn_weight; } } @@ -3746,7 +3746,7 @@ static struct rtpp_node *select_rtpp_node_new(str callid, str viabranch, continue; /* Select only between not already queried machines */ - if(is_queried_node(node, queried_nodes_ptr, queried_nodes)) + if(is_queried_node(node, queried_nodes_list, queried_nodes)) continue; /* Found machine */ @@ -3819,7 +3819,7 @@ unsigned int node_in_set(struct rtpp_node *node, struct rtpp_set *set) * the call if some proxies were disabled or enabled (e.g. kamctl command) */ static struct rtpp_node *select_rtpp_node(str callid, str viabranch, - int do_test, struct rtpp_node **queried_nodes_ptr, int queried_nodes, + int do_test, struct rtpp_node **queried_nodes_list, int queried_nodes, enum rtpe_operation op) { struct rtpp_node *node = NULL; @@ -3842,7 +3842,7 @@ static struct rtpp_node *select_rtpp_node(str callid, str viabranch, // lookup node node = select_rtpp_node_old(callid, viabranch, do_test, op); - if(node && is_queried_node(node, queried_nodes_ptr, queried_nodes)) { + if(node && is_queried_node(node, queried_nodes_list, queried_nodes)) { LM_ERR("rtpengine node for callid=%.*s is known (%.*s) but it has " "already been queried, therefore not returning it\n", callid.len, callid.s, node->rn_url.len, node->rn_url.s); @@ -3853,7 +3853,7 @@ static struct rtpp_node *select_rtpp_node(str callid, str viabranch, if(!node || (node_in_set(node, active_rtpp_set) == 0)) { // run the selection algorithm node = select_rtpp_node_new( - callid, viabranch, do_test, queried_nodes_ptr, queried_nodes); + callid, viabranch, do_test, queried_nodes_list, queried_nodes); // check node if(!node) {

11 months, 2 weeks

git:master:c53a3a0f: siptrace: rename parameters to avoid overlapping with global structure

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c53a3a0fdee77d6d638f2f50f405ee038288301d URL: https://github.com/kamailio/kamailio/commit/c53a3a0fdee77d6d638f2f50f405ee0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-07T12:58:54+01:00 siptrace: rename parameters to avoid overlapping with global structure --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/c53a3a0fdee77d6d638f2f50f405ee0… Patch: https://github.com/kamailio/kamailio/commit/c53a3a0fdee77d6d638f2f50f405ee0… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index dba43d31686..e988a6ae36f 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -116,9 +116,9 @@ static void trace_sl_ack_in(sl_cbp_t *slcb); static void trace_transaction( sip_msg_t *msg, siptrace_info_t *info, int dlg_tran); static void trace_dialog( - struct dlg_cell *dlg, int type, struct dlg_cb_params *params); + struct dlg_cell *dlg, int type, struct dlg_cb_params *cbp); static void trace_dialog_transaction( - struct dlg_cell *dlg, int type, struct dlg_cb_params *params); + struct dlg_cell *dlg, int type, struct dlg_cb_params *cbp); static void trace_free_info(void *trace_info); static int trace_add_info_xavp(siptrace_info_t *info); static inline int trace_parse_raw_uri(siptrace_info_t *info); @@ -2101,7 +2101,7 @@ static void trace_transaction( //static void trace_dialog(sip_msg_t* msg, siptrace_info_t* info) static void trace_dialog( - struct dlg_cell *dlg, int type, struct dlg_cb_params *params) + struct dlg_cell *dlg, int type, struct dlg_cb_params *cbp) { sr_xavp_t *xavp; @@ -2110,13 +2110,13 @@ static void trace_dialog( return; } - /* request - params->req */ - if(params == NULL || (!trace_dialog_spiral && params->req == NULL)) { + /* request - cbp->req */ + if(cbp == NULL || (!trace_dialog_spiral && cbp->req == NULL)) { LM_ERR("Invalid args!\n"); return; } - if(trace_dialog_spiral && *params->param == NULL) { + if(trace_dialog_spiral && *cbp->param == NULL) { LM_DBG("Spiraled dialog!\n"); if(dlgb.register_dlgcb( dlg, DLGCB_SPIRALED, trace_dialog, &spiral_tracked, NULL) @@ -2126,7 +2126,7 @@ static void trace_dialog( } } - if(!trace_dialog_spiral && !(params->req->msg_flags & FL_SIPTRACE)) { + if(!trace_dialog_spiral && !(cbp->req->msg_flags & FL_SIPTRACE)) { LM_DBG("Trace is off for this request...\n"); return; } @@ -2171,12 +2171,12 @@ static void trace_dialog( static void trace_dialog_transaction( - struct dlg_cell *dlg, int type, struct dlg_cb_params *params) + struct dlg_cell *dlg, int type, struct dlg_cb_params *cbp) { siptrace_info_t *info; /* coverity fix - there shouldn't be a scenario for this to happen */ - if(params == NULL || params->param == NULL) { + if(cbp == NULL || cbp->param == NULL) { LM_ERR("NULL dialog params!\n"); return; } @@ -2187,15 +2187,15 @@ static void trace_dialog_transaction( * transaction callbacks to catch caller and callee BYEs and their * responses */ - if(params->req == NULL && params->rpl == NULL) { + if(cbp->req == NULL && cbp->rpl == NULL) { LM_DBG("dual bye!\n"); return; } - info = (siptrace_info_t *)*params->param; + info = (siptrace_info_t *)*cbp->param; - trace_transaction(params->req, info, 1); + trace_transaction(cbp->req, info, 1); - sip_trace(params->req, &info->u.dest_info, &info->correlation_id, NULL); + sip_trace(cbp->req, &info->u.dest_info, &info->correlation_id, NULL); } static void trace_free_info(void *trace_info)

11 months, 2 weeks

git:master:000404ac: smsops: prefix some global variables with module name

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 000404acbf84b0425d8d8e03ece29d525dc56efc URL: https://github.com/kamailio/kamailio/commit/000404acbf84b0425d8d8e03ece29d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-07T12:50:05+01:00 smsops: prefix some global variables with module name --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/000404acbf84b0425d8d8e03ece29d5… Patch: https://github.com/kamailio/kamailio/commit/000404acbf84b0425d8d8e03ece29d5…

11 months, 2 weeks

← Newer
1
...
25
26
27
28
29
30
31
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2024