- sr-dev - kamailio.org

[kamailio/kamailio] nathelper: Add modparam to not send ping to Path (PR #4152)
by Stefan Mititelu 21 Feb '25

21 Feb '25

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  OPTIONS ping is always sent to Path uri, if contact has it set. Add option to ignore this and still send OPTIONS to contact. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4152 -- Commit Summary -- * nathelper: Add modparam to not send ping to Path -- File Changes -- M src/modules/nathelper/doc/nathelper_admin.xml (20) M src/modules/nathelper/nathelper.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4152.patch https://github.com/kamailio/kamailio/pull/4152.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4152 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4152(a)github.com>

2 2

git:master:31c807aa: nathelper: Add modparam to not send ping to Path
by Daniel-Constantin Mierla 21 Feb '25

21 Feb '25

Module: kamailio Branch: master Commit: 31c807aaf20dc4c85ed9f1b0d91340b430d60d41 URL: https://github.com/kamailio/kamailio/commit/31c807aaf20dc4c85ed9f1b0d91340b… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-21T08:39:26+01:00 nathelper: Add modparam to not send ping to Path --- Modified: src/modules/nathelper/doc/nathelper_admin.xml Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/31c807aaf20dc4c85ed9f1b0d91340b… Patch: https://github.com/kamailio/kamailio/commit/31c807aaf20dc4c85ed9f1b0d91340b… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index c8b14caea54..9f3e19eed87 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -428,6 +428,26 @@ modparam("nathelper", "udpping_from_path", 1) </programlisting> </example> </section> + <section id="nathelper.p.ignore_path"> + <title><varname>ignore_path</varname> (int)</title> + <para> + Enable ignore of Path header address when sending UDP pings (keepalives). + </para> + <para> + <emphasis> + Default value is <quote>0</quote> (feature disabled). + UDP pings are sent to Path header if header is present. + </emphasis> + </para> + <example> + <title>Set <varname>ignore_path</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("nathelper", "ignore_path", 1) +... + </programlisting> + </example> + </section> <section id="nathelper.p.append_sdp_oldmediaip"> <title><varname>append_sdp_oldmediaip</varname> (int)</title> <para> diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index ec543079f31..b3335960fbd 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -193,6 +193,7 @@ static avp_name_t rcv_avp_name; static char *natping_socket = NULL; static int udpping_from_path = 0; +static int ignore_path = 0; static int sdp_oldmediaip = 1; static int raw_sock = -1; static unsigned int raw_ip = 0; @@ -277,6 +278,7 @@ static param_export_t params[] = { {"natping_socket", PARAM_STRING, &natping_socket }, {"keepalive_timeout", PARAM_INT, &nh_keepalive_timeout }, {"udpping_from_path", PARAM_INT, &udpping_from_path }, + {"ignore_path", PARAM_INT, &ignore_path}, {"append_sdp_oldmediaip", PARAM_INT, &sdp_oldmediaip }, {"filter_server_id", PARAM_INT, &nh_filter_srvid }, {"nat_addr_mode", PARAM_INT, &nh_nat_addr_mode }, @@ -2387,7 +2389,7 @@ static void nh_timer(unsigned int ticks, void *timer_idx) dst_uri = &c; /* determine the destination */ - if(path.len && (flags & sipping_flag) != 0) { + if(path.len && (flags & sipping_flag) != 0 && !ignore_path) { /* send to first URI in path */ if(get_path_dst_uri(&path, &opt) < 0) { LM_ERR("failed to get dst_uri for Path\n"); @@ -2398,7 +2400,7 @@ static void nh_timer(unsigned int ticks, void *timer_idx) LM_ERR("can't parse contact dst_uri\n"); continue; } - } else if(path.len && udpping_from_path) { + } else if(path.len && udpping_from_path && !ignore_path) { path_ip_str = extract_last_path_ip(path); if(path_ip_str == NULL) { LM_ERR("unable to parse path from location\n");

1 0

[kamailio/kamailio] TM module memory leak of BYE transction (Issue #4140)
by Stefan Mititelu 20 Feb '25

20 Feb '25

### Description BYE transactions keept increasing and were never freed. #### Reproduction 1. Compile kamailio 5.8.5 and run it under no traffic, with default config 2. Connect 1 WSS client 3. Send INVITE with "Session-Expires" header from WSS client -> kamailio -> PBX (e.g. asterisk) 4. Wait for WSS client to refresh session in re-INVITE with another "Session-Expires" 5. Force kill WSS client and wait 6. PBX (asterisk) will send BYE to end session 7. kamailio replies "477 Unfortunately error on sending to next hop occurred (477/SL)" 8. kamcmd tm.list | grep BYE -> will see that transaction there is never freed #### Debugging Data + Log Messages ``` DEBUG: tm [h_table.c:415]: build_cell(): created new cell 0x7f673e2552d0 INFO: <script>: [pdn60n9cob1j3j0doi36] MANAGE_BRANCH: New branch [0] to ....., BYE WARNING: tm [../../core/forward.h:217]: msg_send_buffer(): TCP/TLS connection for WebSocket could not be found DEBUG: tm [t_fwd.c:1566]: t_send_branch(): send to 169.132.91.64:1702 (5) failed WARNING: tm [t_fwd.c:1586]: t_send_branch(): sending request on branch 0 failed DEBUG: tm [t_funcs.c:358]: t_relay_to(): t_forward_nonack returned error -1 (-477) DEBUG: tm [t_funcs.c:376]: t_relay_to(): -477 error reply generation delayed DEBUG: sl [sl_funcs.c:564]: sl_run_callbacks(): execute callback for event type 1 ERROR: sl [sl_funcs.c:428]: sl_reply_error(): stateless error reply used: Unfortunately error on sending to next hop occurred (477/SL) DEBUG: dialog [dlg_hash.c:780]: dlg_lookup_mode(): ref dlg 0x7f673e5dbae0 with 1 -> 2 DEBUG: dialog [dlg_hash.c:784]: dlg_lookup_mode(): dialog id=6986 found on entry 2734 DEBUG: dialog [dlg_hash.c:1088]: dlg_unref_helper(): unref op on 0x7f673e5dbae0 with 1 from dlg_hash.c:1106 DEBUG: dialog [dlg_hash.c:1092]: dlg_unref_helper(): unref dlg 0x7f673e5dbae0 with 1 -> 1 ``` #### SIP Traffic  ``` ![Image](https://github.com/user-attachments/assets/abc99b7a-9830-4928-81c3-3aa02bb8acbe) ``` ### Possible Solutions Tracked this down to this "#ifdef" that is defined inside the C file itself: https://github.com/kamailio/kamailio/blob/master/src/modules/tm/t_funcs.c#L… Solution 1: remove all the code related to TM_DELAYED_REPLY since it is anyway local to t_funcs.c file Solution 2: t_release_transaction(t); /* kill it silently */ in case of TM_DELAYED_REPLY too ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` all up to latest one ``` * **Operating System**:  ``` not relevant ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4140 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4140(a)github.com>

2 4

git:master:ccf33100: acc: avoid local variable hides global variable
by Victor Seva 19 Feb '25

19 Feb '25

Module: kamailio Branch: master Commit: ccf33100c1eba5dcd9494f1558ff03703fb8e7bf URL: https://github.com/kamailio/kamailio/commit/ccf33100c1eba5dcd9494f1558ff037… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-02-19T19:26:10+01:00 acc: avoid local variable hides global variable --- Modified: src/modules/acc/acc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ccf33100c1eba5dcd9494f1558ff037… Patch: https://github.com/kamailio/kamailio/commit/ccf33100c1eba5dcd9494f1558ff037… --- diff --git a/src/modules/acc/acc_mod.c b/src/modules/acc/acc_mod.c index 7000d003f83..41710ad0d18 100644 --- a/src/modules/acc/acc_mod.c +++ b/src/modules/acc/acc_mod.c @@ -335,7 +335,7 @@ static int free_acc_fixup(void **param, int param_no) /************************** INTERFACE functions ****************************/ -static int parse_failed_filter(char *s, unsigned short *failed_filter) +static int parse_failed_filter(char *s, unsigned short *_failed_filter) { unsigned int n; char *at; @@ -354,16 +354,16 @@ static int parse_failed_filter(char *s, unsigned short *failed_filter) LM_ERR("response code in failed_filter must have 3 digits\n"); return 0; } - failed_filter[n] = + _failed_filter[n] = (*s - '0') * 100 + (*(s + 1) - '0') * 10 + (*(s + 2) - '0'); - if(failed_filter[n] < 300) { + if(_failed_filter[n] < 300) { LM_ERR("invalid response code %u in failed_filter\n", - failed_filter[n]); + _failed_filter[n]); return 0; } - LM_DBG("failed_filter %u = %u\n", n, failed_filter[n]); + LM_DBG("failed_filter %u = %u\n", n, _failed_filter[n]); n++; - failed_filter[n] = 0; + _failed_filter[n] = 0; s = at; if(*s == 0) return 1;

1 0

git:master:b019dbc5: db_cfg: avoid local variable hides global variable
by Victor Seva 19 Feb '25

19 Feb '25

Module: kamailio Branch: master Commit: b019dbc5dc88a58a50a3d272a30e6a1aa3b174c0 URL: https://github.com/kamailio/kamailio/commit/b019dbc5dc88a58a50a3d272a30e6a1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-02-19T19:22:52+01:00 db_cfg: avoid local variable hides global variable --- Modified: src/modules/cfg_db/cfg_db.c --- Diff: https://github.com/kamailio/kamailio/commit/b019dbc5dc88a58a50a3d272a30e6a1… Patch: https://github.com/kamailio/kamailio/commit/b019dbc5dc88a58a50a3d272a30e6a1… --- diff --git a/src/modules/cfg_db/cfg_db.c b/src/modules/cfg_db/cfg_db.c index 840417da7f7..d307d0e6963 100644 --- a/src/modules/cfg_db/cfg_db.c +++ b/src/modules/cfg_db/cfg_db.c @@ -405,30 +405,35 @@ static int mod_init(void) return 0; } +/* clang-format off */ /* * Exported parameters */ -static param_export_t params[] = {{"db_url", PARAM_STRING, &db_url}, - {"transl_tbl", PARAM_STRING, &transl_tbl}, - /* {"transl_group_name_fld", PARAM_STRING, &transl_group_name_fld}, +static param_export_t mod_params[] = { + {"db_url", PARAM_STRING, &db_url}, + {"transl_tbl", PARAM_STRING, &transl_tbl}, +/* + {"transl_group_name_fld", PARAM_STRING, &transl_group_name_fld}, {"transl_cfg_table_fld", PARAM_STRING, &transl_cfg_table_fld}, {"transl_cfg_table_group_name_field_fld", PARAM_STRING, &transl_cfg_table_group_name_field_fld}, {"transl_cfg_table_name_field_fld", PARAM_STRING, &transl_cfg_table_name_field_fld}, {"transl_cfg_table_value_field_fld", PARAM_STRING, &transl_cfg_table_value_field_fld}, */ - {"custom_tbl", PARAM_STRING, &custom_tbl}, - - {0, 0, 0}}; + {"custom_tbl", PARAM_STRING, &custom_tbl}, + {0, 0, 0} +}; /* Module interface */ struct module_exports exports = { - MODULE_NAME, DEFAULT_DLFLAGS, /* dlopen flags */ - 0, /* Exported functions */ - params, /* Exported parameters */ - 0, /* RPC methods */ - 0, /* exported pseudo-variables */ - 0, /* response function */ - mod_init, /* module initialization function */ - 0, /* child initialization function */ - 0 /* destroy function */ + MODULE_NAME, + DEFAULT_DLFLAGS, /* dlopen flags */ + 0, /* Exported functions */ + mod_params, /* Exported parameters */ + 0, /* RPC methods */ + 0, /* exported pseudo-variables */ + 0, /* response function */ + mod_init, /* module initialization function */ + 0, /* child initialization function */ + 0 /* destroy function */ }; +/* clang-format on */

1 0

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

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

[kamailio/kamailio] kamcmd command doesn't allow the same arguments from one-liner call or from kamcmd console (Issue #4137)
by jflem1eux 18 Feb '25

18 Feb '25

Hello, I discovered that kamcmd command doesn't allow the same argument for a rpc command if I call a one-liner command or from the kamcmd console. it's related to ul.add command If I call this command from bash: kamcmd ul.add location 222(a)domain.com sip:222@tbd.domain.com:5088;transport=udp 0 -1.0 . 0 2240 5023 . udp:8.12.6.7:5060 the command will fail with 2 errors: error: 500 - Not enough parameters or wrong format -bash: 0: command not found I discovered if I remove ;transport=udp I get rid of the errors and I get new one: Unknown option `-1'. And if I set my Q value from -1.0 to 0.0 the command works BUT If I go into the kamcmd console and I ask the exact original command, it works and I can see in usrloc database that it accepted my Q value to -1.0 and the transport=udp string I tried to use s: to force some argument as string but it doesn't works , may be I don't use correctly I tried unsuccessfully: kamcmd ul.add location 298(a)domain.com s:sip:298@tbd.domain.com:5088;transport=udp 0 s:-1.0 . 0 2240 5023 . udp:8.12.6.7:5060 --> I use kamailio version kamailio 5.7.1 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 10.2.1 kamcmd has been built from the same source code with the rest of the program Built on debian 11 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4137 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4137(a)github.com>

2 2

Info: maintenance work for kamailio.org server on Tuesday, Feb 18, 2025
by Daniel-Constantin Mierla 18 Feb '25

18 Feb '25

Hello, there is a planned mainenance work on the infrastructure for the server hosting kamailio.org services (among them: the main website, wiki, mailing lists) on next week, Tuesday, February 18, 2025, to start about 10:00am Berlin time (CET). Expect some intervals of unavailability, we hope they will be short and most of them not noticeable for the majority accessing these services during the day. Once the work is finished, an announcement will be sent out. The apt repository, github project and the matrix chat channels should not be affected, they can be accessed as usual and can be used a backup communication channels if anyone observes something that has to be addressed. Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com Kamailio Advanced Training, March 24-28, 2025 -- asipto.com Kamailio World Conference, May 12-13, 2025, Berlin -- kamailioworld.com

1 2

git:master:3f139624: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 18 Feb '25

18 Feb '25

Module: kamailio Branch: master Commit: 3f13962412ea0aa266f289d2fa88cdd716be6306 URL: https://github.com/kamailio/kamailio/commit/3f13962412ea0aa266f289d2fa88cdd… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-02-18T13:31:10+01:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/3f13962412ea0aa266f289d2fa88cdd… Patch: https://github.com/kamailio/kamailio/commit/3f13962412ea0aa266f289d2fa88cdd…

1 0

git:master:6a7c8c23: etc/kamailio.cfg: use send_reply_error() instead of sl_reply_error()
by Daniel-Constantin Mierla 18 Feb '25

18 Feb '25

Module: kamailio Branch: master Commit: 6a7c8c232132078b97bd3023efaed30f369cfe63 URL: https://github.com/kamailio/kamailio/commit/6a7c8c232132078b97bd3023efaed30… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-18T13:21:25+01:00 etc/kamailio.cfg: use send_reply_error() instead of sl_reply_error() --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/6a7c8c232132078b97bd3023efaed30… Patch: https://github.com/kamailio/kamailio/commit/6a7c8c232132078b97bd3023efaed30… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index a06e09fdc77..a46f5734bfc 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -634,7 +634,7 @@ route[RELAY] { } if (!t_relay()) { - sl_reply_error(); + send_reply_error(); } exit; } @@ -742,7 +742,7 @@ route[REGISTRAR] { #!endif } if (!save("location")) { - sl_reply_error(); + send_reply_error(); } exit; } @@ -808,7 +808,7 @@ route[PRESENCE] { msg_apply_changes(); #!endif if (!t_newtran()) { - sl_reply_error(); + send_reply_error(); exit; }

1 0

git:master:357766ba: tm: docs for delayed_reply param
by Daniel-Constantin Mierla 18 Feb '25

18 Feb '25

Module: kamailio Branch: master Commit: 357766ba470401845b3ec2222e6fc11031823ee3 URL: https://github.com/kamailio/kamailio/commit/357766ba470401845b3ec2222e6fc11… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-18T13:20:48+01:00 tm: docs for delayed_reply param --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/357766ba470401845b3ec2222e6fc11… Patch: https://github.com/kamailio/kamailio/commit/357766ba470401845b3ec2222e6fc11… --- diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index ad1f55e2061..1dd77f1df3f 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -1740,5 +1740,26 @@ modparam("tm", "reply_408_reason", "Gone") </example> </section> + <section id="tm.p.rdelayed_reply"> + <title><varname>delayed_reply</varname> (int)</title> + <para> + If set to 1, the reply generation in case of request + processing/forwarding error is delayed till the config script + execution ends. This allows the script writer to send its + own error reply. If set to 0, the transaction is replied and killed + immediately. + </para> + <emphasis> + Default value is <quote>1</quote>. + </emphasis> + <example> + <title>delayed_reply example</title> + <programlisting> +... +modparam("tm", "delayed_reply", 0) +.... + </programlisting> + </example> + </section> </section>

1 0

git:master:a705e601: tm: made TM_DELAYED_REPLY modparam delayed_reply
by Daniel-Constantin Mierla 18 Feb '25

18 Feb '25

Module: kamailio Branch: master Commit: a705e601d9924118ed6d79b21e92fd2af0267a05 URL: https://github.com/kamailio/kamailio/commit/a705e601d9924118ed6d79b21e92fd2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-18T13:14:16+01:00 tm: made TM_DELAYED_REPLY modparam delayed_reply - GH #4140 --- Modified: src/modules/tm/t_funcs.c Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/a705e601d9924118ed6d79b21e92fd2… Patch: https://github.com/kamailio/kamailio/commit/a705e601d9924118ed6d79b21e92fd2… --- diff --git a/src/modules/tm/t_funcs.c b/src/modules/tm/t_funcs.c index 55510742b39..dd14f83a15c 100644 --- a/src/modules/tm/t_funcs.c +++ b/src/modules/tm/t_funcs.c @@ -43,7 +43,7 @@ /* if defined t_relay* error reply generation will be delayed till script * end (this allows the script writer to send its own error reply) */ -#define TM_DELAYED_REPLY +extern int _tm_delayed_reply; #ifdef USE_DNS_FAILOVER extern int **failover_reply_codes; @@ -232,9 +232,7 @@ int t_relay_to( unsigned short port; str host; short comp; -#ifndef TM_DELAYED_REPLY int reply_ret; -#endif ret = 0; @@ -354,26 +352,25 @@ int t_relay_to( ret = -4; goto done; } -#ifdef TM_DELAYED_REPLY - /* current error in tm_error */ - tm_error = ser_error; - set_kr(REQ_ERR_DELAYED); - LM_DBG("%d error reply generation delayed \n", ser_error); -#else - - reply_ret = kill_transaction(t, ser_error); - if(reply_ret > 0) { - /* we have taken care of all -- do nothing in - script */ - LM_DBG("generation of a stateful reply " - "on error succeeded\n"); - /*ret=0; -- we don't want to stop the script */ + if(_tm_delayed_reply != 0) { + /* current error in tm_error */ + tm_error = ser_error; + set_kr(REQ_ERR_DELAYED); + LM_DBG("%d error reply generation delayed \n", ser_error); } else { - LM_DBG("generation of a stateful reply " - "on error failed\n"); - t_release_transaction(t); + reply_ret = kill_transaction(t, ser_error); + if(reply_ret > 0) { + /* we have taken care of all -- do nothing in + script */ + LM_DBG("generation of a stateful reply " + "on error succeeded\n"); + /*ret=0; -- we don't want to stop the script */ + } else { + LM_DBG("generation of a stateful reply " + "on error failed\n"); + t_release_transaction(t); + } } -#endif /* TM_DELAYED_REPLY */ } else { t_release_transaction(t); /* kill it silently */ } diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index b10200dab4e..d6f7423b3c1 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -229,6 +229,7 @@ int tm_remap_503_500 = 1; str _tm_event_callback_lres_sent = {NULL, 0}; int _tm_reply_408_code = 408; str _tm_reply_408_reason = str_init("Request Timeout"); +int _tm_delayed_reply = 1; #ifdef USE_DNS_FAILOVER str failover_reply_codes_str = {NULL, 0}; @@ -528,6 +529,7 @@ static param_export_t params[] = { #endif {"reply_408_code", PARAM_INT, &_tm_reply_408_code}, {"reply_408_reason", PARAM_STR, &_tm_reply_408_reason}, + {"delayed_reply", PARAM_INT, &_tm_delayed_reply}, {0, 0, 0} };

1 0

[kamailio/kamailio] Enhance TOPOH and TOPOS Modules to Mask IPs in Request-URI and From/To Headers (Issue #4148)
by Farzaneh Soltanzadeh 18 Feb '25

18 Feb '25

Fr-Soltanzadeh created an issue (kamailio/kamailio#4148)  ### Description  Kamailio's topoh and topos modules currently hide/strip certain SIP headers but do not mask IP addresses in the From, To, and Request-URI headers. This feature request proposes extending these modules to hide or replace IP addresses for improved privacy and security. ### Expected behavior When enabled, Kamailio should replace IPs in: From header To header Request-URI This should work without breaking SIP message integrity or routing. #### Actual observed behavior Currently, IP addresses in these headers remain visible, exposing topology information(172.16.100.88 in this example). ``` Request-Line: INVITE sip:9121001111@172.16.100.88 SIP/2.0 Message Header Record-Route: <sip:10.14.17.83:5060;r2=on;lr;did=24f.c2e1> Record-Route: <sip:127.0.0.8;line=sr-erOb.UMbIUMBIUMZIUpA.Z1TwVXL.rlT.rHP8mBTyxnLnAjOaG**> Record-Route: <sip:127.0.0.8;line=sr-erOb.UMbIUMBIUMZIUpB.UNbyUuEeU1X7r5E741E8xODwd1B8Y5TyUN*> Record-Route: <sip:127.0.0.8;line=sr-erOb.UMbIUMBIUMZIUpB.Z1TwVXL.rlT.rHP8mBTyxnLaUn3> Record-Route: <sip:127.0.0.8;line=sr-erOb.UMbIUMBIUMZIUpT.UNbyUuEeU1X7r5E741E8xODwd1B8YfUaAul> Record-Route: <sip:127.0.0.8;line=sr-erOb.UMbIUMBIUMZIUpT.UNbyUMEo4jt7Cyb7ZjBw-HceA9TaU3s7U9ceU9DhVGXaUHRIRaAamM*> Record-Route: <sip:127.0.0.8;line=sr-erOb.UMbIUMBIUMZIUp5.UNbyUMEo4jt7Cyb7ZjBw-HceA9TaU3s7U9ceU9DhVGXaUHRIUyU8UM*> Record-Route: <sip:127.0.0.8;line=sr-erOb.UMZaY5lyY5lamuL.mpEeU1X7r5E741E8xODwd1B8Y5Anrnl> Via: SIP/2.0/UDP 10.14.17.83:5060;branch=z9hG4bKa514.f0b2dd496995e05c455b7c66f29e298a.0 Via: SIP/2.0/UDP 127.0.0.8;branch=z9hG4bKsr-NBOGIA1LaFXkHKupaduLadGLadeL.mGvyduram9TexXTomB3amnb.3H1wVHPoU9YeRKLnrpXzUO2HAHYSrM3adGLamyDaADZaUKt8m8UyAKUyUN5amGB8UKOarKDaAnBamnLau** Via: SIP/2.0/UDP 127.0.0.8;branch=z9hG4bKsr-NBOGIA1LaFXkHKupaduLadGLadeL.m1vyduram9TexXTomB3amnb.rjTnVfUhm3v.Vt4yxjIndNlyFfY8mpfnUnT8daf8VjYaU6D.xkO8m6R8der8dyUaAnZaS5b.rDXab** Via: SIP/2.0/UDP 127.0.0.8;branch=z9hG4bKsr-NBOGIA1LaFXNdKapaduLadGLadeL.mpvydurad9TexXTomBram1Z.m9YeRKLnrpXzUO2HAHYSrM3adGL8x8OyUeb.mD58mMZ8mjtnVNZax8R8dyU8dpByRNryVNLau** Via: SIP/2.0/UDP 127.0.0.8;branch=z9hG4bKsr-NBOGIA1LaFXkHKupadDTIUMr.F5TaF55ym2raUMB.d9T8VyOh-8O8mBl.d1Ladn5IU1bIUpB.Zjb7ZjBwdnTadGf.rjTnVfUhm3v.Vt4yxjINxPUad6OydaTnrNryrNBadyD.mabyrHtameZaVNbnAjYab** Max-Forwards: 66 From: <sip:9122001003@172.16.100.88>;tag=973f3044c163413fb5e7075113f96a7b To: <sip:9121001111@172.16.100.88> Contact: <sip:127.0.0.8;line=sr-erOb.UDlaU1bamMbamyuadDTIUMr.F5TaF55ym2raUMB.d9snp**> Call-ID: !!:yrnlaAtYadHOnRyRymjOydpT.d1faVKUymkRamalnAu* CSeq: 9661 INVITE Allow: PRACK, INVITE, ACK, BYE, CANCEL, UPDATE, INFO, SUBSCRIBE, NOTIFY, REFER, MESSAGE, OPTIONS Supported: replaces, 100rel, timer, norefersub Session-Expires: 1800 Min-SE: 90 User-Agent: MicroSIP/3.21.5 Content-Type: application/sdp Content-Length: 338 Message Body ``` #### Debugging Data ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  * Introduce a new configuration parameter in topoh and topos that enables masking or encoding of IP addresses in From, To, and Request-URI. * Ensure proper handling of subsequent SIP messages like ACK, BYE, and re-INVITE to maintain end-to-end communication. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio 6.0.0 ``` * **Operating System**:  ``` uname ubuntu:22.04 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4148 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4148(a)github.com>

2 2

[kamailio/kamailio] kafka: Fix mod_destroy() crash (PR #4147)
by Stefan Mititelu 17 Feb '25

17 Feb '25

A crash happened on mod_destroy() due to librdkafka thrd_join(), in case of multiple restarts, in case of ssl kafka connection. Init kafka only for timer and routing processes. Add checks for rk pointer.   #### 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:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4147 -- Commit Summary -- * kafka: Fix mod_destroy() crash -- File Changes -- M src/modules/kafka/kafka_mod.c (9) M src/modules/kafka/kfk.c (95) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4147.patch https://github.com/kamailio/kamailio/pull/4147.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4147 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4147(a)github.com>

2 4

git:master:10012eeb: kafka: Fix mod_destroy() crash
by Victor Seva 17 Feb '25

17 Feb '25

Module: kamailio Branch: master Commit: 10012eeb17210ea7eb9549dc71be5af7e92b4a97 URL: https://github.com/kamailio/kamailio/commit/10012eeb17210ea7eb9549dc71be5af… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-02-17T16:20:41+01:00 kafka: Fix mod_destroy() crash A crash happened on mod_destroy() due to librdkafka thrd_join(), in case of multiple restarts, in case of ssl kafka connection. Init kafka only for timer and routing processes. Add checks for rk pointer. --- Modified: src/modules/kafka/kafka_mod.c Modified: src/modules/kafka/kfk.c --- Diff: https://github.com/kamailio/kamailio/commit/10012eeb17210ea7eb9549dc71be5af… Patch: https://github.com/kamailio/kamailio/commit/10012eeb17210ea7eb9549dc71be5af…

1 0

git:master:5d3ae2ac: dialog: set keepalive local cseq value to 0
by Daniel-Constantin Mierla 16 Feb '25

16 Feb '25

Module: kamailio Branch: master Commit: 5d3ae2acfab38eda88c6369c0db18a286faba2e3 URL: https://github.com/kamailio/kamailio/commit/5d3ae2acfab38eda88c6369c0db18a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-16T12:06:57+01:00 dialog: set keepalive local cseq value to 0 --- Modified: src/modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/5d3ae2acfab38eda88c6369c0db18a2… Patch: https://github.com/kamailio/kamailio/commit/5d3ae2acfab38eda88c6369c0db18a2… --- diff --git a/src/modules/dialog/dlg_req_within.c b/src/modules/dialog/dlg_req_within.c index 25dbae3a54c..62b6aea1a9c 100644 --- a/src/modules/dialog/dlg_req_within.c +++ b/src/modules/dialog/dlg_req_within.c @@ -787,7 +787,7 @@ int dlg_send_ka(dlg_cell_t *dlg, int dir) if(di->loc_seq.value > 1) di->loc_seq.value -= 2; else - di->loc_seq.value -= 1; + di->loc_seq.value = 0; LM_DBG("sending OPTIONS to %s\n", (dir == DLG_CALLER_LEG) ? "caller" : "callee");

1 0

git:master:413c9020: core: socket info - print index values in error message for overflow
by Daniel-Constantin Mierla 16 Feb '25

16 Feb '25

Module: kamailio Branch: master Commit: 413c90202975886f4dfcb579a1157a19c3065341 URL: https://github.com/kamailio/kamailio/commit/413c90202975886f4dfcb579a1157a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-16T10:36:57+01:00 core: socket info - print index values in error message for overflow --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/413c90202975886f4dfcb579a1157a1… Patch: https://github.com/kamailio/kamailio/commit/413c90202975886f4dfcb579a1157a1… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 4fd44fec2dc..dac3f08a6e6 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1453,22 +1453,22 @@ static int get_flags(int family) } while(1) { - if(sizeof(buf) <= nll) { - LM_ERR("netlink buffer overflow in get_flags"); - goto error; - } rtn = recv(nl_sock, p, sizeof(buf) - nll, 0); if(rtn <= 0) { LM_ERR("failed to receive data (%d/%d)\n", rtn, errno); goto error; } + if(nll >= sizeof(buf) - rtn) { + LM_ERR("netlink buffer overflow [%u/%d]\n", nll, rtn); + goto error; + } nlp = (struct nlmsghdr *)p; if(nlp->nlmsg_type == NLMSG_DONE) { LM_DBG("done\n"); break; } if(nlp->nlmsg_type == NLMSG_ERROR) { - LM_DBG("Error on message to netlink"); + LM_DBG("error on message to netlink"); break; } p += rtn;

1 0

git:master:6b7af1be: registrar: remove unnecessary condition
by Daniel-Constantin Mierla 16 Feb '25

16 Feb '25

Module: kamailio Branch: master Commit: 6b7af1beb7fdaaec1b5d069fdfff3e3af5ca43ca URL: https://github.com/kamailio/kamailio/commit/6b7af1beb7fdaaec1b5d069fdfff3e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-16T10:23:18+01:00 registrar: remove unnecessary condition --- Modified: src/modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/6b7af1beb7fdaaec1b5d069fdfff3e3… Patch: https://github.com/kamailio/kamailio/commit/6b7af1beb7fdaaec1b5d069fdfff3e3… --- diff --git a/src/modules/registrar/save.c b/src/modules/registrar/save.c index 1709868f8e6..5ec02909ba6 100644 --- a/src/modules/registrar/save.c +++ b/src/modules/registrar/save.c @@ -955,8 +955,6 @@ int save(struct sip_msg *_m, udomain_t *_d, int _cflags, str *_uri) return -1; } } - if(u == NULL) - goto error; rerrno = R_FINE; ret = 1;

1 0

git:master:bf0cb8dd: ims_auth: restructured function to avoid unnecessary condition
by Daniel-Constantin Mierla 16 Feb '25

16 Feb '25

Module: kamailio Branch: master Commit: bf0cb8dd85c38c00435bfe6591b4b39b717b743c URL: https://github.com/kamailio/kamailio/commit/bf0cb8dd85c38c00435bfe6591b4b39… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-16T10:19:53+01:00 ims_auth: restructured function to avoid unnecessary condition --- Modified: src/modules/ims_auth/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/bf0cb8dd85c38c00435bfe6591b4b39… Patch: https://github.com/kamailio/kamailio/commit/bf0cb8dd85c38c00435bfe6591b4b39… --- diff --git a/src/modules/ims_auth/authorize.c b/src/modules/ims_auth/authorize.c index 0d16e658893..6fa9937cb68 100644 --- a/src/modules/ims_auth/authorize.c +++ b/src/modules/ims_auth/authorize.c @@ -1999,17 +1999,14 @@ int drop_auth_vectors(str private_identity, str public_identity) { auth_userdata *aud; aud = get_auth_userdata(private_identity, public_identity); - if(!aud) - goto error; + if(!aud) { + LM_DBG("no authdata to drop any auth vectors\n"); + return 0; + } drop_auth_vectors_for_userdata(aud); auth_data_unlock(aud->hash); return 1; -error: - LM_DBG("no authdata to drop any auth vectors\n"); - if(aud) - auth_data_unlock(aud->hash); - return 0; } void drop_auth_vectors_for_userdata(auth_userdata *aud)

1 0

git:master:aae4cb32: db_redis: clean the keyname variable
by Daniel-Constantin Mierla 15 Feb '25

15 Feb '25

Module: kamailio Branch: master Commit: aae4cb323d4ea9d07b4b8aec61a6c9bc03e2ab83 URL: https://github.com/kamailio/kamailio/commit/aae4cb323d4ea9d07b4b8aec61a6c9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-15T15:28:35+01:00 db_redis: clean the keyname variable --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/aae4cb323d4ea9d07b4b8aec61a6c9b… Patch: https://github.com/kamailio/kamailio/commit/aae4cb323d4ea9d07b4b8aec61a6c9b… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index 7f1d5720bd6..ac8b40756ec 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -616,7 +616,10 @@ static int db_redis_build_type_keys(km_redis_con_t *con, const str *table_name, if(set_keys) { // add key for parent set // <version>:<table>::index::<type> - pkg_free(keyname.s); + if(keyname.s) { + pkg_free(keyname.s); + keyname.s = NULL; + } keyname.len = table->version_code.len + table_name->len + 9 + type->type.len; keyname.s = pkg_malloc(keyname.len + 1); @@ -630,12 +633,16 @@ static int db_redis_build_type_keys(km_redis_con_t *con, const str *table_name, type->type.s); if(db_redis_key_add_str(set_keys, &keyname) != 0) { LM_ERR("Failed to add query key to set key list\n"); + pkg_free(keyname.s); + keyname.s = NULL; goto err; } } } - if(keyname.s) + if(keyname.s) { pkg_free(keyname.s); + keyname.s = NULL; + } } return 0;

1 0

git:master:d029de63: tsilo: free duplicated ruri and contact on error cases
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: d029de6380f8e30e0c82435b820744c21a5fbc78 URL: https://github.com/kamailio/kamailio/commit/d029de6380f8e30e0c82435b820744c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T12:40:57+01:00 tsilo: free duplicated ruri and contact on error cases --- Modified: src/modules/tsilo/tsilo.c --- Diff: https://github.com/kamailio/kamailio/commit/d029de6380f8e30e0c82435b820744c… Patch: https://github.com/kamailio/kamailio/commit/d029de6380f8e30e0c82435b820744c… --- diff --git a/src/modules/tsilo/tsilo.c b/src/modules/tsilo/tsilo.c index 6af49d59dd3..4e3c3501359 100644 --- a/src/modules/tsilo/tsilo.c +++ b/src/modules/tsilo/tsilo.c @@ -642,27 +642,33 @@ static int w_ts_append_by_contact3( if(ts_check_uri(&ruri) < 0) { LM_ERR("failed to parse R-URI.\n"); + pkg_free(ruri.s); return -1; } /* parse Contact header */ if(fixup_get_svalue(_msg, (gparam_t *)_contact, &contact_fixed) != 0) { LM_ERR("failed to convert contact parameter\n"); + pkg_free(ruri.s); return -1; } if(contact_fixed.s == NULL || contact_fixed.len <= 0) { LM_ERR("invalid contact parameter value\n"); + pkg_free(ruri.s); return -1; } if(pkg_str_dup(&contact, &contact_fixed) < 0) { LM_ERR("failed to copy r-uri parameter\n"); + pkg_free(ruri.s); return -1; } if(ts_check_uri(&contact) < 0) { LM_ERR("failed to parse Contact parameter.\n"); + pkg_free(ruri.s); + pkg_free(contact.s); return -1; } @@ -687,16 +693,22 @@ static int ki_ts_append_by_contact_uri( int rc; /* parse R-URI */ - if(ts_check_uri(_ruri) < 0) + if(ts_check_uri(_ruri) < 0) { return -1; - if(pkg_str_dup(&ruri, _ruri) < 0) + } + if(pkg_str_dup(&ruri, _ruri) < 0) { return -1; + } /* parse Contact header */ - if(ts_check_uri(_contact) < 0) + if(ts_check_uri(_contact) < 0) { + pkg_free(ruri.s); return -1; - if(pkg_str_dup(&contact, _contact) < 0) + } + if(pkg_str_dup(&contact, _contact) < 0) { + pkg_free(ruri.s); return -1; + } /* contact must be of syntax: sip:<user>@<host>:<port> with no parameters list */ rc = ts_append(_msg, &ruri, &contact, _table->s);

1 0

git:master:6a2a8255: dlgs: return -1 for 0 tags count
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: 6a2a82555ee8bbfaca1e825c19d1532f22c2c629 URL: https://github.com/kamailio/kamailio/commit/6a2a82555ee8bbfaca1e825c19d1532… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T12:40:57+01:00 dlgs: return -1 for 0 tags count --- Modified: src/modules/dlgs/dlgs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6a2a82555ee8bbfaca1e825c19d1532… Patch: https://github.com/kamailio/kamailio/commit/6a2a82555ee8bbfaca1e825c19d1532… --- diff --git a/src/modules/dlgs/dlgs_mod.c b/src/modules/dlgs/dlgs_mod.c index f06c9d0ceaa..041356cedb1 100644 --- a/src/modules/dlgs/dlgs_mod.c +++ b/src/modules/dlgs/dlgs_mod.c @@ -341,7 +341,7 @@ static int ki_dlgs_tags_count(sip_msg_t *msg, str *vtags) int ret; ret = dlgs_tags_count(msg, vtags); - return (ret <= 0) ? (ret - 1) : ret; + return (ret == 0 || ret == -1) ? (ret - 1) : ret; } /**

1 0

git:master:39ba53a2: http_client: free dumplicated name in case of errors
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: 39ba53a2499dd1f0e080bb011d7438a60ea5faec URL: https://github.com/kamailio/kamailio/commit/39ba53a2499dd1f0e080bb011d7438a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T12:40:57+01:00 http_client: free dumplicated name in case of errors --- Modified: src/modules/http_client/curlcon.c --- Diff: https://github.com/kamailio/kamailio/commit/39ba53a2499dd1f0e080bb011d7438a… Patch: https://github.com/kamailio/kamailio/commit/39ba53a2499dd1f0e080bb011d7438a… --- diff --git a/src/modules/http_client/curlcon.c b/src/modules/http_client/curlcon.c index 16dfb6cc09b..3582ecde199 100644 --- a/src/modules/http_client/curlcon.c +++ b/src/modules/http_client/curlcon.c @@ -582,21 +582,29 @@ int curl_parse_conn(void *param, cfg_parser_t *parser, unsigned int flags) t.start.line, t.start.col); return -1; } - pkg_str_dup(&name, &t.val); + if(pkg_str_dup(&name, &t.val) < 0) { + return -1; + } ret = cfg_get_token(&t, parser, 0); - if(ret < 0) + if(ret < 0) { + pkg_free(name.s); return -1; + } if((ret > 0) || (t.type != ']')) { LM_ERR("%s:%d:%d: Syntax error, ']' expected\n", parser->file, t.start.line, t.start.col); + pkg_free(name.s); return -1; } - if(cfg_eat_eol(parser, flags)) + if(cfg_eat_eol(parser, flags)) { + pkg_free(name.s); return -1; + } raw_cc = pkg_malloc(sizeof(raw_http_client_conn_t)); if(raw_cc == NULL) { + pkg_free(name.s); return -1; } memset(raw_cc, 0, sizeof(raw_http_client_conn_t));

1 0

git:master:8a96379c: call_control: free pv field in case of error
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: 8a96379cc1ef7aa42bc4be49834c538a3bffdf14 URL: https://github.com/kamailio/kamailio/commit/8a96379cc1ef7aa42bc4be49834c538… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T12:40:57+01:00 call_control: free pv field in case of error --- Modified: src/modules/call_control/call_control.c --- Diff: https://github.com/kamailio/kamailio/commit/8a96379cc1ef7aa42bc4be49834c538… Patch: https://github.com/kamailio/kamailio/commit/8a96379cc1ef7aa42bc4be49834c538… --- diff --git a/src/modules/call_control/call_control.c b/src/modules/call_control/call_control.c index fd1bf0736fc..83febe1f5b1 100644 --- a/src/modules/call_control/call_control.c +++ b/src/modules/call_control/call_control.c @@ -290,6 +290,9 @@ int cc_parse_param(void *val, AVP_List **avps) if(!(mp->next)) { PKG_MEM_ERROR; pkg_free(p0); + if(mp->pv) { + pkg_free(mp->pv); + } pkg_free(mp); return -1; }

1 0

git:master:34743f40: sdpops: check the limit for computed rtcp port
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: 34743f40056e230e6c6d1ae6bf72e369b6f6890f URL: https://github.com/kamailio/kamailio/commit/34743f40056e230e6c6d1ae6bf72e36… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T12:40:57+01:00 sdpops: check the limit for computed rtcp port --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/34743f40056e230e6c6d1ae6bf72e36… Patch: https://github.com/kamailio/kamailio/commit/34743f40056e230e6c6d1ae6bf72e36… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index 164b97f1ba3..7631779c70f 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -25,6 +25,7 @@ #include <string.h> #include <stdlib.h> #include <stdio.h> +#include <limits.h> #include "../../core/sr_module.h" #include "../../core/dprint.h" @@ -2212,7 +2213,10 @@ static int pv_get_sdp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) } if(sdp->sessions->streams->port.s != NULL && sdp->sessions->streams->port.len > 0) { - str2int(&sdp->sessions->streams->port, &uport); + if(str2int(&sdp->sessions->streams->port, &uport) < 0 + || uport >= USHRT_MAX) { + return pv_get_null(msg, param, res); + } uport++; s.s = int2strbuf(uport, uport_buf, INT2STR_MAX_LEN, &s.len); return pv_get_strval(msg, param, res, &s);

1 0

git:master:01782191: sca: free replaces hdr on anchor lump failure
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: 01782191418f3d65c4aa5cb273140fec928d153a URL: https://github.com/kamailio/kamailio/commit/01782191418f3d65c4aa5cb273140fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T12:40:57+01:00 sca: free replaces hdr on anchor lump failure --- Modified: src/modules/sca/sca_call_info.c --- Diff: https://github.com/kamailio/kamailio/commit/01782191418f3d65c4aa5cb273140fe… Patch: https://github.com/kamailio/kamailio/commit/01782191418f3d65c4aa5cb273140fe… --- diff --git a/src/modules/sca/sca_call_info.c b/src/modules/sca/sca_call_info.c index b15a7251746..3d5471178c0 100644 --- a/src/modules/sca/sca_call_info.c +++ b/src/modules/sca/sca_call_info.c @@ -615,6 +615,7 @@ int sca_call_info_seize_held_call(sip_msg_t *msg, sca_call_info *call_info, anchor = anchor_lump(msg, msg->eoh - msg->buf, 0, HDR_OTHER_T); if(anchor == NULL) { LM_ERR("Failed to anchor lump\n"); + pkg_free(replaces_hdr.s); goto done; } @@ -638,7 +639,6 @@ int sca_call_info_seize_held_call(sip_msg_t *msg, sca_call_info *call_info, // we restore the original owner and dialog. if(sca_appearance_update_owner_unsafe(app, contact_uri) < 0) { LM_ERR("sca_call_info_seize_held_call: failed to update owner\n"); - pkg_free(replaces_hdr.s); goto done; }

1 0

[kamailio/kamailio] ims_auth|ims_registrar_pcscf: Fix Build for CentOS 7 (PR #4145)
by Gustavo Almeida 14 Feb '25

14 Feb '25

### Description At this time, it's not possible to build Kamailio on `CentOS 7` on `master` or `6.0.0`. Some code on `ims_auth` and `ims_registrar_pcscf` is not compliant with old `gcc`. #### 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: - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Additional Information Tested on my own, and build now works just fine. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4145 -- Commit Summary -- * ims_auth: Fix CentOS 7 Build * ims_auth: Fix CentOS 7 Build * ims_registrar_pcscf: Fix CentOS 7 Build * Merge branch 'master' into bundasmanu/fix_centos_7_build -- File Changes -- M src/modules/ims_auth/auth_vector.c (11) M src/modules/ims_registrar_pcscf/subscribe.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4145.patch https://github.com/kamailio/kamailio/pull/4145.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4145 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4145(a)github.com>

2 2

git:master:e458ca15: ims_registrar_pcscf: Fix CentOS 7 Build
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: e458ca15a4ca30448ea9aae20a93eb86e2ce92c0 URL: https://github.com/kamailio/kamailio/commit/e458ca15a4ca30448ea9aae20a93eb8… Author: Gustavo Almeida <gustavo.abcdef(a)hotmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T12:39:50+01:00 ims_registrar_pcscf: Fix CentOS 7 Build - ims_registrar_pcscf: Fix non C99 compliant code --- Modified: src/modules/ims_registrar_pcscf/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/e458ca15a4ca30448ea9aae20a93eb8… Patch: https://github.com/kamailio/kamailio/commit/e458ca15a4ca30448ea9aae20a93eb8… --- diff --git a/src/modules/ims_registrar_pcscf/subscribe.c b/src/modules/ims_registrar_pcscf/subscribe.c index c507b6d272d..9259704eb10 100644 --- a/src/modules/ims_registrar_pcscf/subscribe.c +++ b/src/modules/ims_registrar_pcscf/subscribe.c @@ -56,12 +56,13 @@ int reginfo_subscribe_real(struct sip_msg *msg, pv_elem_t *uri, str extra_headers = {0}; reginfo_event_t *new_event; str *subs_outbound_proxy = 0; + int i = 0; int len = strlen(P_ASSERTED_IDENTITY_HDR_PREFIX) + pcscf_uri.len + 1 + CRLF_LEN; if(service_routes != NULL) { len += strlen(ROUTE_HDR_PREFIX) + strlen(ROUTE_HDR_END); - for(int i = 0; i < num_service_routes; i++) { + for(i = 0; i < num_service_routes; i++) { len += service_routes[i].len + strlen(ROUTE_HDR_SEPARATOR); } } @@ -87,7 +88,7 @@ int reginfo_subscribe_real(struct sip_msg *msg, pv_elem_t *uri, memcpy(extra_headers.s + extra_headers.len, ROUTE_HDR_PREFIX, strlen(ROUTE_HDR_PREFIX)); extra_headers.len += strlen(ROUTE_HDR_PREFIX); - for(int i = 0; i < num_service_routes; i++) { + for(i = 0; i < num_service_routes; i++) { memcpy(extra_headers.s + extra_headers.len, service_routes[i].s, service_routes[i].len); extra_headers.len += service_routes[i].len;

1 0

git:master:7a65b3ce: ims_auth: Fix CentOS 7 Build
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: 7a65b3ce11a3afc0f5be47f61235166cb8938c78 URL: https://github.com/kamailio/kamailio/commit/7a65b3ce11a3afc0f5be47f61235166… Author: Gustavo Almeida <gustavo.abcdef(a)hotmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T12:39:50+01:00 ims_auth: Fix CentOS 7 Build - ims_auth: Fix non C99 compliant code --- Modified: src/modules/ims_auth/auth_vector.c --- Diff: https://github.com/kamailio/kamailio/commit/7a65b3ce11a3afc0f5be47f61235166… Patch: https://github.com/kamailio/kamailio/commit/7a65b3ce11a3afc0f5be47f61235166… --- diff --git a/src/modules/ims_auth/auth_vector.c b/src/modules/ims_auth/auth_vector.c index 19fbad91409..26acf36a8da 100644 --- a/src/modules/ims_auth/auth_vector.c +++ b/src/modules/ims_auth/auth_vector.c @@ -40,6 +40,8 @@ auth_vector *auth_vector_make_local(uint8_t k[16], uint8_t op[16], int opIsOPc, uint8_t ak[6]; uint8_t authenticate[16 + 6 + 2 + 8]; + int i = 0; + // f0 - generate random f0(rand); @@ -58,7 +60,7 @@ auth_vector *auth_vector_make_local(uint8_t k[16], uint8_t op[16], int opIsOPc, // AUTN = SQN ^ AK || AMF || MAC-A // Authenticate = RAND || AUTN memcpy(authenticate, rand, 16); - for(int i = 0; i < 6; i++) + for(i = 0; i < 6; i++) authenticate[16 + i] = sqn[i] ^ ak[i]; memcpy(authenticate + 22, amf, 2); memcpy(authenticate + 24, mac_a, 8); @@ -90,6 +92,8 @@ int auth_vector_resync_local(uint8_t sqnMSout[6], auth_vector *av, uint8_t mac_s[8]; uint8_t xmac_s[8]; + int i = 0; + if(!av->is_locally_generated) { LM_ERR("auth_vector is not locally generated - let the HSS handle " "resync\n"); @@ -114,7 +118,6 @@ int auth_vector_resync_local(uint8_t sqnMSout[6], auth_vector *av, f5star(ak, k, op_c, rand); // Unpack the AUTS = (SQN_MS ^ AK) || MAC-S - int i = 0; for(i = 0; i < 6; i++) sqnMS[i] = auts[i] ^ ak[i]; memcpy(mac_s, auts + 6, 8);

1 0

git:master:2349e408: ims_auth: Fix CentOS 7 Build
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: 2349e4088d3fd454b74de15dfcb9a3e19fc03663 URL: https://github.com/kamailio/kamailio/commit/2349e4088d3fd454b74de15dfcb9a3e… Author: Gustavo Almeida <gustavo.abcdef(a)hotmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T12:39:50+01:00 ims_auth: Fix CentOS 7 Build ims_auth: Fix non C99 compliant code --- Modified: src/modules/ims_auth/auth_vector.c --- Diff: https://github.com/kamailio/kamailio/commit/2349e4088d3fd454b74de15dfcb9a3e… Patch: https://github.com/kamailio/kamailio/commit/2349e4088d3fd454b74de15dfcb9a3e… --- diff --git a/src/modules/ims_auth/auth_vector.c b/src/modules/ims_auth/auth_vector.c index a681490f71a..19fbad91409 100644 --- a/src/modules/ims_auth/auth_vector.c +++ b/src/modules/ims_auth/auth_vector.c @@ -114,7 +114,8 @@ int auth_vector_resync_local(uint8_t sqnMSout[6], auth_vector *av, f5star(ak, k, op_c, rand); // Unpack the AUTS = (SQN_MS ^ AK) || MAC-S - for(int i = 0; i < 6; i++) + int i = 0; + for(i = 0; i < 6; i++) sqnMS[i] = auts[i] ^ ak[i]; memcpy(mac_s, auts + 6, 8); @@ -135,7 +136,8 @@ int auth_vector_resync_local(uint8_t sqnMSout[6], auth_vector *av, void sqn_increment(uint8_t sqn[6]) { - for(int i = 5; i >= 0; i--) { + int i = 0; + for(i = 5; i >= 0; i--) { if(sqn[i] == 0xFF) { sqn[i] = 0; } else {

1 0

git:master:e65b03cd: xmlrpc: removed unnecessary code
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: e65b03cdd946d735a3ef33ae3582bcfad464d2c7 URL: https://github.com/kamailio/kamailio/commit/e65b03cdd946d735a3ef33ae3582bcf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T10:16:00+01:00 xmlrpc: removed unnecessary code --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/e65b03cdd946d735a3ef33ae3582bcf… Patch: https://github.com/kamailio/kamailio/commit/e65b03cdd946d735a3ef33ae3582bcf… --- diff --git a/src/modules/xmlrpc/xmlrpc.c b/src/modules/xmlrpc/xmlrpc.c index eb44f4450dd..24a0c375a54 100644 --- a/src/modules/xmlrpc/xmlrpc.c +++ b/src/modules/xmlrpc/xmlrpc.c @@ -2091,9 +2091,7 @@ static int rpc_struct_printf( goto err; } } - if(buf) - mxr_free(buf); - return 0; + err: if(buf) mxr_free(buf);

1 0

git:master:edbb5b11: ctl: refactored error handling and removed unnecessary code
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: edbb5b11e9453be3519e6e9a945937307c95709e URL: https://github.com/kamailio/kamailio/commit/edbb5b11e9453be3519e6e9a9459373… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T08:37:23+01:00 ctl: refactored error handling and removed unnecessary code --- Modified: src/modules/ctl/fifo_server.c --- Diff: https://github.com/kamailio/kamailio/commit/edbb5b11e9453be3519e6e9a9459373… Patch: https://github.com/kamailio/kamailio/commit/edbb5b11e9453be3519e6e9a9459373… --- diff --git a/src/modules/ctl/fifo_server.c b/src/modules/ctl/fifo_server.c index 70ce92deb76..2d671798cce 100644 --- a/src/modules/ctl/fifo_server.c +++ b/src/modules/ctl/fifo_server.c @@ -1290,7 +1290,7 @@ static int rpc_struct_printf(struct text_chunk *c, char *name, char *fmt, ...) &nm, 1); /* Escape all characters, including : and , */ if(!m) { rpc_fault(ctx, 500, "Internal Server Error"); - goto err; + goto error; } s.s = buf; @@ -1300,7 +1300,7 @@ static int rpc_struct_printf(struct text_chunk *c, char *name, char *fmt, ...) rpc_fault(ctx, 500, "Internal Server Error"); free_chunk(m); ERR("Error while creating text_chunk structure"); - goto err; + goto error; } l->flags |= CHUNK_MEMBER_VALUE; @@ -1326,13 +1326,12 @@ static int rpc_struct_printf(struct text_chunk *c, char *name, char *fmt, ...) if((buf0 = ctl_realloc(buf, buf_size)) == 0) { rpc_fault(ctx, 500, "Internal Server Error (No memory left)"); ERR("No memory left\n"); - goto err; + goto error; } buf = buf0; } - ctl_free(buf); - return 0; -err: + +error: if(buf) ctl_free(buf); return -1;

1 0

git:master:a6d692be: pv: free buf uri in case of error setting xto attr
by Daniel-Constantin Mierla 13 Feb '25

13 Feb '25

Module: kamailio Branch: master Commit: a6d692be4283dc349c38b455ee71c4e21dcef6aa URL: https://github.com/kamailio/kamailio/commit/a6d692be4283dc349c38b455ee71c4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-13T11:58:21+01:00 pv: free buf uri in case of error setting xto attr --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/a6d692be4283dc349c38b455ee71c4e… Patch: https://github.com/kamailio/kamailio/commit/a6d692be4283dc349c38b455ee71c4e… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 38d46c01dba..56d96b20d75 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3817,6 +3817,9 @@ int pv_set_xto_attr(struct sip_msg *msg, pv_param_t *param, int op, return 0; error: + if(buf_uri.s != 0) { + pkg_free(buf_uri.s); + } if(buf.s != NULL) { pkg_free(buf.s); }

1 0

git:master:b875e736: pv: free next field on error when parsing xav* names
by Daniel-Constantin Mierla 13 Feb '25

13 Feb '25

Module: kamailio Branch: master Commit: b875e7368dcc8e221007caafa3599c3e354404f7 URL: https://github.com/kamailio/kamailio/commit/b875e7368dcc8e221007caafa3599c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-13T11:45:06+01:00 pv: free next field on error when parsing xav* names --- Modified: src/modules/pv/pv_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/b875e7368dcc8e221007caafa3599c3… Patch: https://github.com/kamailio/kamailio/commit/b875e7368dcc8e221007caafa3599c3… --- diff --git a/src/modules/pv/pv_xavp.c b/src/modules/pv/pv_xavp.c index 89d9ba131d0..8858c376367 100644 --- a/src/modules/pv/pv_xavp.c +++ b/src/modules/pv/pv_xavp.c @@ -516,6 +516,10 @@ int pv_parse_xavp_name(pv_spec_p sp, str *in) error: if(xname != NULL) { + if(xname->next != NULL) { + pkg_free(xname->next); + xname->next = NULL; + } pv_xavp_name_destroy(xname); pkg_free(xname); } @@ -964,6 +968,10 @@ int pv_parse_xavu_name(pv_spec_t *sp, str *in) error: if(xname != NULL) { + if(xname->next != NULL) { + pkg_free(xname->next); + xname->next = NULL; + } pv_xavu_name_destroy(xname); pkg_free(xname); } @@ -1111,6 +1119,10 @@ int pv_parse_xavi_name(pv_spec_p sp, str *in) error: if(xname != NULL) { + if(xname->next != NULL) { + pkg_free(xname->next); + xname->next = NULL; + } pv_xavi_name_destroy(xname); pkg_free(xname); }

1 0

git:master:d0cd3c4b: topoh: check on pointer only for via decode return
by Daniel-Constantin Mierla 13 Feb '25

13 Feb '25

Module: kamailio Branch: master Commit: d0cd3c4b40fd791143122622a6d74703e1375832 URL: https://github.com/kamailio/kamailio/commit/d0cd3c4b40fd791143122622a6d7470… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-13T11:01:20+01:00 topoh: check on pointer only for via decode return - code reformatted --- Modified: src/modules/topoh/th_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/d0cd3c4b40fd791143122622a6d7470… Patch: https://github.com/kamailio/kamailio/commit/d0cd3c4b40fd791143122622a6d7470… --- diff --git a/src/modules/topoh/th_msg.c b/src/modules/topoh/th_msg.c index 1984875e0c6..54d3caffe62 100644 --- a/src/modules/topoh/th_msg.c +++ b/src/modules/topoh/th_msg.c @@ -177,10 +177,8 @@ int th_mask_via(sip_msg_t *msg, str *via_prefix) vlen = th_skip_rw(via->name.s, via->bsize); LM_DBG("body: %d: [%.*s]\n", vlen, vlen, via->name.s); if(i != 1) { - out.s = th_mask_encode( - via->name.s, vlen, via_prefix, &out.len); - if(out.s == NULL) - { + out.s = th_mask_encode(via->name.s, vlen, via_prefix, &out.len); + if(out.s == NULL) { LM_ERR("cannot encode via %d\n", i); return -1; } @@ -372,11 +370,11 @@ int th_unmask_via(sip_msg_t *msg, str *ip, str *cookie) LM_DBG("body: %d: [%.*s]\n", vlen, vlen, via->name.s); if(i != 1) { /* Skip if via is not encoded */ - if (th_uri_prefix_checks - && (via->host.len != ip->len - || strncasecmp(via->host.s, ip->s, ip->len) - != 0)) { - LM_DBG("via %d is not encoded - skip\n",i); + if(th_uri_prefix_checks + && (via->host.len != ip->len + || strncasecmp(via->host.s, ip->s, ip->len) + != 0)) { + LM_DBG("via %d is not encoded - skip\n", i); continue; } @@ -404,7 +402,7 @@ int th_unmask_via(sip_msg_t *msg, str *ip, str *cookie) out.s = th_mask_decode(vp->value.s, vp->value.len, &th_vparam_prefix, 0, &out.len); } - if(out.s == NULL || out.len <= 0) { + if(out.s == NULL) { LM_ERR("cannot decode via %d\n", i); return -1; } @@ -599,7 +597,7 @@ int th_flip_record_route(sip_msg_t *msg, str *uri_prefix, str *ip, int mode) case 1: /* encode */ if(act != 0 && mode == 1) { out.s = th_mask_encode(rr->nameaddr.uri.s, - rr->nameaddr.uri.len, uri_prefix, &out.len); + rr->nameaddr.uri.len, uri_prefix, &out.len); if(out.s == NULL) { LM_ERR("cannot encode r-r %d\n", i); return -1; @@ -665,10 +663,10 @@ int th_unmask_route(sip_msg_t *msg, str *uri_prefix) i++; if(i != 1) { /* Skip if route is not encoded */ - if (th_uri_prefix_checks - && ((rr->nameaddr.uri.len<uri_prefix->len) - || (strncasecmp(rr->nameaddr.uri.s, - uri_prefix->s, uri_prefix->len) + if(th_uri_prefix_checks + && ((rr->nameaddr.uri.len < uri_prefix->len) + || (strncasecmp(rr->nameaddr.uri.s, + uri_prefix->s, uri_prefix->len) != 0))) { LM_DBG("rr %d is not encoded: [%.*s] - missing prefix\n", i, rr->nameaddr.uri.len, rr->nameaddr.uri.s); @@ -721,12 +719,12 @@ int th_unmask_ruri(sip_msg_t *msg, str *uri_prefix) str out; /* Do nothing if ruri is not encoded */ - if (th_uri_prefix_checks - && ((REQ_LINE(msg).uri.len<uri_prefix->len) + if(th_uri_prefix_checks + && ((REQ_LINE(msg).uri.len < uri_prefix->len) || (strncasecmp(REQ_LINE(msg).uri.s, uri_prefix->s, uri_prefix->len) != 0))) { - LM_DBG("ruri [%.*s] is not encoded",REQ_LINE(msg).uri.len, + LM_DBG("ruri [%.*s] is not encoded", REQ_LINE(msg).uri.len, REQ_LINE(msg).uri.s); return 0; } @@ -784,11 +782,11 @@ int th_unmask_refer_to(sip_msg_t *msg, str *uri_prefix) uri = &(get_refer_to(msg)->uri); /* Do nothing if refer_to is not encoded */ - if (th_uri_prefix_checks - && ((uri->len<uri_prefix->len) + if(th_uri_prefix_checks + && ((uri->len < uri_prefix->len) || (strncasecmp(uri->s, uri_prefix->s, uri_prefix->len) != 0))) { - LM_DBG("refer-to [%.*s] is not encoded",uri->len,uri->s); + LM_DBG("refer-to [%.*s] is not encoded", uri->len, uri->s); return 0; }

1 0

git:master:aa081dbd: tm: rpc uac - jump to error when failing to create delayed context
by Daniel-Constantin Mierla 13 Feb '25

13 Feb '25

Module: kamailio Branch: master Commit: aa081dbd1ee1901c6174ffddd556bda47b6ef732 URL: https://github.com/kamailio/kamailio/commit/aa081dbd1ee1901c6174ffddd556bda… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-13T10:50:32+01:00 tm: rpc uac - jump to error when failing to create delayed context --- Modified: src/modules/tm/rpc_uac.c --- Diff: https://github.com/kamailio/kamailio/commit/aa081dbd1ee1901c6174ffddd556bda… Patch: https://github.com/kamailio/kamailio/commit/aa081dbd1ee1901c6174ffddd556bda… --- diff --git a/src/modules/tm/rpc_uac.c b/src/modules/tm/rpc_uac.c index e63da4fb835..2d7bd6113d4 100644 --- a/src/modules/tm/rpc_uac.c +++ b/src/modules/tm/rpc_uac.c @@ -778,7 +778,7 @@ static void rpc_t_uac(rpc_t *rpc, void *c, int reply_wait) dctx = rpc->delayed_ctx_new(c); if(dctx == 0) { rpc->fault(c, 500, "internal error: failed to create context"); - return; + goto error01; } uac_req.cb = rpc_uac_callback; uac_req.cbp = dctx;

1 0

git:master:27e1e910: tm: jump to error when failing to built content length for uac cancel
by Daniel-Constantin Mierla 13 Feb '25

13 Feb '25

Module: kamailio Branch: master Commit: 27e1e9102f07047a3d2c2f28baa708f14be556a6 URL: https://github.com/kamailio/kamailio/commit/27e1e9102f07047a3d2c2f28baa708f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-13T10:42:27+01:00 tm: jump to error when failing to built content length for uac cancel --- Modified: src/modules/tm/t_msgbuilder.c --- Diff: https://github.com/kamailio/kamailio/commit/27e1e9102f07047a3d2c2f28baa708f… Patch: https://github.com/kamailio/kamailio/commit/27e1e9102f07047a3d2c2f28baa708f… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index 71fd4e644b3..d9231486c61 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -1827,7 +1827,8 @@ char *build_uac_cancel(str *headers, str *body, struct cell *cancelledT, char branch_buf[MAX_BRANCH_PARAM_LEN]; str branch_str; struct hostport hp; - str content_length, via; + str content_length; + str via = STR_NULL; LM_DBG("sing FROM=<%.*s>, TO=<%.*s>, CSEQ_N=<%.*s>\n", cancelledT->from_hdr.len, cancelledT->from_hdr.s, @@ -1866,7 +1867,7 @@ char *build_uac_cancel(str *headers, str *body, struct cell *cancelledT, /* Content Length */ if(print_content_length(&content_length, body) < 0) { LM_ERR("failed to print content-length\n"); - return 0; + goto error01; } /* Content-Length */ *len += (body ? (CONTENT_LENGTH_LEN + content_length.len + CRLF_LEN) : 0);

1 0

git:master:e85d07e5: tm: split reverse rte list function
by Daniel-Constantin Mierla 13 Feb '25

13 Feb '25

Module: kamailio Branch: master Commit: e85d07e5b42ff25f81b74f68ab412e0ab27e7170 URL: https://github.com/kamailio/kamailio/commit/e85d07e5b42ff25f81b74f68ab412e0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-13T10:32:51+01:00 tm: split reverse rte list function --- Modified: src/modules/tm/t_msgbuilder.c --- Diff: https://github.com/kamailio/kamailio/commit/e85d07e5b42ff25f81b74f68ab412e0… Patch: https://github.com/kamailio/kamailio/commit/e85d07e5b42ff25f81b74f68ab412e0… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index b2c101bf2b6..71fd4e644b3 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -750,6 +750,26 @@ static inline int get_contact_uri(struct sip_msg *msg, str *uri) return 0; } +/** + * reverse rte list + */ +static inline rte_t *tm_reverse_rte_list(rte_t *head) +{ + rte_t *prev = NULL; + rte_t *current = NULL; + rte_t *next = NULL; + + current = head; + while(current != NULL) { + next = current->next; + current->next = prev; + prev = current; + current = next; + } + + return prev; +} + /** * Extract route set from the message (out of Record-Route, if reply, OR * Route, if request). @@ -760,7 +780,7 @@ static inline int get_uac_rs(sip_msg_t *msg, int is_req, struct rte **rtset) { struct hdr_field *ptr; rr_t *p, *new_p; - struct rte *t, *head, *old_head; + struct rte *t, *head; head = 0; for(ptr = is_req ? msg->route : msg->record_route; ptr; ptr = ptr->next) { @@ -810,14 +830,7 @@ static inline int get_uac_rs(sip_msg_t *msg, int is_req, struct rte **rtset) if(is_req) { /* harvesting the R/RR HF above inserts at head, which suites RRs (as * they must be reversed, anyway), but not Rs => reverse once more */ - old_head = head; - head = 0; - while(old_head) { - t = old_head; - old_head = old_head->next; - t->next = head; - head = t; - } + head = tm_reverse_rte_list(head); } *rtset = head; @@ -827,7 +840,6 @@ static inline int get_uac_rs(sip_msg_t *msg, int is_req, struct rte **rtset) return -1; } - static inline unsigned short uri2port(const struct sip_uri *puri) { if(puri->port.s) {

1 0

git:master:7c908137: xprint: break on first resolved ip address
by Daniel-Constantin Mierla 13 Feb '25

13 Feb '25

Module: kamailio Branch: master Commit: 7c908137826071b8180bd93ff8ba3994be66da3a URL: https://github.com/kamailio/kamailio/commit/7c908137826071b8180bd93ff8ba399… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-13T09:48:33+01:00 xprint: break on first resolved ip address --- Modified: src/modules/xprint/xp_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/7c908137826071b8180bd93ff8ba399… Patch: https://github.com/kamailio/kamailio/commit/7c908137826071b8180bd93ff8ba399… --- diff --git a/src/modules/xprint/xp_lib.c b/src/modules/xprint/xp_lib.c index 567e62ade86..cdcde6807d2 100644 --- a/src/modules/xprint/xp_lib.c +++ b/src/modules/xprint/xp_lib.c @@ -1888,6 +1888,7 @@ int xl_mod_init() if(str_ipaddr.s) { memcpy(str_ipaddr.s, s, str_ipaddr.len); str_ipaddr.s[str_ipaddr.len] = '\0'; + break; } else { pkg_free(s); s = NULL;

1 0

git:master:4c4d7f79: ctl: fifo - clean intermediary buffer
by Daniel-Constantin Mierla 13 Feb '25

13 Feb '25

Module: kamailio Branch: master Commit: 4c4d7f7967a99d4dd4acdc5e198bce493bf15d67 URL: https://github.com/kamailio/kamailio/commit/4c4d7f7967a99d4dd4acdc5e198bce4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-13T09:43:43+01:00 ctl: fifo - clean intermediary buffer --- Modified: src/modules/ctl/fifo_server.c --- Diff: https://github.com/kamailio/kamailio/commit/4c4d7f7967a99d4dd4acdc5e198bce4… Patch: https://github.com/kamailio/kamailio/commit/4c4d7f7967a99d4dd4acdc5e198bce4… --- diff --git a/src/modules/ctl/fifo_server.c b/src/modules/ctl/fifo_server.c index 197302c1771..70ce92deb76 100644 --- a/src/modules/ctl/fifo_server.c +++ b/src/modules/ctl/fifo_server.c @@ -1261,7 +1261,7 @@ static int rpc_add(rpc_ctx_t *ctx, char *fmt, ...) static int rpc_struct_printf(struct text_chunk *c, char *name, char *fmt, ...) { int n, buf_size; - char *buf; + char *buf = NULL; char *buf0; va_list ap; str s, nm; @@ -1314,6 +1314,7 @@ static int rpc_struct_printf(struct text_chunk *c, char *name, char *fmt, ...) c->next = m; if(c == ctx->last) ctx->last = m; + ctl_free(buf); return 0; } /* Else try again with more space. */ @@ -1329,6 +1330,7 @@ static int rpc_struct_printf(struct text_chunk *c, char *name, char *fmt, ...) } buf = buf0; } + ctl_free(buf); return 0; err: if(buf)

1 0

git:master:ff712539: xmlrpc: clean allocated buffer
by Daniel-Constantin Mierla 13 Feb '25

13 Feb '25

Module: kamailio Branch: master Commit: ff712539566c903312ebba2f8e2585f9c80ffdcf URL: https://github.com/kamailio/kamailio/commit/ff712539566c903312ebba2f8e2585f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-13T09:40:00+01:00 xmlrpc: clean allocated buffer --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/ff712539566c903312ebba2f8e2585f… Patch: https://github.com/kamailio/kamailio/commit/ff712539566c903312ebba2f8e2585f… --- diff --git a/src/modules/xmlrpc/xmlrpc.c b/src/modules/xmlrpc/xmlrpc.c index 4157e94904d..eb44f4450dd 100644 --- a/src/modules/xmlrpc/xmlrpc.c +++ b/src/modules/xmlrpc/xmlrpc.c @@ -2024,7 +2024,7 @@ static int rpc_struct_printf( struct rpc_struct *s, char *member_name, char *fmt, ...) { int n, buf_size; - char *buf; + char *buf = NULL; va_list ap; str st, name; struct xmlrpc_reply *reply; @@ -2076,6 +2076,7 @@ static int rpc_struct_printf( if(add_xmlrpc_reply(out, &member_suffix) < 0) goto err; + mxr_free(buf); return 0; } /* Else try again with more space. */ @@ -2090,6 +2091,8 @@ static int rpc_struct_printf( goto err; } } + if(buf) + mxr_free(buf); return 0; err: if(buf) @@ -2745,7 +2748,7 @@ static int ki_xmlrpc_reply(sip_msg_t *msg, int rcode, str *reason) if(add_xmlrpc_reply(&reply, &int_suffix) < 0) goto error; if(add_xmlrpc_reply(&reply, &success_suffix) < 0) - return -1; + goto error; } if(send_reply(msg, &reply.body) < 0) goto error;

1 0

git:master:b17038ec: xprint: init globals when declared
by Daniel-Constantin Mierla 13 Feb '25

13 Feb '25

Module: kamailio Branch: master Commit: b17038ec072b1854fa2fae1c2d4725c1471ef8ac URL: https://github.com/kamailio/kamailio/commit/b17038ec072b1854fa2fae1c2d4725c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-13T09:18:00+01:00 xprint: init globals when declared --- Modified: src/modules/xprint/xp_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/b17038ec072b1854fa2fae1c2d4725c… Patch: https://github.com/kamailio/kamailio/commit/b17038ec072b1854fa2fae1c2d4725c… --- diff --git a/src/modules/xprint/xp_lib.c b/src/modules/xprint/xp_lib.c index fda12a82fc3..567e62ade86 100644 --- a/src/modules/xprint/xp_lib.c +++ b/src/modules/xprint/xp_lib.c @@ -56,7 +56,10 @@ static str str_null = STR_STATIC_INIT("<null>"); static str str_empty = STR_STATIC_INIT(""); static str str_per = STR_STATIC_INIT("%"); -static str str_hostname, str_domainname, str_fullname, str_ipaddr; +static str str_hostname = STR_NULL; +static str str_domainname = STR_NULL; +static str str_fullname = STR_NULL; +static str str_ipaddr = STR_NULL; enum xl_host_t { @@ -1835,14 +1838,7 @@ int xl_mod_init() PKG_MEM_ERROR; return -1; } - if(gethostname(s, HOSTNAME_MAX) < 0) { - str_fullname.len = 0; - str_fullname.s = NULL; - str_hostname.len = 0; - str_hostname.s = NULL; - str_domainname.len = 0; - str_domainname.s = NULL; - } else { + if(gethostname(s, HOSTNAME_MAX) >= 0) { str_fullname.len = strlen(s); s = pkg_reallocxf( s, str_fullname.len + 1); /* this will leave the ending \0 */ @@ -1870,8 +1866,6 @@ int xl_mod_init() } } - str_ipaddr.len = 0; - str_ipaddr.s = NULL; if(str_fullname.len) { he = resolvehost(str_fullname.s); if(he) {

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev