sr-dev August 2022

sr-dev@lists.kamailio.org

16 participants
279 discussions

git:5.6:3086494d: uac_redirect: clarifications for acc_function mod param

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: 3086494d7fa1ada9ce5f3ed851610a2fc542656a URL: https://github.com/kamailio/kamailio/commit/3086494d7fa1ada9ce5f3ed851610a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-16T11:59:41+02:00 uac_redirect: clarifications for acc_function mod param (cherry picked from commit 7ef109e6cd1ce7ecbfa56c31ff7555275e59095f) --- Modified: src/modules/uac_redirect/doc/uac_redirect_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3086494d7fa1ada9ce5f3ed851610a2… Patch: https://github.com/kamailio/kamailio/commit/3086494d7fa1ada9ce5f3ed851610a2… --- diff --git a/src/modules/uac_redirect/doc/uac_redirect_admin.xml b/src/modules/uac_redirect/doc/uac_redirect_admin.xml index 1388fc740a4..71a448a6ae7 100644 --- a/src/modules/uac_redirect/doc/uac_redirect_admin.xml +++ b/src/modules/uac_redirect/doc/uac_redirect_admin.xml @@ -211,11 +211,14 @@ modparam("uac_redirect","accept_filter",".*(a)siphub\.net") <section id="uac_redirect.p.acc_function"> <title><varname>acc_function</varname> (string)</title> <para> - Specifies the accounting function to be used. Just by defining - this parameter, the accounting support will not be enabled. - Accounting may only be enabled via two parameters - <function moreinfo="none">set_accept_filter()</function> - scripting function. + Specifies the accounting function to be used. Just by defining + this parameter, the accounting is not done automatically, it has to + be requested via parameters of + <function moreinfo="none">set_accept_filter()</function> + or other scripting function. + </para> + <para> + Set it to empty string in order to disable binding to acc module. </para> <para> Its values may be: @@ -248,13 +251,9 @@ modparam("uac_redirect","acc_function","acc_db_request") <section id="uac_redirect.p.acc_db_table"> <title><varname>acc_db_table</varname> (string)</title> <para> - Specifies the accounting table to be used if DB accounting was - chosen (<varname>acc_function</varname> was set to - <quote>acc_db_request</quote>). Just by defining - this parameter, the accounting support will not be enabled. - Accounting may only be enabled via two parameters - <function moreinfo="none">set_accept_filter()</function> - scripting function. + Specifies the accounting table to be used if DB accounting was + chosen (<varname>acc_function</varname> was set to + <quote>acc_db_request</quote> or <quote>acc_request</quote>). </para> <para> <emphasis>

2 years, 4 months

git:5.6:6ac1d7a7: sipt: Fix isup generic_number and generic_number_nai decoding (GH #3209)

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: 6ac1d7a7cdb49fb8db4ff280c5159098b0b4284f URL: https://github.com/kamailio/kamailio/commit/6ac1d7a7cdb49fb8db4ff280c515909… Author: russagit <rustam.safargalin(a)sifox.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-16T11:59:15+02:00 sipt: Fix isup generic_number and generic_number_nai decoding (GH #3209) (cherry picked from commit 9f3d1c274ad926e9640d0091c9702a34f8b2e539) --- Modified: src/modules/sipt/ss7_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/6ac1d7a7cdb49fb8db4ff280c515909… Patch: https://github.com/kamailio/kamailio/commit/6ac1d7a7cdb49fb8db4ff280c515909… --- diff --git a/src/modules/sipt/ss7_parser.c b/src/modules/sipt/ss7_parser.c index 30d85cdb1e2..eaac53e5ca0 100644 --- a/src/modules/sipt/ss7_parser.c +++ b/src/modules/sipt/ss7_parser.c @@ -570,7 +570,7 @@ int isup_get_generic_number_nai(unsigned char *buf, int len) if(offset != -1 && len-offset-2 > 1) { - return buf[offset+2] & 0x7F; + return buf[offset+3] & 0x7F; } return -1; } @@ -586,13 +586,13 @@ int isup_get_generic_number(unsigned char *buf, int len, char* sb_buf) if(offset != -1 && len-offset-2 > 1) { sbparamlen = (buf[offset+1] & 0xFF) - 2; - oddeven = (buf[offset+2] >> 7) & 0x1; + oddeven = (buf[offset+3] >> 7) & 0x1; while ((sbparamlen > 0) && (buf[offset] != 0)) { - sb_buf[sb_i]="0123456789ABCDEF"[(buf[offset+4+sb_j] & 0x0F)]; + sb_buf[sb_i]="0123456789ABCDEF"[(buf[offset+5+sb_j] & 0x0F)]; if(sbparamlen > 1 || oddeven == 0) { - sb_buf[sb_i+1]="0123456789ABCDEF"[(buf[offset+4+sb_j] >>4 & 0x0F)]; + sb_buf[sb_i+1]="0123456789ABCDEF"[(buf[offset+5+sb_j] >>4 & 0x0F)]; } sb_i=sb_i+2; sbparamlen--;

2 years, 4 months

git:5.6:3e2cf002: dispatcher: check if packing address fails on removing via rpc

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: 3e2cf002f544c438a7bcdcff8986b0a28c5921a8 URL: https://github.com/kamailio/kamailio/commit/3e2cf002f544c438a7bcdcff8986b0a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-16T11:58:41+02:00 dispatcher: check if packing address fails on removing via rpc - GH #3199 (cherry picked from commit 13a4021914057ca66eaa91e2ea022e1827963b70) --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/3e2cf002f544c438a7bcdcff8986b0a… Patch: https://github.com/kamailio/kamailio/commit/3e2cf002f544c438a7bcdcff8986b0a… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index d19098800a3..7d818538d61 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2680,6 +2680,11 @@ int ds_remove_dst(int group, str *address) setn = 0; dp = pack_dest(*address, 0, 0, NULL, 0); + if(dp==NULL) { + LM_ERR("failed to pack address: %d %.*s\n", group, + address->len, address->s); + return -1; + } filter_arg.setid = group; filter_arg.dest = dp; filter_arg.setn = &setn;

2 years, 4 months

git:5.6:f1bd6bb8: nathelper: docs - rephrased the remarks about set_contact_alias()

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: f1bd6bb8dec9db76acf697a7b1d177a2bfcfd7c1 URL: https://github.com/kamailio/kamailio/commit/f1bd6bb8dec9db76acf697a7b1d177a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-16T11:58:14+02:00 nathelper: docs - rephrased the remarks about set_contact_alias() (cherry picked from commit c009f27578e8df9aa77ab852325dad8dc710d6c8) --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f1bd6bb8dec9db76acf697a7b1d177a… Patch: https://github.com/kamailio/kamailio/commit/f1bd6bb8dec9db76acf697a7b1d177a… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index d0e8a18ea4c..a8828baa74f 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -878,8 +878,10 @@ if(is_rfc1918("$rd")) { <para> Adds an <quote>;alias=ip~port~transport</quote> parameter to the contact URI containing the received ip, port, and transport protocol. - The new contact URI is immediately visible to other modules in the - way the <function>fix_nated_contact()</function> does it. + The update of contact URI is signaled to a few other modules in the + way the <function>fix_nated_contact()</function> does it by using the + internal flags. The new value is not visible to pseudo-variables and it + does not change the SIP message buffer. </para> <para>Meaning of parameters:</para> <itemizedlist>

2 years, 4 months

git:5.6:50a46d9b: siputils: fix typo for is_first_hope, related to gh #3200

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: 50a46d9b894a32c82697c4b49a68ececb881b3e5 URL: https://github.com/kamailio/kamailio/commit/50a46d9b894a32c82697c4b49a68ece… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-16T11:57:57+02:00 siputils: fix typo for is_first_hope, related to gh #3200 (cherry picked from commit ac75a033132740b06d5afcdc17c25d3c354e7d89) --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/50a46d9b894a32c82697c4b49a68ece… Patch: https://github.com/kamailio/kamailio/commit/50a46d9b894a32c82697c4b49a68ece… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index 73178847ad0..c2aef667e5a 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -1178,7 +1178,7 @@ if (is_supported("outbound")) { ... } ... if(is_first_hop()) { ... } ... -if(is_first_hop_mode("1")) { ... } +if(is_first_hop("1")) { ... } ... </programlisting> </example>

2 years, 4 months

git:5.6:f4d9be60: uac_redirect: test if the acc function is set before binding to acc module

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: f4d9be60489461f0903b8ca2d1e6248d1e0b0717 URL: https://github.com/kamailio/kamailio/commit/f4d9be60489461f0903b8ca2d1e6248… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-16T11:55:41+02:00 uac_redirect: test if the acc function is set before binding to acc module - GH #3188 (cherry picked from commit e21df35840c7a85cf26a3005f718e5e37edeac8e) --- Modified: src/modules/uac_redirect/uac_redirect.c --- Diff: https://github.com/kamailio/kamailio/commit/f4d9be60489461f0903b8ca2d1e6248… Patch: https://github.com/kamailio/kamailio/commit/f4d9be60489461f0903b8ca2d1e6248… --- diff --git a/src/modules/uac_redirect/uac_redirect.c b/src/modules/uac_redirect/uac_redirect.c index 1fd06c5b723..76b7592b5af 100644 --- a/src/modules/uac_redirect/uac_redirect.c +++ b/src/modules/uac_redirect/uac_redirect.c @@ -166,6 +166,10 @@ static int get_redirect_fixup(void** param, int param_no) *param=(void*)(long)( (((unsigned short)maxt)<<8) | maxb); } else if (param_no==2) { /* acc function loaded? */ + if (uacred_acc_fct_s.s==0 || uacred_acc_fct_s.s[0]=='\0') { + LM_ERR("acc support enabled, but no acc function defined\n"); + return E_UNSPEC; + } if (_uacred_accb.acc_request==NULL) { /* bind the ACC API */ if(acc_load_api(&_uacred_accb) < 0) { @@ -249,10 +253,12 @@ static int redirect_init(void) goto error; } - /* bind the ACC API */ - if(acc_load_api(&_uacred_accb) < 0) { - LM_ERR("cannot bind to ACC API\n"); - return -1; + if(uacred_acc_fct_s.s != 0 && uacred_acc_fct_s.s[0] != '\0') { + /* bind the ACC API */ + if(acc_load_api(&_uacred_accb) < 0) { + LM_ERR("cannot bind to ACC API\n"); + return -1; + } } /* init filter */

2 years, 4 months

git:5.6:ca1e61ec: core: use memcpy and set end of string

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: ca1e61ec0453b9a4797ac7af88ac179d27e53685 URL: https://github.com/kamailio/kamailio/commit/ca1e61ec0453b9a4797ac7af88ac179… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-16T11:54:38+02:00 core: use memcpy and set end of string (cherry picked from commit 5cd4e817a24308b82fc3f631fb18f354dadf2b7e) --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/ca1e61ec0453b9a4797ac7af88ac179… Patch: https://github.com/kamailio/kamailio/commit/ca1e61ec0453b9a4797ac7af88ac179… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index c9dd89118d8..e3ae29bc147 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1502,7 +1502,8 @@ static int build_iface_list(void) } if(strlen(ifaces[index].name)==0 && strlen(name)>0) { - strncpy(ifaces[index].name, name, MAX_IF_LEN-1); + memcpy(ifaces[index].name, name, MAX_IF_LEN-1); + ifaces[index].name[MAX_IF_LEN-1] = '\0'; } ifaces[index].index = index;

2 years, 4 months

git:master:1e4bf1dd: msrp: proper cmap insert when last item has greater citemid

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1e4bf1dd7fbfc9d51f0e56e98472a42de781cdbd URL: https://github.com/kamailio/kamailio/commit/1e4bf1dd7fbfc9d51f0e56e98472a42… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-16T09:09:45+02:00 msrp: proper cmap insert when last item has greater citemid - condition for last item was processed first, resulting in improper order of items, GH #3215 --- Modified: src/modules/msrp/msrp_cmap.c --- Diff: https://github.com/kamailio/kamailio/commit/1e4bf1dd7fbfc9d51f0e56e98472a42… Patch: https://github.com/kamailio/kamailio/commit/1e4bf1dd7fbfc9d51f0e56e98472a42… --- diff --git a/src/modules/msrp/msrp_cmap.c b/src/modules/msrp/msrp_cmap.c index 9764c0903f5..2fc6a8d740b 100644 --- a/src/modules/msrp/msrp_cmap.c +++ b/src/modules/msrp/msrp_cmap.c @@ -270,20 +270,21 @@ int msrp_cmap_save(msrp_frame_t *mf) } else { for(itb=_msrp_cmap_head->cslots[idx].first; itb; itb=itb->next) { - if(itb->citemid>it->citemid || itb->next==NULL) { - if(itb->next==NULL) { - itb->next=it; - it->prev = itb; + if(itb->citemid>it->citemid) { + /* insert before current item */ + it->next = itb; + if(itb->prev==NULL) { + _msrp_cmap_head->cslots[idx].first = it; } else { - it->next = itb; - if(itb->prev==NULL) { - _msrp_cmap_head->cslots[idx].first = it; - } else { - itb->prev->next = it; - } - it->prev = itb->prev; - itb->prev = it; + itb->prev->next = it; } + it->prev = itb->prev; + itb->prev = it; + break; + } else if(itb->next==NULL) { + /* insert after last item */ + itb->next=it; + it->prev = itb; break; } }

2 years, 4 months

git:master:f1dcb649: modules: readme files regenerated - secfilter ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: f1dcb649cb779b2ccd14d18cad441d29653ffabd URL: https://github.com/kamailio/kamailio/commit/f1dcb649cb779b2ccd14d18cad441d2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-08-15T20:46:09+02:00 modules: readme files regenerated - secfilter ... [skip ci] --- Modified: src/modules/secfilter/README --- Diff: https://github.com/kamailio/kamailio/commit/f1dcb649cb779b2ccd14d18cad441d2… Patch: https://github.com/kamailio/kamailio/commit/f1dcb649cb779b2ccd14d18cad441d2… --- diff --git a/src/modules/secfilter/README b/src/modules/secfilter/README index 435db783fa..345b639e91 100644 --- a/src/modules/secfilter/README +++ b/src/modules/secfilter/README @@ -661,8 +661,6 @@ d in the user-agent header ($ua)"); Example 1.24. kamcmd secfilter.print ua ... -User-agent -========== { User-Agent: { Blacklisted: {

2 years, 4 months

[kamailio/kamailio] Pepelux/secfilter (PR #3217)

by Jose Luis Verdeguer

#### 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Fixed an error in an example in the docfile You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3217 -- Commit Summary -- * secfilter: machine-parsable data structure for RPC printing data * secfilter: updated samples [skip ci] * secfilter: fix examples [skip ci] -- File Changes -- M src/modules/secfilter/doc/secfilter_admin.xml (121) M src/modules/secfilter/secfilter_rpc.c (383) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3217.patch https://github.com/kamailio/kamailio/pull/3217.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3217 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3217(a)github.com>

2 years, 4 months

← Newer
1
...
20
21
22
23
24
25
26
27
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2022