sr-dev February 2025

sr-dev@lists.kamailio.org

9 participants
163 discussions

git:master:79120639: db2_ops: avoid local variable hides global variable
by Victor Seva 19 Feb '25

19 Feb '25

Module: kamailio Branch: master Commit: 79120639521f61d2b95a3be5f0faf8018afbd91c URL: https://github.com/kamailio/kamailio/commit/79120639521f61d2b95a3be5f0faf80… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-02-19T19:17:38+01:00 db2_ops: avoid local variable hides global variable --- Modified: src/modules/db2_ops/db2_ops.c --- Diff: https://github.com/kamailio/kamailio/commit/79120639521f61d2b95a3be5f0faf80… Patch: https://github.com/kamailio/kamailio/commit/79120639521f61d2b95a3be5f0faf80…

1 0

git:master:c626bef1: p_usrloc: avoid local variable hides global variable
by Victor Seva 19 Feb '25

19 Feb '25

Module: kamailio Branch: master Commit: c626bef15034fd6ff2e3eb3388ff0d73bf1557c4 URL: https://github.com/kamailio/kamailio/commit/c626bef15034fd6ff2e3eb3388ff0d7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-02-19T18:53:58+01:00 p_usrloc: avoid local variable hides global variable --- Modified: src/modules/p_usrloc/ul_db_failover.c --- Diff: https://github.com/kamailio/kamailio/commit/c626bef15034fd6ff2e3eb3388ff0d7… Patch: https://github.com/kamailio/kamailio/commit/c626bef15034fd6ff2e3eb3388ff0d7… --- diff --git a/src/modules/p_usrloc/ul_db_failover.c b/src/modules/p_usrloc/ul_db_failover.c index 715fdb7d742..0d1e97dcf82 100644 --- a/src/modules/p_usrloc/ul_db_failover.c +++ b/src/modules/p_usrloc/ul_db_failover.c @@ -111,7 +111,7 @@ static int ul_db_failover_get_spare(db_func_t *dbf, db1_con_t *dbh, ul_db_t *db) db1_res_t *res = NULL; db_row_t *row; int query_len; - str tmp; + str str_tmp; if(!dbf || !dbh || !db) { LM_ERR("Null pointer as parameter.\n"); @@ -151,10 +151,10 @@ static int ul_db_failover_get_spare(db_func_t *dbf, db1_con_t *dbh, ul_db_t *db) LM_ERR("could not print query\n"); return -1; } - tmp.s = query; - tmp.len = strlen(query); + str_tmp.s = query; + str_tmp.len = strlen(query); - if(dbf->raw_query(dbh, &tmp, &res) < 0) { + if(dbf->raw_query(dbh, &str_tmp, &res) < 0) { LM_ERR("could not query database.\n"); return -1; }

1 0

git:master:1c302265: pv_headers: avoid local variable hides global variable
by Victor Seva 19 Feb '25

19 Feb '25

Module: kamailio Branch: master Commit: 1c302265c0fbf2083741fdbabfab8b922a00b8bc URL: https://github.com/kamailio/kamailio/commit/1c302265c0fbf2083741fdbabfab8b9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-02-19T18:51:35+01:00 pv_headers: avoid local variable hides global variable --- Modified: src/modules/pv_headers/pv_headers.c --- Diff: https://github.com/kamailio/kamailio/commit/1c302265c0fbf2083741fdbabfab8b9… Patch: https://github.com/kamailio/kamailio/commit/1c302265c0fbf2083741fdbabfab8b9… --- diff --git a/src/modules/pv_headers/pv_headers.c b/src/modules/pv_headers/pv_headers.c index 5aa0af1ecc0..190bc7abc96 100644 --- a/src/modules/pv_headers/pv_headers.c +++ b/src/modules/pv_headers/pv_headers.c @@ -292,7 +292,7 @@ static int w_pvh_remove_header_param(struct sip_msg *msg, char *p1, char *p2) } /* clang-format off */ -static cmd_export_t cmds[] = { +static cmd_export_t mod_cmds[] = { {"pvh_collect_headers", (cmd_function)w_pvh_collect_headers, 0, 0, 0, ANY_ROUTE}, {"pvh_apply_headers", (cmd_function)w_pvh_apply_headers, 0, 0, 0, @@ -348,7 +348,7 @@ static pv_export_t mod_pvs[] = { {{0, 0}, 0, 0, 0, 0, 0, 0, 0} }; -static param_export_t params[] = { +static param_export_t mod_params[] = { {"xavi_name", PARAM_STR, &_pvh_params.xavi_name}, {"header_value_size", PARAM_INT, &_pvh_params.hdr_value_size}, {"header_collect_flag", PARAM_INT, &_pvh_params.flags[PVH_HDRS_COLLECTED]}, @@ -360,16 +360,16 @@ static param_export_t params[] = { }; struct module_exports exports = { - MODULE_NAME, /* module name */ + MODULE_NAME, /* module name */ DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* RPC method exports */ - mod_pvs, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - 0, /* per-child init function */ - mod_destroy /* module destroy function */ + mod_cmds, /* exported functions */ + mod_params, /* exported parameters */ + 0, /* RPC method exports */ + mod_pvs, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + 0, /* per-child init function */ + mod_destroy /* module destroy function */ }; /* clang-format on */

1 0

git:master:4963f0af: sipcapture: avoid local variable hides global variable
by Victor Seva 19 Feb '25

19 Feb '25

Module: kamailio Branch: master Commit: 4963f0af2f27e3e5164f54ec9b5c8713e911f1db URL: https://github.com/kamailio/kamailio/commit/4963f0af2f27e3e5164f54ec9b5c871… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-02-19T18:49:06+01:00 sipcapture: avoid local variable hides global variable --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/4963f0af2f27e3e5164f54ec9b5c871… Patch: https://github.com/kamailio/kamailio/commit/4963f0af2f27e3e5164f54ec9b5c871… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 9eae71e0a24..29459313222 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -314,7 +314,7 @@ struct hep_timeinfo *heptime = NULL; /*! \brief * Exported functions */ -static cmd_export_t cmds[] = { +static cmd_export_t mod_cmds[] = { {"sip_capture", (cmd_function)w_sip_capture0, 0, 0, 0, ANY_ROUTE}, {"sip_capture", (cmd_function)w_sip_capture1, 1, @@ -343,7 +343,7 @@ static pv_export_t mod_pvs[] = { /*! \brief * Exported parameters */ -static param_export_t params[] = { +static param_export_t mod_params[] = { {"db_url", PARAM_STR, &db_url}, {"table_name", PARAM_STR, &_sipcap_table_name}, {"hash_source", PARAM_STR, &hash_source}, @@ -435,8 +435,8 @@ stat_export_t *sipcapture_stats = NULL; struct module_exports exports = { "sipcapture", /* module name */ DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ + mod_cmds, /* exported functions */ + mod_params, /* exported parameters */ 0, /* exported rpc functions */ mod_pvs, /* exported pseudo-variables */ 0, /* response handling function */

1 0

git:master:b38fbe7a: xhttp_rpc: avoid local variable hides global variable
by Victor Seva 19 Feb '25

19 Feb '25

Module: kamailio Branch: master Commit: b38fbe7ab4988f916ed0dd4156c732e615980150 URL: https://github.com/kamailio/kamailio/commit/b38fbe7ab4988f916ed0dd4156c732e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-02-19T18:47:40+01:00 xhttp_rpc: avoid local variable hides global variable --- Modified: src/modules/xhttp_rpc/xhttp_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/b38fbe7ab4988f916ed0dd4156c732e… Patch: https://github.com/kamailio/kamailio/commit/b38fbe7ab4988f916ed0dd4156c732e… --- diff --git a/src/modules/xhttp_rpc/xhttp_rpc.c b/src/modules/xhttp_rpc/xhttp_rpc.c index 00465046f2d..b9c62763168 100644 --- a/src/modules/xhttp_rpc/xhttp_rpc.c +++ b/src/modules/xhttp_rpc/xhttp_rpc.c @@ -88,12 +88,12 @@ int buf_size = 0; char error_buf[ERROR_REASON_BUF_LEN]; /* clang-format off */ -static cmd_export_t cmds[] = { +static cmd_export_t mod_cmds[] = { {"dispatch_xhttp_rpc", (cmd_function)xhttp_rpc_dispatch, 0, 0, 0, REQUEST_ROUTE | EVENT_ROUTE}, {0, 0, 0, 0, 0, 0} }; -static param_export_t params[] = { +static param_export_t mod_params[] = { {"xhttp_rpc_root", PARAM_STR, &xhttp_rpc_root}, {"xhttp_rpc_buf_size", PARAM_INT, &buf_size}, {0, 0, 0} @@ -103,8 +103,8 @@ static param_export_t params[] = { struct module_exports exports = { "xhttp_rpc", /* module name */ DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd (cfg function) exports */ - params, /* param exports */ + mod_cmds, /* cmd (cfg function) exports */ + mod_params, /* param exports */ 0, /* RPC method exports */ 0, /* pv exports */ 0, /* response handling function */

1 0

git:master:288010b9: mediaproxy: avoid local variable hides global variable
by Victor Seva 19 Feb '25

19 Feb '25

Module: kamailio Branch: master Commit: 288010b92cd86e2210c079cbd00bf11536e0b0cb URL: https://github.com/kamailio/kamailio/commit/288010b92cd86e2210c079cbd00bf11… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-02-19T18:46:28+01:00 mediaproxy: avoid local variable hides global variable --- Modified: src/modules/mediaproxy/mediaproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/288010b92cd86e2210c079cbd00bf11… Patch: https://github.com/kamailio/kamailio/commit/288010b92cd86e2210c079cbd00bf11… --- diff --git a/src/modules/mediaproxy/mediaproxy.c b/src/modules/mediaproxy/mediaproxy.c index 0ef21a955b4..58bbe8fffec 100644 --- a/src/modules/mediaproxy/mediaproxy.c +++ b/src/modules/mediaproxy/mediaproxy.c @@ -220,7 +220,7 @@ static AVP_Param media_relay_avp = {str_init(MEDIA_RELAY_AVP_SPEC), {0}, 0}; static AVP_Param ice_candidate_avp = {str_init(ICE_CANDIDATE_AVP_SPEC), {0}, 0}; /* clang-format off */ -static cmd_export_t cmds[] = { +static cmd_export_t mod_cmds[] = { {"engage_media_proxy", (cmd_function)w_EngageMediaProxy, 0, 0, 0, REQUEST_ROUTE | BRANCH_ROUTE}, {"use_media_proxy", (cmd_function)w_UseMediaProxy, 0, @@ -231,7 +231,7 @@ static cmd_export_t cmds[] = { {0, 0, 0, 0, 0, 0} }; -static param_export_t params[] = { +static param_export_t mod_params[] = { {"disable", PARAM_INT, &mediaproxy_disabled}, {"mediaproxy_socket", PARAM_STRING, &(mediaproxy_socket.name)}, {"mediaproxy_timeout", PARAM_INT, &(mediaproxy_socket.timeout)}, @@ -245,8 +245,8 @@ static param_export_t params[] = { struct module_exports exports = { "mediaproxy", /* module name */ DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ + mod_cmds, /* exported functions */ + mod_params, /* exported parameters */ 0, /* RPC method exports */ 0, /* exported pseudo-variables */ 0, /* response handling function */

1 0

[kamailio/kamailio] cmake: switching deb rules (Issue #4053)
by Victor Seva 19 Feb '25

19 Feb '25

Opening this generic issue to track issues when trying to switch deb package generation to cmake: -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4053 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4053(a)github.com>

4 52

Build failed in Jenkins: kamailiodev-nightly-binaries » amd64,bullseye #2933
by kamailio＠sipwise.com 19 Feb '25

19 Feb '25

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> Changes: ------------------------------------------ [...truncated 66.79 KiB...] I: new cache content 'libmaxminddb0_1.5.2-1_amd64.deb' added I: new cache content 'ruby_1%3a2.7+2_amd64.deb' added I: new cache content 'sgml-data_2.0.11+nmu1_all.deb' added I: new cache content 'autopoint_0.21-4_all.deb' added I: new cache content 'libncurses6_6.2+20201114-2+deb11u2_amd64.deb' added I: new cache content 'libjson-c-dev_0.15-2+deb11u1_amd64.deb' added I: new cache content 'ruby-net-telnet_0.1.1-2_all.deb' added I: new cache content 'python3-dev_3.9.2-3_amd64.deb' added I: new cache content 'libprotobuf-dev_3.12.4-1+deb11u1_amd64.deb' added I: new cache content 'libpsl5_0.21.0-1.2_amd64.deb' added I: new cache content 'libphonenumber8_8.12.16-4_amd64.deb' added I: new cache content 'libjs-jquery_3.5.1+dfsg+~3.5.5-7_all.deb' added I: new cache content 'libsecsipid1_1.1.1~git20210601.d388d64-1+b2_amd64.deb' added I: new cache content 'icu-devtools_67.1-7_amd64.deb' added I: new cache content 'libboost-system1.74-dev_1.74.0-9_amd64.deb' added I: new cache content 'libelf1_0.183-1_amd64.deb' added I: new cache content 'libpython3.9-stdlib_3.9.2-1+deb11u2_amd64.deb' added I: new cache content 'libevent-core-2.1-7_2.1.12-stable-1_amd64.deb' added I: new cache content 'libmnl0_1.0.4-3_amd64.deb' added I: new cache content 'libjs-underscore_1.9.1~dfsg-3_all.deb' added I: new cache content 'libreadline-dev_8.1-1_amd64.deb' added I: new cache content 'ruby-dev_1%3a2.7+2_amd64.deb' added I: new cache content 'libradcli4_1.2.11-1+b2_amd64.deb' added I: new cache content 'pkg-config_0.29.2-1_amd64.deb' added I: new cache content 'libpython2.7_2.7.18-8+deb11u1_amd64.deb' added I: new cache content 'libsigsegv2_2.13-1_amd64.deb' added I: new cache content 'm4_1.4.18-5_amd64.deb' added I: new cache content 'libmongoc-dev_1.17.6-1_amd64.deb' added I: new cache content 'librabbitmq-dev_0.10.0-1_amd64.deb' added I: new cache content 'libsqlite3-dev_3.34.1-3+deb11u1_amd64.deb' added I: new cache content 'python3-lib2to3_3.9.2-1_all.deb' added I: new cache content 'libreadline8_8.1-1_amd64.deb' added I: new cache content 'python2_2.7.18-3_amd64.deb' added I: new cache content 'default-libmysqlclient-dev_1.0.7_amd64.deb' added I: new cache content 'librdkafka-dev_1.6.0-1_amd64.deb' added I: new cache content 'libuv1-dev_1.40.0-2+deb11u1_amd64.deb' added I: new cache content 'libprotobuf23_3.12.4-1+deb11u1_amd64.deb' added I: new cache content 'libjs-sphinxdoc_3.4.3-2_all.deb' added I: new cache content 'libboost-atomic1.74.0_1.74.0-9_amd64.deb' added I: new cache content 'libpython3-dev_3.9.2-3_amd64.deb' added I: new cache content 'docbook-xml_4.5-9_all.deb' added I: new cache content 'ruby-power-assert_1.1.7-2_all.deb' added I: new cache content 'libjansson4_2.13.1-1.1_amd64.deb' added I: new cache content 'libudev-dev_247.3-7+deb11u6_amd64.deb' added I: new cache content 'libpython3.9-minimal_3.9.2-1+deb11u2_amd64.deb' added I: new cache content 'libedit2_3.1-20191231-2+b1_amd64.deb' added I: new cache content 'libpci3_1%3a3.7.0-5_amd64.deb' added I: new cache content 'automake_1%3a1.16.3-2_all.deb' added I: new cache content 'flex_2.6.4-8_amd64.deb' added I: new cache content 'libdebhelper-perl_13.3.4_all.deb' added I: new cache content 'libldap2-dev_2.4.57+dfsg-3+deb11u1_amd64.deb' added I: new cache content 'libsub-override-perl_0.09-2_all.deb' added I: new cache content 'librabbitmq4_0.10.0-1_amd64.deb' added I: new cache content 'libmemcached11_1.0.18-4.2_amd64.deb' added I: new cache content 'libsnappy-dev_1.1.8-1_amd64.deb' added I: new cache content 'libgnutls28-dev_3.7.1-5+deb11u6_amd64.deb' added I: new cache content 'python3.9-minimal_3.9.2-1+deb11u2_amd64.deb' added I: new cache content 'libpq5_13.19-0+deb11u1_amd64.deb' added I: new cache content 'libxml2-dev_2.9.10+dfsg-6.7+deb11u5_amd64.deb' added I: new cache content 'libpcre2-posix2_10.36-2+deb11u1_amd64.deb' added I: new cache content 'python-is-python2_2.7.18-9_all.deb' added I: new cache content 'libmariadb-dev-compat_1%3a10.5.26-0+deb11u2_amd64.deb' added I: new cache content 'odbcinst1debian2_2.3.6-0.1+b1_amd64.deb' added I: new cache content 'libbson-dev_1.17.6-1_amd64.deb' added I: new cache content 'libjansson-dev_2.13.1-1.1_amd64.deb' added I: new cache content 'libgmpxx4ldbl_2%3a6.2.1+dfsg-1+deb11u1_amd64.deb' added I: new cache content 'libsnmp-dev_5.9+dfsg-4+deb11u1_amd64.deb' added I: new cache content 'libmongocrypt0_1.1.0-1_amd64.deb' added I: new cache content 'libboost-serialization1.74-dev_1.74.0-9_amd64.deb' added I: new cache content 'libzstd-dev_1.4.8+dfsg-2.1_amd64.deb' added I: new cache content 'libsnmp40_5.9+dfsg-4+deb11u1_amd64.deb' added I: new cache content 'libsctp-dev_1.0.18+dfsg-1_amd64.deb' added I: new cache content 'libhashkit-dev_1.0.18-4.2_amd64.deb' added I: new cache content 'libcap-dev_1%3a2.44-1_amd64.deb' added I: new cache content 'libboost-date-time1.74.0_1.74.0-9_amd64.deb' added I: new cache content 'xml-core_0.18+nmu1_all.deb' added I: new cache content 'ruby2.7-dev_2.7.4-1+deb11u4_amd64.deb' added I: new cache content 'libmpdec3_2.5.1-1_amd64.deb' added I: new cache content 'libsasl2-2_2.1.27+dfsg-2.1+deb11u1_amd64.deb' added I: new cache content 'libboost-system1.74.0_1.74.0-9_amd64.deb' added I: new cache content 'libperl-dev_5.32.1-4+deb11u4_amd64.deb' added I: new cache content 'ruby-rubygems_3.2.5-2_all.deb' added I: new cache content 'ruby2.7_2.7.4-1+deb11u4_amd64.deb' added I: new cache content 'libevent-extra-2.1-7_2.1.12-stable-1_amd64.deb' added I: new cache content 'ruby-minitest_5.13.0-1_all.deb' added I: new cache content 'libwrap0-dev_7.6.q-31_amd64.deb' added I: new cache content 'libexpat1_2.2.10-2+deb11u6_amd64.deb' added I: new cache content 'libruby2.7_2.7.4-1+deb11u4_amd64.deb' added I: new cache content 'python2-dev_2.7.18-3_amd64.deb' added I: new cache content 'libboost-date-time1.74-dev_1.74.0-9_amd64.deb' added I: new cache content 'librdkafka++1_1.6.0-1_amd64.deb' added I: new cache content 'bsdextrautils_2.36.1-8+deb11u2_amd64.deb' added I: new cache content 'libmongocrypt-dev_1.1.0-1_amd64.deb' added I: new cache content 'python3-distutils_3.9.2-1_all.deb' added I: new cache content 'mariadb-common_1%3a10.5.26-0+deb11u2_all.deb' added I: new cache content 'libcurl4_7.74.0-1.3+deb11u14_amd64.deb' added I: new cache content 'libyaml-0-2_0.2.2-1_amd64.deb' added I: new cache content 'libgnutls-openssl27_3.7.1-5+deb11u6_amd64.deb' added I: new cache content 'libpython2.7-dev_2.7.18-8+deb11u1_amd64.deb' added I: new cache content 'rake_13.0.3-1_all.deb' added I: new cache content 'libunbound8_1.13.1-1+deb11u4_amd64.deb' added I: new cache content 'libboost-thread-dev_1.74.0.3_amd64.deb' added I: new cache content 'erlang-base_1%3a23.2.6+dfsg-1+deb11u1_amd64.deb' added I: new cache content 'libprocps8_2%3a3.3.17-5_amd64.deb' added I: new cache content 'libtool_2.4.6-15_all.deb' added I: new cache content 'python2.7_2.7.18-8+deb11u1_amd64.deb' added I: new cache content 'debhelper_13.3.4_all.deb' added I: new cache content 'libarchive-zip-perl_1.68-1_all.deb' added I: new cache content 'libnetsnmptrapd40_5.9+dfsg-4+deb11u1_amd64.deb' added I: new cache content 'libcap2_1%3a2.44-1_amd64.deb' added I: new cache content 'libwebsockets-dev_4.0.20-2_amd64.deb' added I: new cache content 'libunistring-dev_0.9.10-4_amd64.deb' added I: new cache content 'bison_2%3a3.7.5+dfsg-1_amd64.deb' added I: new cache content 'libevent-dev_2.1.12-stable-1_amd64.deb' added I: new cache content 'libpcre2-32-0_10.36-2+deb11u1_amd64.deb' added I: new cache content 'libmagic1_1%3a5.39-3+deb11u1_amd64.deb' added I: new cache content 'libwebsockets16_4.0.20-2_amd64.deb' added I: new cache content 'libphonenumber-dev_8.12.16-4_amd64.deb' added I: new cache content 'libdb5.3-dev_5.3.28+dfsg1-0.8_amd64.deb' added I: new cache content 'libprotobuf-lite23_3.12.4-1+deb11u1_amd64.deb' added I: new cache content 'libevent-openssl-2.1-7_2.1.12-stable-1_amd64.deb' added I: new cache content 'libsasl2-dev_2.1.27+dfsg-2.1+deb11u1_amd64.deb' added I: new cache content 'libdb-dev_5.3.1+nmu1_amd64.deb' added I: new cache content 'python3.9_3.9.2-1+deb11u2_amd64.deb' added I: new cache content 'liblua5.1-0_5.1.5-8.1+b3_amd64.deb' added I: new cache content 'libpq-dev_13.19-0+deb11u1_amd64.deb' added I: new cache content 'libhiredis-dev_0.14.1-1_amd64.deb' added I: new cache content 'libsctp1_1.0.18+dfsg-1_amd64.deb' added I: new cache content 'libmaxminddb-dev_1.5.2-1_amd64.deb' added I: new cache content 'python2-minimal_2.7.18-3_amd64.deb' added I: new cache content 'libbrotli1_1.0.9-2+b2_amd64.deb' added I: new cache content 'libnghttp2-14_1.43.0-1+deb11u2_amd64.deb' added I: new cache content 'libssl-dev_1.1.1w-0+deb11u2_amd64.deb' added I: new cache content 'libhashkit2_1.0.18-4.2_amd64.deb' added I: new cache content 'libsensors-dev_1%3a3.6.0-7_amd64.deb' added I: new cache content 'libidn2-dev_2.3.0-5_amd64.deb' added I: new cache content 'man-db_2.9.4-2_amd64.deb' added I: new cache content 'media-types_4.0.0_all.deb' added I: new cache content 'libboost-chrono1.74-dev_1.74.0-9_amd64.deb' added I: new cache content 'po-debconf_1.0.21+nmu1_all.deb' added I: new cache content 'mailcap_3.69_all.deb' added I: new cache content 'libpython2.7-minimal_2.7.18-8+deb11u1_amd64.deb' added I: new cache content 'libboost-thread1.74.0_1.74.0-9_amd64.deb' added I: new cache content 'dh-autoreconf_20_all.deb' added I: new cache content 'openssl_1.1.1w-0+deb11u2_amd64.deb' added I: new cache content 'libboost1.74-dev_1.74.0-9_amd64.deb' added I: new cache content 'libboost-serialization1.74.0_1.74.0-9_amd64.deb' added I: new cache content 'libmosquitto-dev_2.0.11-1+deb11u1_amd64.deb' added I: new cache content 'groff-base_1.22.4-6_amd64.deb' added I: new cache content 'libsecsipid-dev_1.1.1~git20210601.d388d64-1+b2_amd64.deb' added I: new cache content 'libexpat1-dev_2.2.10-2+deb11u6_amd64.deb' added I: new cache content 'uuid-dev_2.36.1-8+deb11u2_amd64.deb' added I: new cache content 'unixodbc-dev_2.3.6-0.1+b1_amd64.deb' added I: new cache content 'libuchardet0_0.0.7-1_amd64.deb' added I: new cache content 'libsasl2-modules-db_2.1.27+dfsg-2.1+deb11u1_amd64.deb' added I: new cache content 'ca-certificates_20210119_all.deb' added I: new cache content 'libuv1_1.40.0-2+deb11u1_amd64.deb' added I: new cache content 'python3-minimal_3.9.2-3_amd64.deb' added I: new cache content 'python3.9-dev_3.9.2-1+deb11u2_amd64.deb' added I: new cache content 'pci.ids_0.0~2021.02.08-1_all.deb' added I: new cache content 'libgnutlsxx28_3.7.1-5+deb11u6_amd64.deb' added I: new cache content 'libpcre2-dev_10.36-2+deb11u1_amd64.deb' added I: new cache content 'libgnutls-dane0_3.7.1-5+deb11u6_amd64.deb' added I: new cache content 'xsltproc_1.1.34-4+deb11u1_amd64.deb' added I: new cache content 'libev-dev_1%3a4.33-1_amd64.deb' added I: new cache content 'libjson-c5_0.15-2+deb11u1_amd64.deb' added I: new cache content 'libmariadb3_1%3a10.5.26-0+deb11u2_amd64.deb' added I: new cache content 'libsensors-config_1%3a3.6.0-7_all.deb' added I: new cache content 'gettext-base_0.21-4_amd64.deb' added I: new cache content 'libncurses-dev_6.2+20201114-2+deb11u2_amd64.deb' added I: new cache content 'ruby-xmlrpc_0.3.0-2_all.deb' added I: new cache content 'autoconf_2.69-14_all.deb' added I: new cache content 'libboost-chrono1.74.0_1.74.0-9_amd64.deb' added I: new cache content 'libbson-1.0-0_1.17.6-1_amd64.deb' added I: new cache content 'mysql-common_5.8+1.0.7_all.deb' added I: new cache content 'libgeocoding8_8.12.16-4_amd64.deb' added I: new cache content 'libevent-2.1-7_2.1.12-stable-1_amd64.deb' added I: new cache content 'python2.7-dev_2.7.18-8+deb11u1_amd64.deb' added I: new cache content 'mime-support_3.66_all.deb' added I: new cache content 'libpython2.7-stdlib_2.7.18-8+deb11u1_amd64.deb' added I: new cache content 'python3_3.9.2-3_amd64.deb' added I: new cache content 'libpython2-dev_2.7.18-3_amd64.deb' added I: new cache content 'libev4_1%3a4.33-1_amd64.deb' added I: new cache content 'odbcinst_2.3.6-0.1+b1_amd64.deb' added I: new cache content 'libmicrohttpd12_0.9.72-2+deb11u1_amd64.deb' added I: new cache content 'libtasn1-6-dev_4.16.0-2+deb11u1_amd64.deb' added I: new cache content 'libmnl-dev_1.0.4-3_amd64.deb' added I: new cache content 'libpython3.9_3.9.2-1+deb11u2_amd64.deb' added I: new cache content 'libglib2.0-0_2.66.8-1+deb11u5_amd64.deb' added I: new cache content 'libmariadb-dev_1%3a10.5.26-0+deb11u2_amd64.deb' added I: new cache content 'file_1%3a5.39-3+deb11u1_amd64.deb' added I: new cache content 'libcurl4-openssl-dev_7.74.0-1.3+deb11u14_amd64.deb' added I: new cache content 'libmd0_1.0.3-3_amd64.deb' added I: new cache content 'erlang-dev_1%3a23.2.6+dfsg-1+deb11u1_amd64.deb' added I: new cache content 'libmemcached-dev_1.0.18-4.2_amd64.deb' added I: new cache content 'dh-strip-nondeterminism_1.12.0-1_all.deb' added I: new cache content 'libsnmp-base_5.9+dfsg-4+deb11u1_all.deb' added I: new cache content 'libmicrohttpd-dev_0.9.72-2+deb11u1_amd64.deb' added I: new cache content 'libfile-stripnondeterminism-perl_1.12.0-1_all.deb' added I: new cache content 'rubygems-integration_1.18_all.deb' added I: new cache content 'libhiredis0.14_0.14.1-1_amd64.deb' added I: new cache content 'libsnappy1v5_1.1.8-1_amd64.deb' added I: new cache content 'libpipeline1_1.5.3-1_amd64.deb' added I: new cache content 'libradcli-dev_1.2.11-1+b2_amd64.deb' added I: new cache content 'libicu-dev_67.1-7_amd64.deb' added I: new cache content 'libpci-dev_1%3a3.7.0-5_amd64.deb' added I: new cache content 'libxml2_2.9.10+dfsg-6.7+deb11u5_amd64.deb' added I: new cache content 'python2.7-minimal_2.7.18-8+deb11u1_amd64.deb' added I: new cache content 'librtmp1_2.4+20151223.gitfa8646d.1-2+b2_amd64.deb' added I: unmounting /tmp/apt-jdg_Mt6Msm filesystem I: unmounting dev/ptmx filesystem I: unmounting dev/pts filesystem I: unmounting dev/shm filesystem I: unmounting proc filesystem I: unmounting sys filesystem I: Cleaning COW directory I: forking: rm -rf /var/cache/pbuilder/build/cow.12930 + '[' 1 -eq 0 ']' + bailout 1 'Error: Failed to build with cowbuilder.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to build with cowbuilder.' ']' + echo 'Error: Failed to build with cowbuilder.' Error: Failed to build with cowbuilder. + rm -f /run/lock/bullseye-amd64.building.12581 + '[' -r /run/lock/bullseye-amd64.update.12581 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. *** + rm -f '<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…'> + '[' -n /tmp/tmp.3ntB8yvrJj ']' + rm -rf /tmp/tmp.3ntB8yvrJj + '[' -n /tmp/apt-jdg_Mt6Msm ']' + sudo rm -rf /tmp/apt-jdg_Mt6Msm + '[' -n 364 ']' ++ sed -e 's/^\([0-9]*\).*/\1/' + SECONDS=15 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Tue Feb 18 01:04:22 UTC 2025 [running 15 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Tue Feb 18 01:04:22 UTC 2025 [running 15 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts TAP Reports Processing: START Looking for TAP results report in workspace using pattern: report/*.tap Did not find any matching files. Recording test results ERROR: Step ‘Publish JUnit test result report’ failed: No test report files were found. Configuration error? Recording fingerprints

1 1

[kamailio/kamailio] Suggestions on changing behavior of '--loadmodule' and '--modparam' command line options (Issue #4126)
by Maksim Nesterov 18 Feb '25

18 Feb '25

### Description I am trying to configure some "default" settings in Kamailio that would be independent of the configuration file. The command-line options `--loadmodule` and `--modparam` seemed to be exactly what I was looking for. However, I noticed that these options are processed **before** the configuration file is loaded. As a result, the `--modparam` option cannot be used separately, because the module for the specified parameter has not yet been loaded: ``` # kamailio -E -DD --modparam=corex:alias_subdomains:s:kamailio.org 0(653) ERROR: <core> [core/modparam.c:199]: set_mod_param_regex(): No module matching <corex> found 0(653) ERROR: <core> [main.c:2584]: main(): failed to set modparam: corex:alias_subdomains:s:kamailio.org ``` To address this, the module needs to be loaded first using the `--loadmodule` option. However, this causes an error if the same module is also loaded in the configuration file: ``` # kamailio -E -DD --loadmodule=corex --modparam=corex:alias_subdomains:s:kamailio.org 0(654) WARNING: <core> [core/sr_module.c:611]: ksr_load_module(): attempting to load the same module twice (/usr/lib/x86_64-linux-gnu/kamailio/modules/corex.so) 0(654) CRITICAL: <core> [core/cfg.y:4014]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 283, column 12-21: failed to load module ``` ### Possible Solutions Would it be possible to move the processing of these command-line options **after** the configuration file is loaded? And could the `--loadmodule` option ignore loading a module if it has already been loaded via the configuration file? Another potential solution could be introducing new options, such as `--loadmodule-after` and `--modparam-after`, to specify parameters that should only be applied once the configuration file has been loaded. What do you think about these suggestions? ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.8.4 (x86_64/linux) ``` * **Operating System**: ``` Linux 010a217cd09a 6.12.10-orbstack-00297-gf8f6e015b993 #42 SMP Sun Jan 19 03:00:07 UTC 2025 x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4126 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4126(a)github.com>

2 3

git:master:914b154a: core: added option 'o' for loadmodule
by Daniel-Constantin Mierla 18 Feb '25

18 Feb '25

Module: kamailio Branch: master Commit: 914b154a9096f2c17a4aa362f54358e10c2cce76 URL: https://github.com/kamailio/kamailio/commit/914b154a9096f2c17a4aa362f54358e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-18T15:49:51+01:00 core: added option 'o' for loadmodule - do not error and exit when a module is already loaded - GH #4126 --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/914b154a9096f2c17a4aa362f54358e… Patch: https://github.com/kamailio/kamailio/commit/914b154a9096f2c17a4aa362f54358e… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index f19a2d3812b..a2e28acf030 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -567,6 +567,7 @@ int ksr_load_module(char *mod_path, char *opts) module_exports_t *exp; struct sr_module *t; int dlflags; + int ldopt; int new_dlflags; int retries; char *path = NULL; @@ -592,11 +593,14 @@ int ksr_load_module(char *mod_path, char *opts) retries = 2; dlflags = RTLD_NOW; + ldopt = 0; if(opts != NULL) { for(p = opts; *p != '\0'; p++) { if(*p == 'G' || *p == 'g') { dlflags |= RTLD_GLOBAL; + } else if(*p == 'O' || *p == 'o') { + ldopt = 1; } else { LM_INFO("unknown option: %c\n", *p); } @@ -612,6 +616,13 @@ int ksr_load_module(char *mod_path, char *opts) for(t = modules; t; t = t->next) { if(t->handle == handle) { + if(ldopt == 1) { + if(path && path != mod_path) { + pkg_free(path); + } + LM_DBG("skip loading optional module twice (%s)\n", path); + return 0; + } LM_WARN("attempting to load the same module twice (%s)\n", path); goto skip; }

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
17
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2025