- sr-dev - kamailio.org

git:master:b2045d55: pv: remove another redunant variable definition related commit 8ed4165fd3b0a33
by Henning Westerholt 21 Dec '23

21 Dec '23

Module: kamailio Branch: master Commit: b2045d559ed720789df80f543fc00923a07ada83 URL: https://github.com/kamailio/kamailio/commit/b2045d559ed720789df80f543fc0092… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-12-21T11:54:52Z pv: remove another redunant variable definition related commit 8ed4165fd3b0a33 --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/b2045d559ed720789df80f543fc0092… Patch: https://github.com/kamailio/kamailio/commit/b2045d559ed720789df80f543fc0092… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 1c822d014fa..03d025bba2f 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2479,7 +2479,7 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) while(paib != NULL) { if(n + paib->num_ids > idx) { /* Calculate the index within this specific list */ - int innerIndex = idx - n; + innerIndex = idx - n; /* Access the desired element within this list */ sval.s = paib->id[innerIndex].body.s;

1 0

git:master:0547a4be: pv: remove another redunant variable definition (warning: unused variable âinnerIndexâ)
by Henning Westerholt 21 Dec '23

21 Dec '23

Module: kamailio Branch: master Commit: 0547a4becbc6a48fdc473cfd26cdeedfa2a9317d URL: https://github.com/kamailio/kamailio/commit/0547a4becbc6a48fdc473cfd26cdeed… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-12-21T11:34:14Z pv: remove another redunant variable definition (warning: unused variable ��innerIndex��) --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/0547a4becbc6a48fdc473cfd26cdeed… Patch: https://github.com/kamailio/kamailio/commit/0547a4becbc6a48fdc473cfd26cdeed… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 5375e95c418..1c822d014fa 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2427,7 +2427,7 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) while(ppib != NULL) { if(n + ppib->num_ids > idx) { /* Calculate the index within this specific list */ - int innerIndex = idx - n; + innerIndex = idx - n; /* Access the desired element within this list */ sval.s = ppib->id[innerIndex].body.s;

1 0

git:master:8ed4165f: pv: remove redunant variable definition (warning: unused variable âinnerIndexâ)
by Henning Westerholt 21 Dec '23

21 Dec '23

Module: kamailio Branch: master Commit: 8ed4165fd3b0a331a4580894e2e7f83456b474fa URL: https://github.com/kamailio/kamailio/commit/8ed4165fd3b0a331a4580894e2e7f83… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-12-21T11:23:51Z pv: remove redunant variable definition (warning: unused variable ��innerIndex��) --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/8ed4165fd3b0a331a4580894e2e7f83… Patch: https://github.com/kamailio/kamailio/commit/8ed4165fd3b0a331a4580894e2e7f83… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 4b8f98bcfd3..5375e95c418 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2375,7 +2375,7 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) while(db != NULL) { if(n + db->num_ids > idx) { /* Calculate the index within this specific list */ - int innerIndex = idx - n; + innerIndex = idx - n; /* Access the desired element within this list */ sval.s = db->id[innerIndex].body.s;

1 0

git:master:64e42882: Makefile.groups: add dlgs and sworker to extra modules
by Daniel-Constantin Mierla 20 Dec '23

20 Dec '23

Module: kamailio Branch: master Commit: 64e4288217d4a9dd2441687b56f5dbd02b8549f4 URL: https://github.com/kamailio/kamailio/commit/64e4288217d4a9dd2441687b56f5dbd… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-20T13:07:34+01:00 Makefile.groups: add dlgs and sworker to extra modules --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/64e4288217d4a9dd2441687b56f5dbd… Patch: https://github.com/kamailio/kamailio/commit/64e4288217d4a9dd2441687b56f5dbd… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index bc56672e56d..8d15b198cc3 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -23,7 +23,7 @@ mod_list_extra=avp auth_diameter call_control call_obj dmq domainpolicy msrp \ carrierroute pdb qos sca seas sms sst timer tmrec uac_redirect \ xhttp xhttp_rpc xprint jsonrpcs nosip dmq_usrloc statsd rtjson \ log_custom keepalive ss7ops acc_diameter evrexec \ - sipjson lrkproxy math posops xhttp_prom + sipjson lrkproxy math posops xhttp_prom dlgs sworker # - common modules depending on database mod_list_db=acc alias_db auth_db avpops cfg_db db_text db_flatstore \

1 0

