sr-dev September 2024

sr-dev@lists.kamailio.org

15 participants
172 discussions

git:master:435fa668: pua_dialoginfo: Remove dlg_flag docs
by Henning Westerholt 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: 435fa668e1709df8c3025961fa7a38224483914e URL: https://github.com/kamailio/kamailio/commit/435fa668e1709df8c3025961fa7a382… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-16T13:39:06+02:00 pua_dialoginfo: Remove dlg_flag docs --- Modified: src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/435fa668e1709df8c3025961fa7a382… Patch: https://github.com/kamailio/kamailio/commit/435fa668e1709df8c3025961fa7a382… --- diff --git a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml index 6093c3516b6..ac5d3ba41d3 100644 --- a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml +++ b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml @@ -165,8 +165,8 @@ <para>This module is directly coupled with the dialog module. Thus, if the module is loaded, it is automatically active for all calls tracked by the dialog module. Thus, make sure that you activate the dialog module for a certain call if you want dialog-state - to be PUBLISHED. This means, the dlg_flag of the dialog module must be configured - and the respective flag must be set during call processing. + to be PUBLISHED. This means, use the <emphasis>dlg_manage()</emphasis> function of the dialog + module to have it tracked. </para> </section> <section>

1 0

git:master:f612c958: qos: Remove dlg_flag docs
by Henning Westerholt 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: f612c9583072eb22dc477c11d000541ab8b944ad URL: https://github.com/kamailio/kamailio/commit/f612c9583072eb22dc477c11d000541… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-16T13:39:06+02:00 qos: Remove dlg_flag docs --- Modified: src/modules/qos/doc/qos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f612c9583072eb22dc477c11d000541… Patch: https://github.com/kamailio/kamailio/commit/f612c9583072eb22dc477c11d000541… --- diff --git a/src/modules/qos/doc/qos_admin.xml b/src/modules/qos/doc/qos_admin.xml index 38d33a99f00..908ab5d5f84 100644 --- a/src/modules/qos/doc/qos_admin.xml +++ b/src/modules/qos/doc/qos_admin.xml @@ -32,12 +32,10 @@ </para> <para> - All of this happens with a properly configured dialog - and qos module and setting the dialog flag and the qos flag at - the time any INVITE SIP message is seen. There is no - config script function call required to set the SDP session - tracking mechanism. See the dialog module users guide for - more information. + All of this happens with a properly configured dialog and qos + module. You need to call the dlg_manage() function and set the + qos flag at the time any INVITE sip message is seen. + See the <quote>dialog module</quote> users guide for information. </para> <para> @@ -126,9 +124,9 @@ before you can do that, you need to tell the qos module which flag value you are assigning to qos.</para> - <para>In most cases when ever you set the dialog flag - you will want to set the qos flag. If the dialog flag - is not set and the qos flag is set, it will not have + <para>In most cases when ever you call dlg_manage() function + you will want to set the qos flag. If the dialog is not tracked + and the qos flag is set, it will not have any effect.</para> <para><emphasis>This parameter must be set or the module will @@ -143,13 +141,12 @@ <title>Set <varname>qos_flag</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("dialog", "dlg_flag", 5) modparam("qos", "qos_flag", 7) ... route { ... if (method=="INVITE") { - setflag(5); # set the dialog flag + dlg_manage(); # Track the dialog setflag(7); # Set the qos flag } ... @@ -182,4 +179,3 @@ route { </para> </section> </chapter> -

1 0

git:master:fbe3aede: acc: Remove dlg_flag docs
by Henning Westerholt 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: fbe3aedee492ceb23ef53c967f1fe256a94d876f URL: https://github.com/kamailio/kamailio/commit/fbe3aedee492ceb23ef53c967f1fe25… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-16T13:39:06+02:00 acc: Remove dlg_flag docs --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fbe3aedee492ceb23ef53c967f1fe25… Patch: https://github.com/kamailio/kamailio/commit/fbe3aedee492ceb23ef53c967f1fe25… --- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index 37a1365627e..493ae6323f3 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -327,7 +327,7 @@ if (uri=~"sip:+40") /* calls to Romania */ { <para> The dialog module needs to be engaged on the dialogs that should be accounted, that they will be tracked by the server. This is usally done by calling the function - <emphasis>dlg_manage()</emphasis> or setting the <emphasis>dlg_flag</emphasis>. + <emphasis>dlg_manage()</emphasis>. Refer to the documentation of the dialog module for more information. </para> @@ -1611,4 +1611,3 @@ acc_db_request("$var(code) $avp(reason)", "acc"); </section> </section> </chapter> -

1 0

git:master:81f96617: dialog/doc: Remove dlg_flag docs and suggest dlg_manage() instead.
by Henning Westerholt 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: 81f966174275b715608f50aae606d40a791dd67c URL: https://github.com/kamailio/kamailio/commit/81f966174275b715608f50aae606d40… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-16T13:39:06+02:00 dialog/doc: Remove dlg_flag docs and suggest dlg_manage() instead. --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/81f966174275b715608f50aae606d40… Patch: https://github.com/kamailio/kamailio/commit/81f966174275b715608f50aae606d40… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 07116e70a63..d1547b367a6 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -46,9 +46,8 @@ <title>How it works</title> <para> To create the dialog associated with an initial INVITE request, execute - the function <quote>dlg_manage()</quote> or set the flag specified by - parameter <quote>dlg_flag</quote> (<xref linkend="dialog.p.flag"/>) - before creating the corresponding transaction. + the function <quote>dlg_manage()</quote> before creating the + corresponding transaction. </para> <para> The dialog is automatically destroyed when a <quote>BYE</quote> is @@ -253,28 +252,17 @@ modparam("dialog", "rr_param", "xyz") <section id="dialog.p.flag"> <title><varname>dlg_flag</varname> (integer)</title> <para> - Flag to be used for marking if a dialog should be constructed for the - current request (this makes sense only for initial requests). - </para> - <para> - Note: it is not needed to set this parameter and its corresponding flag + Note: This flag has beed deprecated and not used anyymore. + it is not needed to set this parameter and its corresponding flag for initial request in case the <quote>dlg_manage()</quote> function - is used. In other words, using <quote>dlg_manage()</quote> alone is - enough. + is used. + In other words, use <quote>dlg_manage()</quote>. </para> <para> <emphasis> Default value is <quote>none</quote>. </emphasis> </para> - <example> - <title>Set <varname>dlg_flag</varname> parameter</title> - <programlisting format="linespecific"> -... -modparam("dialog", "dlg_flag", 4) -... -</programlisting> - </example> </section> <section id="dialog.p.timeout_avp">

1 0

git:master:e60a0646: dialog: Drop support for dlg_flag parameter
by Henning Westerholt 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: e60a06469503c566d40437e69cf3374aad361251 URL: https://github.com/kamailio/kamailio/commit/e60a06469503c566d40437e69cf3374… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-16T13:39:06+02:00 dialog: Drop support for dlg_flag parameter --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_handlers.c Modified: src/modules/dialog/dlg_handlers.h --- Diff: https://github.com/kamailio/kamailio/commit/e60a06469503c566d40437e69cf3374… Patch: https://github.com/kamailio/kamailio/commit/e60a06469503c566d40437e69cf3374…

1 0

[kamailio/kamailio] cdp: export all functions in KEMI module (PR #3949)
by bazrafshan.m.h 16 Sep '24

16 Sep '24

- Added `cdp_has_app` function: - Accepts a single parameter: - `application`: The Application ID. - Added `cdp_has_app2` function: - Accepts two parameters: - `vendorid`: The Vendor ID associated with the application. - `application`: The Application ID. - Added cdp_check_peer function: - Accepts one parameter: - `fqdn`: the Fully qualified domain name of the peer, that should be checked. The parameter may contain pseudovariables. NOTE: All parameters are passed as standard strings.   #### 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  - The cdp functions are exported to KEMI You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3949 -- Commit Summary -- * cdp: export all functions in KEMI module -- File Changes -- M src/modules/cdp/cdp_mod.c (49) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3949.patch https://github.com/kamailio/kamailio/pull/3949.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3949 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3949(a)github.com>

2 3

git:master:11f20730: cdp: export all functions in KEMI module
by Henning Westerholt 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: 11f207306a1da400f4252a1fafd456cda015fb3b URL: https://github.com/kamailio/kamailio/commit/11f207306a1da400f4252a1fafd456c… Author: Moheb <bazrafshan.m.h(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-16T13:35:01+02:00 cdp: export all functions in KEMI module - Added `cdp_has_app` function: - Accepts a single parameter: - `application`: The Application ID. - Added `cdp_has_app2` function: - Accepts two parameters: - `vendorid`: The Vendor ID associated with the application. - `application`: The Application ID. - Added cdp_check_peer function: - Accepts one parameter: - `fqdn`: the Fully qualified domain name of the peer, that should be checked. The parameter may contain pseudovariables. NOTE: All parameters are passed as standard strings. --- Modified: src/modules/cdp/cdp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/11f207306a1da400f4252a1fafd456c… Patch: https://github.com/kamailio/kamailio/commit/11f207306a1da400f4252a1fafd456c… --- diff --git a/src/modules/cdp/cdp_mod.c b/src/modules/cdp/cdp_mod.c index 4685d2af511..b32e4ea7bf4 100644 --- a/src/modules/cdp/cdp_mod.c +++ b/src/modules/cdp/cdp_mod.c @@ -57,6 +57,7 @@ #include "cdp_functions.h" #include "cdp_tls.h" #include "../../core/mod_fix.h" +#include "../../core/kemi.h" MODULE_VERSION @@ -301,7 +302,10 @@ int w_cdp_check_peer(sip_msg_t *msg, char *peer, char *p2) } return -1; } - +int ki_cdp_check_peer(sip_msg_t *msg, str *peer) +{ + return w_cdp_check_peer(msg, peer->s, "NULL"); +} static int w_cdp_has_app(sip_msg_t *msg, char *appid, char *param) { unsigned int app_flags; @@ -324,6 +328,10 @@ static int w_cdp_has_app(sip_msg_t *msg, char *appid, char *param) return check_application(-1, a); } +static int ki_cdp_has_app(sip_msg_t *msg, str *appid) +{ + return w_cdp_has_app(msg, appid->s, "NULL"); +} static int w_cdp_has_app2(sip_msg_t *msg, char *vendor, char *appid) { unsigned int vendor_flags, app_flags; @@ -359,3 +367,42 @@ static int w_cdp_has_app2(sip_msg_t *msg, char *vendor, char *appid) } return check_application(v, a); } +static int ki_cdp_has_app2(sip_msg_t *msg, str *vendor, str *appid) +{ + return w_cdp_has_app2(msg, vendor->s, appid->s); +} + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_cdp_exports[] = { + { str_init("cdp"), str_init("cdp_check_peer"), + SR_KEMIP_INT, ki_cdp_check_peer, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("cdp"), str_init("cdp_has_app"), + SR_KEMIP_INT, ki_cdp_has_app, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("cdp"), str_init("cdp_has_app2"), + SR_KEMIP_INT, ki_cdp_has_app2, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +/** + * + */ + +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_cdp_exports); + return 0; +}

1 0

git:master:15d81a01: core: use macro to check send_port_str value
by Daniel-Constantin Mierla 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: 15d81a0151aa46a20f95fb8c6dc2665d03e741aa URL: https://github.com/kamailio/kamailio/commit/15d81a0151aa46a20f95fb8c6dc2665… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-16T12:18:54+02:00 core: use macro to check send_port_str value --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/15d81a0151aa46a20f95fb8c6dc2665… Patch: https://github.com/kamailio/kamailio/commit/15d81a0151aa46a20f95fb8c6dc2665… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index bc68a920ef6..4f88150e11b 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -728,7 +728,7 @@ static inline int lumps_len( }; \ break; \ case SUBST_SND_PORT: \ - if(send_port_str != NULL) { \ + if(STR_WITHVAL(send_port_str)) { \ new_len += send_port_str->len; \ } else { \ LM_CRIT("null send sock port\n"); \ @@ -772,7 +772,7 @@ static inline int lumps_len( send_address_str->len) \ != NULL)) \ new_len += 2; \ - if(send_port_str != NULL) { \ + if(STR_WITHVAL(send_port_str)) { \ /* add :port_no */ \ new_len += 1 + send_port_str->len; \ } \ @@ -1175,7 +1175,7 @@ void process_lumps(struct sip_msg *msg, struct lump *lumps, char *new_buf, }; \ break; \ case SUBST_SND_PORT: \ - if(send_port_str != NULL) { \ + if(STR_WITHVAL(send_port_str)) { \ memcpy(new_buf + offset, send_port_str->s, \ send_port_str->len); \ offset += send_port_str->len; \ @@ -1205,7 +1205,7 @@ void process_lumps(struct sip_msg *msg, struct lump *lumps, char *new_buf, offset++; \ } \ /* :port */ \ - if(send_port_str != NULL) { \ + if(STR_WITHVAL(send_port_str)) { \ new_buf[offset] = ':'; \ offset++; \ memcpy(new_buf + offset, send_port_str->s, \

1 0

git:master:c09a2936: core: use advertised port for recv socket only when set
by Daniel-Constantin Mierla 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: c09a29369f03f6c5e621a94b5b853047490568aa URL: https://github.com/kamailio/kamailio/commit/c09a29369f03f6c5e621a94b5b85304… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-16T10:42:19+02:00 core: use advertised port for recv socket only when set --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/c09a29369f03f6c5e621a94b5b85304… Patch: https://github.com/kamailio/kamailio/commit/c09a29369f03f6c5e621a94b5b85304… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 19713e1b1cc..bc68a920ef6 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -631,7 +631,7 @@ static inline int lumps_len( }; \ break; \ case SUBST_RCV_PORT: \ - if(msg->rcv.bind_address && STR_WITHVAL(recv_port_str)) { \ + if(STR_WITHVAL(recv_port_str)) { \ new_len += recv_port_str->len; \ } else { \ LM_CRIT(" rcv port - null bind_address\n"); \ @@ -864,9 +864,11 @@ static inline int lumps_len( recv_address_str = &(msg->rcv.bind_address->address_str); recv_af = msg->rcv.bind_address->address.af; } - if(msg->rcv.bind_address->useinfo.port_no > 0) { - recv_port_str = &(msg->rcv.bind_address->useinfo.port_no_str); - recv_port_no = msg->rcv.bind_address->useinfo.port_no; + if(msg->rcv.bind_address->useinfo.name.len > 0) { + if(msg->rcv.bind_address->useinfo.port_no > 0) { + recv_port_str = &(msg->rcv.bind_address->useinfo.port_no_str); + recv_port_no = msg->rcv.bind_address->useinfo.port_no; + } } else { recv_port_str = &(msg->rcv.bind_address->port_no_str); recv_port_no = msg->rcv.bind_address->port_no; @@ -1055,7 +1057,7 @@ void process_lumps(struct sip_msg *msg, struct lump *lumps, char *new_buf, }; \ break; \ case SUBST_RCV_PORT: \ - if(msg->rcv.bind_address && STR_WITHVAL(recv_port_str)) { \ + if(STR_WITHVAL(recv_port_str)) { \ memcpy(new_buf + offset, recv_port_str->s, \ recv_port_str->len); \ offset += recv_port_str->len; \ @@ -1396,9 +1398,11 @@ void process_lumps(struct sip_msg *msg, struct lump *lumps, char *new_buf, recv_address_str = &(msg->rcv.bind_address->address_str); recv_af = msg->rcv.bind_address->address.af; } - if(msg->rcv.bind_address->useinfo.port_no > 0) { - recv_port_str = &(msg->rcv.bind_address->useinfo.port_no_str); - recv_port_no = msg->rcv.bind_address->useinfo.port_no; + if(msg->rcv.bind_address->useinfo.name.len > 0) { + if(msg->rcv.bind_address->useinfo.port_no > 0) { + recv_port_str = &(msg->rcv.bind_address->useinfo.port_no_str); + recv_port_no = msg->rcv.bind_address->useinfo.port_no; + } } else { recv_port_str = &(msg->rcv.bind_address->port_no_str); recv_port_no = msg->rcv.bind_address->port_no;

1 0

git:master:0f423f97: core: use advertised port only when explicitely set
by Daniel-Constantin Mierla 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: 0f423f97607416edcff8d0f1612fad7af29b6064 URL: https://github.com/kamailio/kamailio/commit/0f423f97607416edcff8d0f1612fad7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-16T09:17:09+02:00 core: use advertised port only when explicitely set - do not fallback to socket port --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/0f423f97607416edcff8d0f1612fad7… Patch: https://github.com/kamailio/kamailio/commit/0f423f97607416edcff8d0f1612fad7…

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
18
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2024