[kamailio/kamailio] Makefile.groups: add dlgs and sworker to extra modules (PR #3684)
by Federico Cabiddu 20 Dec '23

20 Dec '23

#### 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:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Currently dlgs and sworker modules are not packaged. We propose with this PR to add them to the extra modules list. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3684 -- Commit Summary -- * Makefile.groups: add dlgs and sworker to extra modules -- File Changes -- M src/Makefile.groups (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3684.patch https://github.com/kamailio/kamailio/pull/3684.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3684 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3684(a)github.com>

2 2

git:master:9bb1976b: Makefile.groups: removed app_sqlang from modules list
by Daniel-Constantin Mierla 20 Dec '23

20 Dec '23

Module: kamailio Branch: master Commit: 9bb1976b4b7d52542a4de37144194bfc24649222 URL: https://github.com/kamailio/kamailio/commit/9bb1976b4b7d52542a4de37144194bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-20T10:06:59+01:00 Makefile.groups: removed app_sqlang from modules list --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/9bb1976b4b7d52542a4de37144194bf… Patch: https://github.com/kamailio/kamailio/commit/9bb1976b4b7d52542a4de37144194bf… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 48e06e0646c..bc56672e56d 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -22,7 +22,7 @@ mod_list_basic=async auth benchmark blst cfg_rpc cfgutils corex counters \ mod_list_extra=avp auth_diameter call_control call_obj dmq domainpolicy msrp \ carrierroute pdb qos sca seas sms sst timer tmrec uac_redirect \ xhttp xhttp_rpc xprint jsonrpcs nosip dmq_usrloc statsd rtjson \ - log_custom keepalive ss7ops app_sqlang acc_diameter evrexec \ + log_custom keepalive ss7ops acc_diameter evrexec \ sipjson lrkproxy math posops xhttp_prom # - common modules depending on database

1 0

git:master:bab926d0: app_sqlang: module relocated to kamailio-archive repository
by Daniel-Constantin Mierla 20 Dec '23

20 Dec '23

Module: kamailio Branch: master Commit: bab926d0b3eb69b5f15e9a49fdc52c937e164612 URL: https://github.com/kamailio/kamailio/commit/bab926d0b3eb69b5f15e9a49fdc52c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-20T10:04:24+01:00 app_sqlang: module relocated to kamailio-archive repository - module is considered obsolete, not maintained - app_jsdt should be considered a better alternative, or app_lua, app_python3/s - located now at: https://github.com/kamailio/kamailio-archive/tree/main/src/modules/app_sqla… --- Removed: src/modules/app_sqlang/Makefile Removed: src/modules/app_sqlang/README Removed: src/modules/app_sqlang/app_sqlang_api.c Removed: src/modules/app_sqlang/app_sqlang_api.h Removed: src/modules/app_sqlang/app_sqlang_kemi_export.c Removed: src/modules/app_sqlang/app_sqlang_kemi_export.h Removed: src/modules/app_sqlang/app_sqlang_mod.c Removed: src/modules/app_sqlang/doc/Makefile Removed: src/modules/app_sqlang/doc/app_sqlang.xml Removed: src/modules/app_sqlang/doc/app_sqlang_admin.xml Removed: src/modules/app_sqlang/squirrel/include/sqconfig.h Removed: src/modules/app_sqlang/squirrel/include/sqstdaux.h Removed: src/modules/app_sqlang/squirrel/include/sqstdblob.h Removed: src/modules/app_sqlang/squirrel/include/sqstdio.h Removed: src/modules/app_sqlang/squirrel/include/sqstdmath.h Removed: src/modules/app_sqlang/squirrel/include/sqstdstring.h Removed: src/modules/app_sqlang/squirrel/include/sqstdsystem.h Removed: src/modules/app_sqlang/squirrel/include/squirrel.h Removed: src/modules/app_sqlang/squirrel/sqstdlib/Makefile Removed: src/modules/app_sqlang/squirrel/sqstdlib/sqstdaux.cpp Removed: src/modules/app_sqlang/squirrel/sqstdlib/sqstdblob.cpp Removed: src/modules/app_sqlang/squirrel/sqstdlib/sqstdblobimpl.h Removed: src/modules/app_sqlang/squirrel/sqstdlib/sqstdio.cpp Removed: src/modules/app_sqlang/squirrel/sqstdlib/sqstdlib.dsp Removed: src/modules/app_sqlang/squirrel/sqstdlib/sqstdmath.cpp Removed: src/modules/app_sqlang/squirrel/sqstdlib/sqstdrex.cpp Removed: src/modules/app_sqlang/squirrel/sqstdlib/sqstdstream.cpp Removed: src/modules/app_sqlang/squirrel/sqstdlib/sqstdstream.h Removed: src/modules/app_sqlang/squirrel/sqstdlib/sqstdstring.cpp Removed: src/modules/app_sqlang/squirrel/sqstdlib/sqstdsystem.cpp Removed: src/modules/app_sqlang/squirrel/squirrel/Makefile Removed: src/modules/app_sqlang/squirrel/squirrel/sqapi.cpp Removed: src/modules/app_sqlang/squirrel/squirrel/sqarray.h Removed: src/modules/app_sqlang/squirrel/squirrel/sqbaselib.cpp Removed: src/modules/app_sqlang/squirrel/squirrel/sqclass.cpp Removed: src/modules/app_sqlang/squirrel/squirrel/sqclass.h Removed: src/modules/app_sqlang/squirrel/squirrel/sqclosure.h Removed: src/modules/app_sqlang/squirrel/squirrel/sqcompiler.cpp Removed: src/modules/app_sqlang/squirrel/squirrel/sqcompiler.h Removed: src/modules/app_sqlang/squirrel/squirrel/sqdebug.cpp Removed: src/modules/app_sqlang/squirrel/squirrel/sqfuncproto.h Removed: src/modules/app_sqlang/squirrel/squirrel/sqfuncstate.cpp Removed: src/modules/app_sqlang/squirrel/squirrel/sqfuncstate.h Removed: src/modules/app_sqlang/squirrel/squirrel/sqlexer.cpp Removed: src/modules/app_sqlang/squirrel/squirrel/sqlexer.h Removed: src/modules/app_sqlang/squirrel/squirrel/sqmem.cpp Removed: src/modules/app_sqlang/squirrel/squirrel/sqobject.cpp Removed: src/modules/app_sqlang/squirrel/squirrel/sqobject.h Removed: src/modules/app_sqlang/squirrel/squirrel/sqopcodes.h Removed: src/modules/app_sqlang/squirrel/squirrel/sqpcheader.h Removed: src/modules/app_sqlang/squirrel/squirrel/sqstate.cpp Removed: src/modules/app_sqlang/squirrel/squirrel/sqstate.h Removed: src/modules/app_sqlang/squirrel/squirrel/sqstring.h Removed: src/modules/app_sqlang/squirrel/squirrel/sqtable.cpp Removed: src/modules/app_sqlang/squirrel/squirrel/sqtable.h Removed: src/modules/app_sqlang/squirrel/squirrel/squirrel.dsp Removed: src/modules/app_sqlang/squirrel/squirrel/squserdata.h Removed: src/modules/app_sqlang/squirrel/squirrel/squtils.h Removed: src/modules/app_sqlang/squirrel/squirrel/sqvm.cpp Removed: src/modules/app_sqlang/squirrel/squirrel/sqvm.h Removed: src/modules/app_sqlang/utils/app_sqlang_ctl --- Diff: https://github.com/kamailio/kamailio/commit/bab926d0b3eb69b5f15e9a49fdc52c9… Patch: https://github.com/kamailio/kamailio/commit/bab926d0b3eb69b5f15e9a49fdc52c9…

1 0

git:master:943ff442: pipelimit: reformat exported structures
by Daniel-Constantin Mierla 20 Dec '23

20 Dec '23

Module: kamailio Branch: master Commit: 943ff442d85a041ba0285cc494ce0697f4dbae59 URL: https://github.com/kamailio/kamailio/commit/943ff442d85a041ba0285cc494ce069… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-20T09:36:57+01:00 pipelimit: reformat exported structures --- Modified: src/modules/pipelimit/pipelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/943ff442d85a041ba0285cc494ce069… Patch: https://github.com/kamailio/kamailio/commit/943ff442d85a041ba0285cc494ce069…

1 0

git:master:5e1f8e6c: pipelimit: renamed global variable with module prefix
by Daniel-Constantin Mierla 20 Dec '23

20 Dec '23

Module: kamailio Branch: master Commit: 5e1f8e6c93dae914665b2e97b38e8a3a0673d1f2 URL: https://github.com/kamailio/kamailio/commit/5e1f8e6c93dae914665b2e97b38e8a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-20T09:33:17+01:00 pipelimit: renamed global variable with module prefix - avoid overlapping global symbols --- Modified: src/modules/pipelimit/pipelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/5e1f8e6c93dae914665b2e97b38e8a3… Patch: https://github.com/kamailio/kamailio/commit/5e1f8e6c93dae914665b2e97b38e8a3… --- diff --git a/src/modules/pipelimit/pipelimit.c b/src/modules/pipelimit/pipelimit.c index 625da0e50dd..a3412866eb3 100644 --- a/src/modules/pipelimit/pipelimit.c +++ b/src/modules/pipelimit/pipelimit.c @@ -68,7 +68,7 @@ MODULE_VERSION #define PL_TIMER_INTERVAL_DEFAULT 10 /** SL API structure */ -sl_api_t slb; +static sl_api_t _pl_slb; enum { @@ -368,7 +368,7 @@ static int mod_init(void) } /* bind the SL API */ - if(sl_load_api(&slb) != 0) { + if(sl_load_api(&_pl_slb) != 0) { LM_ERR("cannot bind to SL API\n"); return -1; } @@ -479,7 +479,7 @@ static int pl_drop(struct sip_msg *msg, unsigned int low, unsigned int high) LM_DBG("(%d, %d)\n", low, high); - if(slb.freply != 0) { + if(_pl_slb.freply != 0) { if(low != 0 && high != 0) { hdr.s = (char *)pkg_malloc(64); if(hdr.s == 0) { @@ -505,11 +505,11 @@ static int pl_drop(struct sip_msg *msg, unsigned int low, unsigned int high) return 0; } - ret = slb.freply(msg, pl_drop_code, &pl_drop_reason); + ret = _pl_slb.freply(msg, pl_drop_code, &pl_drop_reason); pkg_free(hdr.s); } else { - ret = slb.freply(msg, pl_drop_code, &pl_drop_reason); + ret = _pl_slb.freply(msg, pl_drop_code, &pl_drop_reason); } } else { LM_ERR("Can't send reply\n");

1 0

git:master:17e9e3f4: sipcapture: removed unused global variable
by Daniel-Constantin Mierla 20 Dec '23

20 Dec '23

Module: kamailio Branch: master Commit: 17e9e3f447867e34b8f320b8b93189f01fbc3f77 URL: https://github.com/kamailio/kamailio/commit/17e9e3f447867e34b8f320b8b93189f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-20T09:30:01+01:00 sipcapture: removed unused global variable - renamed local function variable that was conflicting --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/17e9e3f447867e34b8f320b8b93189f… Patch: https://github.com/kamailio/kamailio/commit/17e9e3f447867e34b8f320b8b93189f… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index d39ee1fa7c4..320e351a371 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -298,8 +298,6 @@ static struct sock_filter BPF_code[] = { //str* table_names = NULL; -unsigned int no_tables = 0; - enum e_mt_mode mtmode = mode_random; enum hash_source source = hs_error; @@ -481,12 +479,12 @@ int parse_table_names(str table_name, str **table_names) { char *p = NULL; - unsigned int no_tables; + unsigned int l_no_tables; char *table_name_cpy; int i; /*parse and save table names*/ - no_tables = 1; + l_no_tables = 1; i = 0; str *names; @@ -503,12 +501,12 @@ int parse_table_names(str table_name, str **table_names) while(*p) { if(*p == '|') { - no_tables++; + l_no_tables++; } p++; } - names = (str *)pkg_malloc(sizeof(str) * no_tables); + names = (str *)pkg_malloc(sizeof(str) * l_no_tables); if(names == NULL) { PKG_MEM_ERROR; pkg_free(table_name_cpy); @@ -539,7 +537,7 @@ int parse_table_names(str table_name, str **table_names) *table_names = names; - return no_tables; + return l_no_tables; } /* checks for some missing fields*/

1 0

ERROR: ctl [init_socks.c:114]: init_unix_sock(): ERROR: init_unix_sock: bind: Permission denied [13]
by nguyenquocchinhdev＠gmail.com 19 Dec '23

19 Dec '23

Hi guys, When I ran below the command, an error appeared, how do I fix this? /etc/kamailio$ kamailio -E -e loading modules under config path: /usr/lib/x86_64-linux-gnu/kamailio/modules/ Listening on udp: 192.168.0.158:5090 tcp: 192.168.0.158:5090 tcp: 192.168.0.158:10080 sctp: 192.168.0.158:5090 Aliases: sctp: vizoai1:5090 tcp: vizoai1:10080 tcp: vizoai1:5090 udp: vizoai1:5090 0(564421) INFO: <core> [core/tcp_main.c:4999]: init_tcp(): using epoll_lt as the io watch method (auto detected) 0(564423) INFO: rr [../outbound/api.h:52]: ob_load_api(): unable to import bind_ob - maybe module is not loaded 0(564423) INFO: rr [rr_mod.c:188]: mod_init(): outbound module not available 0(564423) ERROR: ctl [init_socks.c:114]: init_unix_sock(): ERROR: init_unix_sock: bind: Permission denied [13] 0(564423) ERROR: ctl [ctl.c:291]: mod_init(): ERROR: ctl: mod_init: init ctrl. sockets failed 0(564423) ERROR: <core> [core/sr_module.c:945]: init_mod(): Error while initializing module ctl (/usr/lib/x86_64-linux-gnu/kamailio/modules/ctl.so) ERROR: error while initializing modules 0(564423) ERROR: jsonrpcs [jsonrpcs_fifo.c:599]: jsonrpc_fifo_destroy(): FIFO stat failed: Permission denied ============================================= grep loadmodule modules.cfg loadmodule "db_mysql.so" loadmodule "textopsx.so" loadmodule "websocket.so" loadmodule "xhttp.so" loadmodule "kex.so" loadmodule "corex.so" loadmodule "tm.so" loadmodule "tmx.so" loadmodule "sl.so" loadmodule "rr.so" loadmodule "pv.so" loadmodule "maxfwd.so" loadmodule "usrloc.so" loadmodule "registrar.so" loadmodule "textops.so" loadmodule "siputils.so" loadmodule "xlog.so" loadmodule "sanity.so" loadmodule "ctl.so" loadmodule "cfg_rpc.so" loadmodule "sdpops.so" loadmodule "jsonrpcs.so" loadmodule "auth.so" loadmodule "auth_db.so" loadmodule "nathelper.so" loadmodule "rtpengine.so" loadmodule "tls.so" loadmodule "debugger.so" loadmodule "sctp.so"

4 5

git:master:1068bbbf: README.md: remove irc reference
by GitHub 19 Dec '23

19 Dec '23

Module: kamailio Branch: master Commit: 1068bbbf9a7f2bf96d9ee2cefa1b81fbabac9805 URL: https://github.com/kamailio/kamailio/commit/1068bbbf9a7f2bf96d9ee2cefa1b81f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2023-12-19T21:18:03+01:00 README.md: remove irc reference --- Modified: README.md --- Diff: https://github.com/kamailio/kamailio/commit/1068bbbf9a7f2bf96d9ee2cefa1b81f… Patch: https://github.com/kamailio/kamailio/commit/1068bbbf9a7f2bf96d9ee2cefa1b81f… --- diff --git a/README.md b/README.md index a4616f9d66c..d06dd7a7822 100644 --- a/README.md +++ b/README.md @@ -101,13 +101,6 @@ For more information about the mailing lists, please see: * https://www.kamailio.org/w/mailing-lists/ -### IRC Channel - -An open IRC discussion channel is managed by the community: - - * irc server: irc.freenode.net - * irc channel: #kamailio - ### Matrix Channel An open Matrix discussion channel is managed by the community:

1 0

git:master:f036333b: ims_dialog: refactored kemi get/set profile functions
by Daniel-Constantin Mierla 19 Dec '23

19 Dec '23

Module: kamailio Branch: master Commit: f036333b756c1021545e70871024561089954a56 URL: https://github.com/kamailio/kamailio/commit/f036333b756c1021545e70871024561… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-19T10:57:40+01:00 ims_dialog: refactored kemi get/set profile functions - expect final string values in the parameters, not with kamailio-specific variables, they can conflict in the external scripting languages and also leak pkg memory --- Modified: src/modules/ims_dialog/ims_dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/f036333b756c1021545e70871024561… Patch: https://github.com/kamailio/kamailio/commit/f036333b756c1021545e70871024561… --- diff --git a/src/modules/ims_dialog/ims_dialog.c b/src/modules/ims_dialog/ims_dialog.c index 3c0454e5045..16a76a8cbe1 100644 --- a/src/modules/ims_dialog/ims_dialog.c +++ b/src/modules/ims_dialog/ims_dialog.c @@ -1068,7 +1068,6 @@ static int ki_is_known_dlg(sip_msg_t *msg) static int ki_set_dlg_profile(sip_msg_t *msg, str *sprofile, str *svalue) { struct dlg_profile_table *profile = NULL; - pv_elem_t *pvvalue = NULL; if(sprofile == NULL || sprofile->s == NULL || sprofile->len <= 0) { LM_ERR("invalid profile identifier\n"); @@ -1080,14 +1079,18 @@ static int ki_set_dlg_profile(sip_msg_t *msg, str *sprofile, str *svalue) LM_CRIT("profile <%.*s> not defined\n", sprofile->len, sprofile->s); return -1; } - - if(pv_parse_format(svalue, &pvvalue) || pvvalue == NULL) { - LM_ERR("wrong format [%.*s] for value param!\n", svalue->len, - svalue->s); - return -1; + if(svalue != NULL && svalue->len > 0) { + if(set_dlg_profile(msg, svalue, profile) < 0) { + LM_ERR("failed to set profile with value\n"); + return -1; + } + } else { + if(set_dlg_profile(msg, NULL, profile) < 0) { + LM_ERR("failed to set profile\n"); + return -1; + } } - - return w_set_dlg_profile(msg, (char *)profile, (char *)pvvalue); + return 1; } static int ki_get_profile_size( @@ -1095,8 +1098,9 @@ static int ki_get_profile_size( { struct dlg_profile_table *profile = NULL; - pv_elem_t *pvvalue = NULL; pv_spec_t *pvs = NULL; + unsigned int size; + pv_value_t val; if(sprofile == NULL || sprofile->s == NULL || sprofile->len <= 0) { LM_ERR("invalid profile identifier\n"); @@ -1111,11 +1115,6 @@ static int ki_get_profile_size( LM_CRIT("profile <%.*s> not defined\n", sprofile->len, sprofile->s); return -1; } - if(pv_parse_format(svalue, &pvvalue) || pvvalue == NULL) { - LM_ERR("wrong format [%.*s] for value param!\n", svalue->len, - svalue->s); - return -1; - } pvs = pv_cache_get(spv); if(pvs == NULL) { LM_ERR("cannot get pv spec for [%.*s]\n", spv->len, spv->s); @@ -1125,9 +1124,22 @@ static int ki_get_profile_size( LM_ERR("return must be an AVP or SCRIPT VAR!\n"); return -1; } + if(svalue != NULL && svalue->len > 0 && profile->has_value != 0) { + size = get_profile_size(profile, svalue); + } else { + size = get_profile_size(profile, NULL); + } + + memset(&val, 0, sizeof(pv_value_t)); + val.flags = PV_VAL_INT | PV_TYPE_INT; + val.ri = (long)size; + + if(pvs->setf(msg, &pvs->pvp, (int)EQ_T, &val) < 0) { + LM_ERR("setting profile PV failed\n"); + return -1; + } - return w_get_profile_size3( - msg, (char *)profile, (char *)pvvalue, (char *)pvs); + return 1; } /* clang-format off */

1 0

git:master:19152caf: ims_dialog: reformat exported structures
by Daniel-Constantin Mierla 19 Dec '23

19 Dec '23

Module: kamailio Branch: master Commit: 19152caf44360eae533508ecd6f3f9e33af14fb7 URL: https://github.com/kamailio/kamailio/commit/19152caf44360eae533508ecd6f3f9e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-19T10:57:40+01:00 ims_dialog: reformat exported structures --- Modified: src/modules/ims_dialog/ims_dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/19152caf44360eae533508ecd6f3f9e… Patch: https://github.com/kamailio/kamailio/commit/19152caf44360eae533508ecd6f3f9e…

1 0

git:master:19572a82: tm: clearer reply code handling for uac dlg
by Daniel-Constantin Mierla 19 Dec '23

19 Dec '23

Module: kamailio Branch: master Commit: 19572a828ffeb08b190dab5ae4aee93f03d9a7f2 URL: https://github.com/kamailio/kamailio/commit/19572a828ffeb08b190dab5ae4aee93… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-19T10:57:40+01:00 tm: clearer reply code handling for uac dlg --- Modified: src/modules/tm/dlg.c --- Diff: https://github.com/kamailio/kamailio/commit/19572a828ffeb08b190dab5ae4aee93… Patch: https://github.com/kamailio/kamailio/commit/19572a828ffeb08b190dab5ae4aee93… --- diff --git a/src/modules/tm/dlg.c b/src/modules/tm/dlg.c index 420f95a98d2..29b8d50769f 100644 --- a/src/modules/tm/dlg.c +++ b/src/modules/tm/dlg.c @@ -666,7 +666,7 @@ static inline int dlg_new_resp_uac(dlg_t *_d, struct sip_msg *_m) code = _m->first_line.u.reply.statuscode; if(code < 200) { - /* A provisional response, do nothing, we could + /* 100-199: a provisional response, do nothing, we could * update remote tag and route set but we will do that * for a positive final response anyway and I don't want * bet on presence of these fields in provisional responses @@ -674,8 +674,8 @@ static inline int dlg_new_resp_uac(dlg_t *_d, struct sip_msg *_m) * Send a request to jan(a)iptel.org if you need to update * the structures here */ - } else if((code >= 200) && (code < 299)) { - /* A final response, update the structures and transit + } else if(code < 299) { + /* 200-299: a final response, update the structures and transit * into DLG_CONFIRMED */ if(response2dlg(_m, _d) < 0) @@ -687,7 +687,7 @@ static inline int dlg_new_resp_uac(dlg_t *_d, struct sip_msg *_m) return -2; } } else { - /* A negative final response, mark the dialog as destroyed + /* 300-699: a negative final response, mark the dialog as destroyed * Again, I do not update the structures here because it * makes no sense to me, a dialog shouldn't be used after * it is destroyed

1 0

[kamailio/kamailio] github: [skip ci]: bump actions/upload-artifact from 3 to 4 (PR #3681)
by dependabot[bot] 19 Dec '23

19 Dec '23

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/actions/upload-artifact/releases">act… releases</a>.</em></p> <blockquote> <h2>v4.0.0</h2> <h2>What's Changed</h2> <p>The release of upload-artifact@v4 and download-artifact@v4 are major changes to the backend architecture of Artifacts. They have numerous performance and behavioral improvements.</p> <p>For more information, see the <a href="https://github.com/actions/toolkit/tree/main/packages/artifact&q… documentation.</p> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/vmjoseph"><code>@vmjoseph</… made their first contribution in <a href="https://redirect.github.com/actions/upload-artifact/pull/464&quo… </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/upload-artifact/compare/v3...v4.0.0&q… <h2>v3.1.3</h2> <h2>What's Changed</h2> <ul> <li>chore(github): remove trailing whitespaces by <a href="https://github.com/ljmf00"><code>@ljmf00</code… in <a href="https://redirect.github.com/actions/upload-artifact/pull/313&quo… <li>Bump <code>@actions/artifact</code> version to v1.1.2 by <a href="https://github.com/bethanyj28"><code>@bethanyj28&… in <a href="https://redirect.github.com/actions/upload-artifact/pull/436&quo… </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/upload-artifact/compare/v3...v3.1.3&q… <h2>v3.1.2</h2> <ul> <li>Update all <code>@actions/*</code> NPM packages to their latest versions- <a href="https://redirect.github.com/actions/upload-artifact/issues/374&q… <li>Update all dev dependencies to their most recent versions - <a href="https://redirect.github.com/actions/upload-artifact/issues/375&q… </ul> <h2>v3.1.1</h2> <ul> <li>Update actions/core package to latest version to remove <code>set-output</code> deprecation warning <a href="https://redirect.github.com/actions/upload-artifact/issues/351&q… </ul> <h2>v3.1.0</h2> <h2>What's Changed</h2> <ul> <li>Bump <code>@actions/artifact</code> to v1.1.0 (<a href="https://redirect.github.com/actions/upload-artifact/pull/327&quo…) <ul> <li>Adds checksum headers on artifact upload (<a href="https://redirect.github.com/actions/toolkit/pull/1095">a…) (<a href="https://redirect.github.com/actions/toolkit/pull/1063">a… </ul> </li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/actions/upload-artifact/commit/c7d193f32edcb7… Merge pull request <a href="https://redirect.github.com/actions/upload-artifact/issues/466&q… from actions/v4-beta</li> <li><a href="https://github.com/actions/upload-artifact/commit/13131bb095770b… licensed cache</li> <li><a href="https://github.com/actions/upload-artifact/commit/4a6c273b9834f6… Merge branch 'main' into v4-beta</li> <li><a href="https://github.com/actions/upload-artifact/commit/f391bb91a3d311… Merge pull request <a href="https://redirect.github.com/actions/upload-artifact/issues/465&q… from actions/robherley/v4-documentation</li> <li><a href="https://github.com/actions/upload-artifact/commit/9653d03c4b74c3… Apply suggestions from code review</li> <li><a href="https://github.com/actions/upload-artifact/commit/875b63076402f2… add limitations section</li> <li><a href="https://github.com/actions/upload-artifact/commit/ecb21463e93740… add compression example</li> <li><a href="https://github.com/actions/upload-artifact/commit/5e7604f84a0558… trim some repeated info</li> <li><a href="https://github.com/actions/upload-artifact/commit/d6437d07581fe3… naming</li> <li><a href="https://github.com/actions/upload-artifact/commit/1b561557037b49… s/v4-beta/v4/g</li> <li>Additional commits viewable in <a href="https://github.com/actions/upload-artifact/compare/v3...v4"… view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?d… Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3681 -- Commit Summary -- * github: [skip ci]: bump actions/upload-artifact from 3 to 4 -- File Changes -- M .github/workflows/cifuzz.yml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3681.patch https://github.com/kamailio/kamailio/pull/3681.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3681 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3681(a)github.com>

2 1

git:master:68f653bf: github: [skip ci]: bump actions/upload-artifact from 3 to 4
by Victor Seva 19 Dec '23

19 Dec '23

Module: kamailio Branch: master Commit: 68f653bfc66d8f4ff2e11f5fc9348f4d2632fe8b URL: https://github.com/kamailio/kamailio/commit/68f653bfc66d8f4ff2e11f5fc9348f4… Author: dependabot[bot] <49699333+dependabot[bot](a)users.noreply.github.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-19T07:43:10+01:00 github: [skip ci]: bump actions/upload-artifact from 3 to 4 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support(a)github.com> --- Modified: .github/workflows/cifuzz.yml --- Diff: https://github.com/kamailio/kamailio/commit/68f653bfc66d8f4ff2e11f5fc9348f4… Patch: https://github.com/kamailio/kamailio/commit/68f653bfc66d8f4ff2e11f5fc9348f4… --- diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml index bb1b712cb5b..3ee2f6ef37f 100644 --- a/.github/workflows/cifuzz.yml +++ b/.github/workflows/cifuzz.yml @@ -27,7 +27,7 @@ jobs: dry-run: false language: c - name: Upload Crash - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: failure() && steps.build.outcome == 'success' with: name: artifacts

1 0

git:master:b2f1cd6e: github: [skip ci]: bump github/codeql-action from 2 to 3
by Victor Seva 19 Dec '23

19 Dec '23

Module: kamailio Branch: master Commit: b2f1cd6ed2cd5da84fe8ff48db688fc41f129ccb URL: https://github.com/kamailio/kamailio/commit/b2f1cd6ed2cd5da84fe8ff48db688fc… Author: dependabot[bot] <49699333+dependabot[bot](a)users.noreply.github.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-19T07:42:08+01:00 github: [skip ci]: bump github/codeql-action from 2 to 3 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v2...v3) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support(a)github.com> --- Modified: .github/workflows/codeql.yml --- Diff: https://github.com/kamailio/kamailio/commit/b2f1cd6ed2cd5da84fe8ff48db688fc… Patch: https://github.com/kamailio/kamailio/commit/b2f1cd6ed2cd5da84fe8ff48db688fc… --- diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 62fe2dc5c04..aa6d9194b07 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -41,13 +41,13 @@ jobs: run: export PKG_CONFIG_PATH=$RUNNER_TEMP/usr/lib/pkgconfig:$PKG_CONFIG_PATH && echo "PKG_CONFIG_PATH=$PKG_CONFIG_PATH" >> $GITHUB_ENV - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} queries: +security-and-quality - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 if: ${{ matrix.language == 'javascript' || matrix.language == 'python' }} - name: Build cpp @@ -55,6 +55,6 @@ jobs: run: make all - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 with: category: "/language:${{ matrix.language }}"

1 0

[kamailio/kamailio] github: [skip ci]: bump github/codeql-action from 2 to 3 (PR #3680)
by dependabot[bot] 19 Dec '23

19 Dec '23

2 1

git:master:0e5b8178: msilo: remove redundant condition
by Daniel-Constantin Mierla 18 Dec '23

18 Dec '23

Module: kamailio Branch: master Commit: 0e5b8178de281db5ddfe30af28244a1ebaf12382 URL: https://github.com/kamailio/kamailio/commit/0e5b8178de281db5ddfe30af28244a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-18T14:06:49+01:00 msilo: remove redundant condition --- Modified: src/modules/app_lua/app_lua_api.c --- Diff: https://github.com/kamailio/kamailio/commit/0e5b8178de281db5ddfe30af28244a1… Patch: https://github.com/kamailio/kamailio/commit/0e5b8178de281db5ddfe30af28244a1… --- diff --git a/src/modules/app_lua/app_lua_api.c b/src/modules/app_lua/app_lua_api.c index 2be3bdd09cd..78e238437a2 100644 --- a/src/modules/app_lua/app_lua_api.c +++ b/src/modules/app_lua/app_lua_api.c @@ -448,7 +448,7 @@ int lua_sr_reload_script(int pos) lock_set_release(sr_lua_locks, i); } } else { - if(pos >= 0 && pos < len) { + if(pos < len) { lock_set_get(sr_lua_locks, pos); sr_lua_script_ver->version[pos] += 1; lock_set_release(sr_lua_locks, pos);

1 0

event_route names with underscore before the semicolon
by Luca Nardin 18 Dec '23

18 Dec '23

Hello, In the kamailio core cookbook (https://www.kamailio.org/wiki/cookbooks/5.5.x/core#event_route) I read that the name of an event_route should be like this: event_route[groupid:eventid] Where: groupid - should be the name of the module that triggers the event eventid - some meaningful short text describing the event Some modules of kamailio have underscores in the name, for example: http_async_client Years ago a fix have been committed in order to allow underscores in the second part of the name, after the semicolon: https://github.com/kamailio/kamailio/commit/5806703c1ff72243457ff55758f41c3… But it seems that an underscore is still not allowed in the first part of the name: https://github.com/kamailio/kamailio/blob/master/src/core/cfg.lex EVENT_RT_NAME [a-zA-Z][0-9a-zA-Z-]*(":"[a-zA-Z][0-9a-zA-Z_-]*)+ So I wonder if this is a bug in the code or a mistake in the cookbook. Thanks, Luca

1 1

Info: Next Kamailio World Conference - April 18-19, 2024, Berlin, Germany
by Daniel-Constantin Mierla 18 Dec '23

18 Dec '23

Hello, a short announcement to inform that the dates for next Kamailio World Conference have been set to April 18-19, 2024, the event to take place again in Berlin, Germany. It will be a different venue than the past editions, that one not being available. A pre-conference day is considered on April 17, 2024, but it is not yet known in what form and where. The conference is scheduled a bit earlier than the usual in the year because Germany hosts the Euro 2024 football championship during June-July 2024, making May very busy and harder to find adequate conferencing space in Berlin. The website and more details will be published soon. Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy and Development Services Kamailio Advanced Training -- asipto.com

1 0

git:master:2f43510b: pv: removed unnecessary condition
by Daniel-Constantin Mierla 18 Dec '23

18 Dec '23

Module: kamailio Branch: master Commit: 2f43510be37c157f800389dfb432b6c52d7435a7 URL: https://github.com/kamailio/kamailio/commit/2f43510be37c157f800389dfb432b6c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-18T12:31:34+01:00 pv: removed unnecessary condition --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/2f43510be37c157f800389dfb432b6c… Patch: https://github.com/kamailio/kamailio/commit/2f43510be37c157f800389dfb432b6c… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 7eb50ee9a2b..84c3a0c703f 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1439,7 +1439,7 @@ int tr_eval_string( get_cfg_crt_line()); return -1; } - if(n == 0 || m >= val->rs.len) { + if(m >= val->rs.len) { if(val->rs.len > TR_BUFFER_SIZE - 2) { LM_ERR("value too large: %d\n", val->rs.len); return -1;

1 0

git:master:ca2a9479: pv: typo in transformation log message
by Daniel-Constantin Mierla 18 Dec '23

18 Dec '23

Module: kamailio Branch: master Commit: ca2a9479adf720e67bf50c9d2795cc8937e223dc URL: https://github.com/kamailio/kamailio/commit/ca2a9479adf720e67bf50c9d2795cc8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-18T12:22:25+01:00 pv: typo in transformation log message --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/ca2a9479adf720e67bf50c9d2795cc8… Patch: https://github.com/kamailio/kamailio/commit/ca2a9479adf720e67bf50c9d2795cc8… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 3c51be15f74..7eb50ee9a2b 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1406,7 +1406,7 @@ int tr_eval_string( case TR_S_FMTLINES: case TR_S_FMTLINET: if(tp == NULL || tp->next == NULL) { - LM_ERR("substr invalid parameters (cfg line: %d)\n", + LM_ERR("fmtline invalid parameters (cfg line: %d)\n", get_cfg_crt_line()); return -1; }

1 0

git:master:f128db2b: tm: use coherent type int for tm route blocks indexes
by Daniel-Constantin Mierla 18 Dec '23

18 Dec '23

Module: kamailio Branch: master Commit: f128db2b85a525ff82c28faffbeec3203f9560c3 URL: https://github.com/kamailio/kamailio/commit/f128db2b85a525ff82c28faffbeec32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-18T12:16:08+01:00 tm: use coherent type int for tm route blocks indexes --- Modified: src/modules/tm/h_table.h Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/t_reply.h --- Diff: https://github.com/kamailio/kamailio/commit/f128db2b85a525ff82c28faffbeec32… Patch: https://github.com/kamailio/kamailio/commit/f128db2b85a525ff82c28faffbeec32… --- diff --git a/src/modules/tm/h_table.h b/src/modules/tm/h_table.h index 8481ccde29e..d95cb7d717c 100644 --- a/src/modules/tm/h_table.h +++ b/src/modules/tm/h_table.h @@ -225,13 +225,11 @@ typedef struct ua_client */ struct retr_buf *local_ack; /* the route to take if no final positive reply arrived */ - unsigned short on_failure; + int on_failure; /* the route to take for all failure replies */ - unsigned short on_branch_failure; + int on_branch_failure; /* the onreply_route to be processed if registered to do so */ - unsigned short on_reply; - /* unused - keep the structure aligned to 32b */ - unsigned short on_unused; + int on_reply; } tm_ua_client_t; @@ -429,18 +427,18 @@ typedef struct cell /* nr of replied branch; 0..sr_dst_max_branches=branch value, * -1 no reply, -2 local reply */ - short relayed_reply_branch; + int relayed_reply_branch; /* the route to take if no final positive reply arrived */ - unsigned short on_failure; + int on_failure; /* the route to take for all failure replies */ - unsigned short on_branch_failure; + int on_branch_failure; /* the onreply_route to be processed if registered to do so */ - unsigned short on_reply; + int on_reply; /* The route to take for each downstream branch separately */ - unsigned short on_branch; + int on_branch; /* branch route backup for late branch add (t_append_branch) */ - unsigned short on_branch_delayed; + int on_branch_delayed; /* place holder for MD5checksum, MD5_LEN bytes are extra alloc'ed */ char md5[0]; diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index e9b9df434a5..c5a58bba8ab 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -224,17 +224,17 @@ void t_on_reply(unsigned int go_to) } -unsigned int get_on_failure() +int get_on_failure() { return goto_on_failure; } -unsigned int get_on_branch_failure() +int get_on_branch_failure() { return goto_on_branch_failure; } -unsigned int get_on_reply() +int get_on_reply() { return goto_on_reply; } diff --git a/src/modules/tm/t_reply.h b/src/modules/tm/t_reply.h index 709b70454ed..18ce47f457c 100644 --- a/src/modules/tm/t_reply.h +++ b/src/modules/tm/t_reply.h @@ -199,11 +199,11 @@ void on_failure_reply( replies arrive */ void t_on_failure(unsigned int go_to); -unsigned int get_on_failure(void); +int get_on_failure(void); void t_on_branch_failure(unsigned int go_to); -unsigned int get_on_branch_failure(void); +int get_on_branch_failure(void); void t_on_reply(unsigned int go_to); -unsigned int get_on_reply(void); +int get_on_reply(void); int t_retransmit_reply(struct cell *t);

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev