- sr-dev - kamailio.org

git:master:aab734e7: rtpengine: unsigned error field of 1-bit to prevent signness warnings
by Daniel-Constantin Mierla 04 Jan '24

04 Jan '24

Module: kamailio Branch: master Commit: aab734e7a31a9df2dc731e849005ce6bb00d534e URL: https://github.com/kamailio/kamailio/commit/aab734e7a31a9df2dc731e849005ce6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-04T12:46:23+01:00 rtpengine: unsigned error field of 1-bit to prevent signness warnings --- Modified: src/modules/rtpengine/bencode.h --- Diff: https://github.com/kamailio/kamailio/commit/aab734e7a31a9df2dc731e849005ce6… Patch: https://github.com/kamailio/kamailio/commit/aab734e7a31a9df2dc731e849005ce6… --- diff --git a/src/modules/rtpengine/bencode.h b/src/modules/rtpengine/bencode.h index 8f3b434e7ac..1a3562d9d49 100644 --- a/src/modules/rtpengine/bencode.h +++ b/src/modules/rtpengine/bencode.h @@ -47,7 +47,7 @@ struct bencode_buffer { struct __bencode_buffer_piece *pieces; struct __bencode_free_list *free_list; - int error : 1; /* set to !0 if allocation failed at any point */ + unsigned int error : 1; /* set to !0 if allocation failed at any point */ };

1 0

git:master:ad136593: kamctl: dbtextdb/dbtextdb_test - do not store unused result of query
by Daniel-Constantin Mierla 04 Jan '24

04 Jan '24

Module: kamailio Branch: master Commit: ad1365935e2f021095e6e14aca03da54d3862d5b URL: https://github.com/kamailio/kamailio/commit/ad1365935e2f021095e6e14aca03da5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-04T12:20:56+01:00 kamctl: dbtextdb/dbtextdb_test - do not store unused result of query --- Modified: utils/kamctl/dbtextdb/dbtextdb_test.py --- Diff: https://github.com/kamailio/kamailio/commit/ad1365935e2f021095e6e14aca03da5… Patch: https://github.com/kamailio/kamailio/commit/ad1365935e2f021095e6e14aca03da5… --- diff --git a/utils/kamctl/dbtextdb/dbtextdb_test.py b/utils/kamctl/dbtextdb/dbtextdb_test.py index 54ce274c725..8762de1b3da 100644 --- a/utils/kamctl/dbtextdb/dbtextdb_test.py +++ b/utils/kamctl/dbtextdb/dbtextdb_test.py @@ -500,7 +500,7 @@ def testExecute(self): db_conn.CleanUp() query = ('delete from unsorted_table where id = 5;') - result = db_conn.Execute(query, writethru) + db_conn.Execute(query, writethru) self.assertEqual(db_conn.data, [{'id': 1, 'user': 'fred', 'domain': 'test.com', 'number': 2125551234}, {'id': 4, 'user': 'alex', 'domain': @@ -514,7 +514,7 @@ def testExecute(self): # test insert with auto increment query = ("insert into unsorted_table set user='jake', domain='test.com'," 'number = 2125551456;') - result = db_conn.Execute(query, writethru) + db_conn.Execute(query, writethru) self.assertEqual(db_conn.data, [{'id': 1, 'user': 'fred', 'domain': 'test.com', 'number': 2125551234}, {'id': 4, 'user': 'alex', 'domain': @@ -531,7 +531,7 @@ def testExecute(self): # test insert with null value query = ("insert into test set col1='asdf';") - result = db_conn.Execute(query, writethru) + db_conn.Execute(query, writethru) self.assertEqual(db_conn.data, [{'col2': 'item2', 'id': 1, 'col1': 'item1\\:'}, {'col2': '', 'id': 2, 'col1': @@ -543,7 +543,7 @@ def testExecute(self): # test insert with null value alternate syntax query = ("insert test ( col1) values ('asdf');") - result = db_conn.Execute(query, writethru) + db_conn.Execute(query, writethru) self.assertEqual(db_conn.data, [{'col2': 'item2', 'id': 1, 'col1': 'item1\\:'}, {'col2': '', 'id': 2, 'col1': @@ -555,7 +555,7 @@ def testExecute(self): # test insert with colon inside value query = ("insert into test set col1='as:df';") - result = db_conn.Execute(query, writethru) + db_conn.Execute(query, writethru) self.assertEqual(db_conn.data, [{'col2': 'item2', 'id': 1, 'col1': 'item1\\:'}, {'col2': '', 'id': 2, 'col1': @@ -567,7 +567,7 @@ def testExecute(self): # test insert with escaped colon inside value query = ("insert into test set col1='as\:df';") - result = db_conn.Execute(query, writethru) + db_conn.Execute(query, writethru) self.assertEqual(db_conn.data, [{'col2': 'item2', 'id': 1, 'col1': 'item1\\:'}, {'col2': '', 'id': 2, 'col1': @@ -589,7 +589,7 @@ def testExecute(self): # test update with null value query = ("update test set col2='' where id = 3;") - result = db_conn.Execute(query, writethru) + db_conn.Execute(query, writethru) self.assertEqual(db_conn.data, [{'col2': 'item2', 'id': 1, 'col1': 'item1\\:'}, {'col2': '', 'id': 2, 'col1':

1 0

git:master:42b22b6e: lcr: added module prefix to db_url global variable
by Daniel-Constantin Mierla 03 Jan '24

03 Jan '24

Module: kamailio Branch: master Commit: 42b22b6e2d91d907cbf80b499b9e4380def2e652 URL: https://github.com/kamailio/kamailio/commit/42b22b6e2d91d907cbf80b499b9e438… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-03T22:18:58+01:00 lcr: added module prefix to db_url global variable - safety for symbols overlapping --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/42b22b6e2d91d907cbf80b499b9e438… Patch: https://github.com/kamailio/kamailio/commit/42b22b6e2d91d907cbf80b499b9e438… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index 4f0cfae70a9..242054ebaa4 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -135,7 +135,7 @@ gen_lock_t *reload_lock; /* database variables */ /* clang-format off */ -static str db_url = str_init(DEFAULT_RODB_URL); +static str lcr_db_url = str_init(DEFAULT_RODB_URL); static str lcr_rule_table = str_init(LCR_RULE_TABLE); static str lcr_rule_target_table = str_init(LCR_RULE_TARGET_TABLE); static str lcr_gw_table = str_init(LCR_GW_TABLE); @@ -313,7 +313,7 @@ static cmd_export_t cmds[] = { * Exported parameters */ static param_export_t params[] = { - {"db_url", PARAM_STR, &db_url}, + {"db_url", PARAM_STR, &lcr_db_url}, {"lcr_rule_table", PARAM_STR, &lcr_rule_table}, {"lcr_rule_target_table", PARAM_STR, &lcr_rule_target_table}, {"lcr_gw_table", PARAM_STR, &lcr_gw_table}, @@ -455,7 +455,7 @@ static int mod_init(void) } /* Bind database */ - if(lcr_db_bind(&db_url)) { + if(lcr_db_bind(&lcr_db_url)) { LM_ERR("no database module found\n"); return -1; } @@ -692,7 +692,7 @@ static int mod_init(void) } /* Check table version */ - if(lcr_db_init(&db_url) < 0) { + if(lcr_db_init(&lcr_db_url) < 0) { LM_ERR("unable to open database connection\n"); return -1; } @@ -1484,7 +1484,7 @@ int reload_tables() request_uri_re = from_uri_re = 0; - if(lcr_db_init(&db_url) < 0) { + if(lcr_db_init(&lcr_db_url) < 0) { LM_ERR("unable to open database connection\n"); return -1; }

1 0

git:master:f0fbf4d7: dmq: rename global variables with short name
by Daniel-Constantin Mierla 03 Jan '24

03 Jan '24

Module: kamailio Branch: master Commit: f0fbf4d74b8090614469b2a6a16f187275c4f067 URL: https://github.com/kamailio/kamailio/commit/f0fbf4d74b8090614469b2a6a16f187… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-03T22:14:32+01:00 dmq: rename global variables with short name - safety for symbols overlapping --- Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/dmq.h Modified: src/modules/dmq/dmq_funcs.c Modified: src/modules/dmq/message.c Modified: src/modules/dmq/worker.c --- Diff: https://github.com/kamailio/kamailio/commit/f0fbf4d74b8090614469b2a6a16f187… Patch: https://github.com/kamailio/kamailio/commit/f0fbf4d74b8090614469b2a6a16f187…

1 0

git:master:ae90cb48: xhttp_rpc: rename global variable with short name
by Daniel-Constantin Mierla 03 Jan '24

03 Jan '24

Module: kamailio Branch: master Commit: ae90cb489cd07aac42994fbaa124966a34cd4514 URL: https://github.com/kamailio/kamailio/commit/ae90cb489cd07aac42994fbaa124966… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-02T16:20:59+01:00 xhttp_rpc: rename global variable with short name --- Modified: src/modules/xhttp_rpc/xhttp_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/ae90cb489cd07aac42994fbaa124966… Patch: https://github.com/kamailio/kamailio/commit/ae90cb489cd07aac42994fbaa124966… --- diff --git a/src/modules/xhttp_rpc/xhttp_rpc.c b/src/modules/xhttp_rpc/xhttp_rpc.c index 1e305a91909..3b43469fd16 100644 --- a/src/modules/xhttp_rpc/xhttp_rpc.c +++ b/src/modules/xhttp_rpc/xhttp_rpc.c @@ -72,7 +72,7 @@ static int xhttp_rpc_dispatch(sip_msg_t *msg, char *s1, char *s2); * being currently processed. * @sa rpc_ctx */ -static rpc_ctx_t ctx; +static rpc_ctx_t _xhttp_rpc_ctx; static xhttp_api_t xhttp_api; @@ -841,64 +841,65 @@ static int ki_xhttp_rpc_dispatch(sip_msg_t *msg) } /* Init xhttp_rpc context */ - if(ctx.reply.buf.s) - LM_ERR("Unexpected buf value [%p][%d]\n", ctx.reply.buf.s, - ctx.reply.buf.len); - memset(&ctx, 0, sizeof(rpc_ctx_t)); - ctx.msg = msg; - ctx.mod = ctx.cmd = -1; - if(init_xhttp_rpc_reply(&ctx) < 0) + if(_xhttp_rpc_ctx.reply.buf.s) + LM_ERR("Unexpected buf value [%p][%d]\n", _xhttp_rpc_ctx.reply.buf.s, + _xhttp_rpc_ctx.reply.buf.len); + memset(&_xhttp_rpc_ctx, 0, sizeof(rpc_ctx_t)); + _xhttp_rpc_ctx.msg = msg; + _xhttp_rpc_ctx.mod = _xhttp_rpc_ctx.cmd = -1; + if(init_xhttp_rpc_reply(&_xhttp_rpc_ctx) < 0) goto send_reply; /* Extract arguments from url */ if(0 - != xhttp_rpc_parse_url( - &msg->first_line.u.request.uri, &ctx.mod, &ctx.cmd, &arg)) { - rpc_fault(&ctx, 500, "Bad URL"); + != xhttp_rpc_parse_url(&msg->first_line.u.request.uri, + &_xhttp_rpc_ctx.mod, &_xhttp_rpc_ctx.cmd, &arg)) { + rpc_fault(&_xhttp_rpc_ctx, 500, "Bad URL"); goto send_reply; } if(arg.s) { if(arg.len) { /* Unescape args */ - ctx.arg.s = pkg_malloc((arg.len + 1) * sizeof(char)); - if(ctx.arg.s == NULL) { + _xhttp_rpc_ctx.arg.s = pkg_malloc((arg.len + 1) * sizeof(char)); + if(_xhttp_rpc_ctx.arg.s == NULL) { PKG_MEM_ERROR; - rpc_fault(&ctx, 500, "Internal Server Error (oom)"); + rpc_fault(&_xhttp_rpc_ctx, 500, "Internal Server Error (oom)"); goto send_reply; } for(i = 0; i < arg.len; i++) if(arg.s[i] == '+') arg.s[i] = ' '; - if(0 > un_escape(&arg, &ctx.arg)) { + if(0 > un_escape(&arg, &_xhttp_rpc_ctx.arg)) { LM_ERR("unable to escape [%.*s]\n", arg.len, arg.s); - rpc_fault(&ctx, 500, "Bad arg in URL"); + rpc_fault(&_xhttp_rpc_ctx, 500, "Bad arg in URL"); goto send_reply; } - ctx.arg.s[ctx.arg.len] = '\0'; - ctx.arg.len++; - ctx.arg2scan = ctx.arg; + _xhttp_rpc_ctx.arg.s[_xhttp_rpc_ctx.arg.len] = '\0'; + _xhttp_rpc_ctx.arg.len++; + _xhttp_rpc_ctx.arg2scan = _xhttp_rpc_ctx.arg; } - ctx.arg_received = 1; + _xhttp_rpc_ctx.arg_received = 1; } else { goto send_reply; } /* - rpc_e=find_rpc_export((char*)rpc_sarray[xhttp_rpc_mod_cmds[ctx.mod].rpc_e_index+ctx.cmd]->name, 0); + rpc_e=find_rpc_export((char*)rpc_sarray[xhttp_rpc_mod_cmds[_xhttp_rpc_ctx.mod].rpc_e_index+_xhttp_rpc_ctx.cmd]->name, 0); if ((rpc_e==NULL) || (rpc_e->function==NULL)){ LM_ERR("Unable to find rpc command [%s]\n", - rpc_sarray[xhttp_rpc_mod_cmds[ctx.mod].rpc_e_index+ctx.cmd]->name); - rpc_fault(&ctx, 500, "Method not found"); + rpc_sarray[xhttp_rpc_mod_cmds[_xhttp_rpc_ctx.mod].rpc_e_index+_xhttp_rpc_ctx.cmd]->name); + rpc_fault(&_xhttp_rpc_ctx, 500, "Method not found"); goto send_reply; } */ - rpc_e = rpc_sarray[xhttp_rpc_mod_cmds[ctx.mod].rpc_e_index + ctx.cmd]; - rpc_e->r.function(&func_param, &ctx); + rpc_e = rpc_sarray[xhttp_rpc_mod_cmds[_xhttp_rpc_ctx.mod].rpc_e_index + + _xhttp_rpc_ctx.cmd]; + rpc_e->r.function(&func_param, &_xhttp_rpc_ctx); send_reply: - if(!ctx.reply_sent) { - ret = rpc_send(&ctx); + if(!_xhttp_rpc_ctx.reply_sent) { + ret = rpc_send(&_xhttp_rpc_ctx); } if(ret < 0) return -1;

1 0

git:master:b48c5662: p_usrloc: rename global variable with short name
by Daniel-Constantin Mierla 03 Jan '24

03 Jan '24

Module: kamailio Branch: master Commit: b48c566218b15cac62cd1cc9dc838d241de73efd URL: https://github.com/kamailio/kamailio/commit/b48c566218b15cac62cd1cc9dc838d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-02T10:41:17+01:00 p_usrloc: rename global variable with short name --- Modified: src/modules/p_usrloc/ul_db.c Modified: src/modules/p_usrloc/ul_db.h Modified: src/modules/p_usrloc/ul_db_watch.c --- Diff: https://github.com/kamailio/kamailio/commit/b48c566218b15cac62cd1cc9dc838d2… Patch: https://github.com/kamailio/kamailio/commit/b48c566218b15cac62cd1cc9dc838d2…

1 0

git:master:4af2452f: sms: renamed short global variables with common names
by Daniel-Constantin Mierla 03 Jan '24

03 Jan '24

Module: kamailio Branch: master Commit: 4af2452fa9362f4df913003370b0a5279070f372 URL: https://github.com/kamailio/kamailio/commit/4af2452fa9362f4df913003370b0a52… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-02T10:24:50+01:00 sms: renamed short global variables with common names --- Modified: src/modules/sms/sms.c Modified: src/modules/sms/sms_funcs.c Modified: src/modules/sms/sms_funcs.h --- Diff: https://github.com/kamailio/kamailio/commit/4af2452fa9362f4df913003370b0a52… Patch: https://github.com/kamailio/kamailio/commit/4af2452fa9362f4df913003370b0a52…

1 0

git:master:05bcd7a8: uac: global variable made static
by Daniel-Constantin Mierla 03 Jan '24

03 Jan '24

Module: kamailio Branch: master Commit: 05bcd7a893d2f607943eaa5ab65293e7e273de8d URL: https://github.com/kamailio/kamailio/commit/05bcd7a893d2f607943eaa5ab65293e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-01T22:23:07+01:00 uac: global variable made static - renamed to avoid symbol conflicts --- Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/05bcd7a893d2f607943eaa5ab65293e… Patch: https://github.com/kamailio/kamailio/commit/05bcd7a893d2f607943eaa5ab65293e… --- diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index b2cdaad9066..c29e9b4b90e 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -50,7 +50,7 @@ #define MAX_UACD_SIZE 128 /** TM bind */ -struct tm_binds tmb; +static struct tm_binds _uac_send_tmb = {0}; typedef struct _uac_send_info { @@ -120,7 +120,7 @@ uac_send_info_t *uac_send_info_clone(uac_send_info_t *ur) int pv_get_uac_req(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { - if(param == NULL || tmb.t_request == NULL) + if(param == NULL || _uac_send_tmb.t_request == NULL) return -1; switch(param->pvn.u.isname.name.n) { @@ -191,7 +191,7 @@ int pv_set_uac_req( { pv_value_t *tval; - if(param == NULL || tmb.t_request == NULL) + if(param == NULL || _uac_send_tmb.t_request == NULL) return -1; tval = val; @@ -545,9 +545,9 @@ int pv_parse_uac_req_name(pv_spec_p sp, str *in) void uac_req_init(void) { /* load the TM API */ - if(load_tm_api(&tmb) != 0) { + if(load_tm_api(&_uac_send_tmb) != 0) { LM_DBG("can't load TM API - disable it\n"); - memset(&tmb, 0, sizeof(struct tm_binds)); + memset(&_uac_send_tmb, 0, sizeof(struct tm_binds)); return; } memset(&_uac_req, 0, sizeof(struct _uac_send_info)); @@ -788,7 +788,7 @@ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) /* Callback parameter */ uac_r.cbp = (void *)tp; } - ret = tmb.t_request_within(&uac_r); + ret = _uac_send_tmb.t_request_within(&uac_r); if(ret < 0) { LM_ERR("failed to send request with authentication\n"); @@ -816,7 +816,7 @@ int uac_req_send(void) uac_send_info_t *tp = NULL; if(_uac_req.s_ruri.len <= 0 || _uac_req.s_method.len == 0 - || tmb.t_request == NULL) + || _uac_send_tmb.t_request == NULL) return -1; memset(&uac_r, '\0', sizeof(uac_r)); @@ -856,8 +856,8 @@ int uac_req_send(void) uac_r.cbp = (void *)tp; } uac_r.callid = (_uac_req.s_callid.len <= 0) ? NULL : &_uac_req.s_callid; - ret = tmb.t_request(&uac_r, /* UAC Req */ - &_uac_req.s_ruri, /* Request-URI */ + ret = _uac_send_tmb.t_request(&uac_r, /* UAC Req */ + &_uac_req.s_ruri, /* Request-URI */ (_uac_req.s_turi.len <= 0) ? &_uac_req.s_ruri : &_uac_req.s_turi, /* To */ (_uac_req.s_furi.len <= 0) ? &_uac_req.s_ruri

1 0

git:master:619c7fe6: domainpolicy: removed constant condition
by Daniel-Constantin Mierla 31 Dec '23

31 Dec '23

Module: kamailio Branch: master Commit: 619c7fe6db9c090ef9645ec8a39d43d00ba215bf URL: https://github.com/kamailio/kamailio/commit/619c7fe6db9c090ef9645ec8a39d43d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-31T14:06:40+01:00 domainpolicy: removed constant condition --- Modified: src/modules/domainpolicy/domainpolicy.c --- Diff: https://github.com/kamailio/kamailio/commit/619c7fe6db9c090ef9645ec8a39d43d… Patch: https://github.com/kamailio/kamailio/commit/619c7fe6db9c090ef9645ec8a39d43d… --- diff --git a/src/modules/domainpolicy/domainpolicy.c b/src/modules/domainpolicy/domainpolicy.c index 0fb0c43f617..cacd97fa627 100644 --- a/src/modules/domainpolicy/domainpolicy.c +++ b/src/modules/domainpolicy/domainpolicy.c @@ -900,14 +900,9 @@ int dp_apply_policy(struct sip_msg *_msg, char *_s1, char *_s2) } at = (char *)&(duri[0]); - len = 0; - if((len + 4) > MAX_URI_SIZE) { - LM_ERR("duri buffer to small to add uri schema\n"); - return -1; - } + len = 4; memcpy(at, "sip:", 4); at = at + 4; - len = len + 4; domain = &(_msg->parsed_uri.host); LM_DBG("domain is %.*s.\n", domain->len, ZSW(domain->s));

1 0

git:master:5bbff26c: sca: removed if on rc before being set
by Daniel-Constantin Mierla 31 Dec '23

31 Dec '23

Module: kamailio Branch: master Commit: 5bbff26ce6e95b841e69f2dffc2214318a748c36 URL: https://github.com/kamailio/kamailio/commit/5bbff26ce6e95b841e69f2dffc22143… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-31T09:35:08+01:00 sca: removed if on rc before being set - reorder some conditions on range --- Modified: src/modules/sca/sca_appearance.c Modified: src/modules/sca/sca_rpc.c Modified: src/modules/sca/sca_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/5bbff26ce6e95b841e69f2dffc22143… Patch: https://github.com/kamailio/kamailio/commit/5bbff26ce6e95b841e69f2dffc22143… --- diff --git a/src/modules/sca/sca_appearance.c b/src/modules/sca/sca_appearance.c index c467137a8d7..fcc94c4c2b6 100644 --- a/src/modules/sca/sca_appearance.c +++ b/src/modules/sca/sca_appearance.c @@ -60,7 +60,7 @@ void sca_appearance_state_to_str(int state, str *state_str) { assert(state_str != NULL); - if(state >= SCA_APPEARANCE_STATE_NAME_COUNT || state < 0) { + if(state < 0 || state >= SCA_APPEARANCE_STATE_NAME_COUNT) { state_str->len = SCA_APPEARANCE_STATE_STR_UNKNOWN.len; state_str->s = SCA_APPEARANCE_STATE_STR_UNKNOWN.s; diff --git a/src/modules/sca/sca_rpc.c b/src/modules/sca/sca_rpc.c index c3b9b0f2bae..bedfdaa0162 100644 --- a/src/modules/sca/sca_rpc.c +++ b/src/modules/sca/sca_rpc.c @@ -199,10 +199,6 @@ void sca_rpc_deactivate_all_subscriptions(rpc_t *rpc, void *ctx) rpc->rpl_printf(ctx, "Deactivating %s subscription from %.*s", sca_event_name_from_type(sub->event), STR_FMT(&sub->subscriber)); - if(rc < 0) { - // make sure we unlock below - break; - } rc = sca_notify_subscriber( sca, sub, SCA_CALL_INFO_APPEARANCE_INDEX_ANY); diff --git a/src/modules/sca/sca_subscribe.c b/src/modules/sca/sca_subscribe.c index 6e9949a5d78..895141e1e25 100644 --- a/src/modules/sca/sca_subscribe.c +++ b/src/modules/sca/sca_subscribe.c @@ -1426,7 +1426,7 @@ int sca_subscription_reply(sca_mod *scam, int status_code, char *status_msg, extra_headers.s = hdr_buf; len = snprintf(extra_headers.s, sizeof(hdr_buf), "Event: %s%s", sca_event_name_from_type(event_type), CRLF); - if(len >= sizeof(hdr_buf) || len < 0) { + if(len < 0 || len >= sizeof(hdr_buf)) { LM_ERR("sca_subscription_reply: extra headers too long\n"); return (-1); } @@ -1446,7 +1446,7 @@ int sca_subscription_reply(sca_mod *scam, int status_code, char *status_msg, len = snprintf(extra_headers.s + extra_headers.len, sizeof(hdr_buf) - extra_headers.len, "Expires: %d%s", expires, CRLF); - if(len >= (sizeof(hdr_buf) - extra_headers.len) || len < 0) { + if(len < 0 || len >= (sizeof(hdr_buf) - extra_headers.len)) { LM_ERR("sca_subscription_reply: extra headers too long\n"); return (-1); }

1 0

git:master:6c129bdc: ratelimit: removed unnecessary condition
by Daniel-Constantin Mierla 31 Dec '23

31 Dec '23

Module: kamailio Branch: master Commit: 6c129bdc87352d0d883cc46fce0b78444e619084 URL: https://github.com/kamailio/kamailio/commit/6c129bdc87352d0d883cc46fce0b784… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-31T09:22:28+01:00 ratelimit: removed unnecessary condition --- Modified: src/modules/ratelimit/ratelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/6c129bdc87352d0d883cc46fce0b784… Patch: https://github.com/kamailio/kamailio/commit/6c129bdc87352d0d883cc46fce0b784… --- diff --git a/src/modules/ratelimit/ratelimit.c b/src/modules/ratelimit/ratelimit.c index d993bbd6e98..4e327460044 100644 --- a/src/modules/ratelimit/ratelimit.c +++ b/src/modules/ratelimit/ratelimit.c @@ -1256,7 +1256,7 @@ static void rpc_set_queue(rpc_t *rpc, void *c) if(rpc->scan(c, "dSd", &queue_no, &method, &pipe_no) < 3) return; - if(pipe_no >= MAX_PIPES || (int)pipe_no < 0) { + if(pipe_no >= MAX_PIPES) { LM_ERR("Invalid pipe number: %d\n", pipe_no); rpc->fault(c, 400, "Invalid pipe number"); return;

1 0

git:master:a268f073: core: main - typos in log messages
by Daniel-Constantin Mierla 31 Dec '23

31 Dec '23

Module: kamailio Branch: master Commit: a268f073bc9716fefc35248687d793bdcc6d66b9 URL: https://github.com/kamailio/kamailio/commit/a268f073bc9716fefc35248687d793b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-30T10:15:04+01:00 core: main - typos in log messages --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/a268f073bc9716fefc35248687d793b… Patch: https://github.com/kamailio/kamailio/commit/a268f073bc9716fefc35248687d793b… --- diff --git a/src/main.c b/src/main.c index c107f354672..fc1570c3b7a 100644 --- a/src/main.c +++ b/src/main.c @@ -2193,7 +2193,7 @@ int main(int argc, char **argv) /* safety check for upper limit of 1TB */ if(l1 <= 0 || l1 > 1024L * 1024) { fprintf(stderr, - "our of limits private mem size number: -M %s\n", + "out of limits private mem size number: -M %s\n", optarg); goto error; } @@ -2333,7 +2333,7 @@ int main(int argc, char **argv) } /* safety check for upper limit of 16TB */ if(l1 <= 0 || l1 > 16L * 1024 * 1024) { - fprintf(stderr, "our of limits shmem size number: -m %s\n", + fprintf(stderr, "out of limits shmem size number: -m %s\n", optarg); goto error; }

1 0

git:master:9410ce38: core: cfg.y - check limit for shm size
by Daniel-Constantin Mierla 31 Dec '23

31 Dec '23

Module: kamailio Branch: master Commit: 9410ce3848c1ab7fa8b7ded47d090342fd4cf1c0 URL: https://github.com/kamailio/kamailio/commit/9410ce3848c1ab7fa8b7ded47d09034… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-30T10:05:29+01:00 core: cfg.y - check limit for shm size --- Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/9410ce3848c1ab7fa8b7ded47d09034… Patch: https://github.com/kamailio/kamailio/commit/9410ce3848c1ab7fa8b7ded47d09034… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index 545ca7fdc66..c357faa927d 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -1865,11 +1865,18 @@ assign_stm: | OPEN_FD_LIMIT EQUAL NUMBER { open_files_limit=$3; } | OPEN_FD_LIMIT EQUAL error { yyerror("number expected"); } | SHM_MEM_SZ EQUAL NUMBER { - if (shm_initialized()) + if (shm_initialized()) { yyerror("shm/shm_mem_size must be before any modparam or the" " route blocks"); - else if (shm_mem_size == 0 || shm_mem_size == SHM_MEM_POOL_SIZE) + } else if (shm_mem_size == 0 || shm_mem_size == SHM_MEM_POOL_SIZE) { + /* safety check for upper limit of 16TB */ + if($3 <= 0 || $3 > 16L * 1024 * 1024) { + LM_ERR("out of limits shmem size number: %ld\n", (long int)$3); + yyerror("invalid config option"); + YYABORT; + } shm_mem_size=$3 * 1024 * 1024; + } } | SHM_MEM_SZ EQUAL error { yyerror("number expected"); } | SHM_FORCE_ALLOC EQUAL NUMBER {

1 0

git:master:b59607bb: debugger: explicit cast for pointer arithmetic operation
by Daniel-Constantin Mierla 31 Dec '23

31 Dec '23

Module: kamailio Branch: master Commit: b59607bbcf6ca872e190dfcd9abf8fc5c0f64359 URL: https://github.com/kamailio/kamailio/commit/b59607bbcf6ca872e190dfcd9abf8fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-30T09:01:21+01:00 debugger: explicit cast for pointer arithmetic operation --- Modified: src/modules/debugger/debugger_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b59607bbcf6ca872e190dfcd9abf8fc… Patch: https://github.com/kamailio/kamailio/commit/b59607bbcf6ca872e190dfcd9abf8fc… --- diff --git a/src/modules/debugger/debugger_mod.c b/src/modules/debugger/debugger_mod.c index b6248644d65..c2d2dda79af 100644 --- a/src/modules/debugger/debugger_mod.c +++ b/src/modules/debugger/debugger_mod.c @@ -324,7 +324,7 @@ static struct action *dbg_fixup_get_action(void **param, int param_no) action_u_t *au; /* param points to au->u.string, get pointer to au */ au = ksr_container_of(param, action_u_t, u.string); - au = au - 1 - param_no; + au = (action_u_t *)au - 1 - param_no; /* au points to ac->val, get pointer to ac */ ac = ksr_container_of(au, cfg_action_t, val); return ac;

1 0

git:master:3d2bae35: modules: readme files regenerated - siputils ... [skip ci]
by Kamailio Dev 29 Dec '23

29 Dec '23

Module: kamailio Branch: master Commit: 3d2bae3532e496648a902dac853edf013434672f URL: https://github.com/kamailio/kamailio/commit/3d2bae3532e496648a902dac853edf0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-12-29T10:01:51+01:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/3d2bae3532e496648a902dac853edf0… Patch: https://github.com/kamailio/kamailio/commit/3d2bae3532e496648a902dac853edf0…

1 0

git:master:3d6fecc6: siputils: docs for tel2sip2() function
by Daniel-Constantin Mierla 29 Dec '23

29 Dec '23

Module: kamailio Branch: master Commit: 3d6fecc6bc6d52f56d0fdd4e075a15032da91421 URL: https://github.com/kamailio/kamailio/commit/3d6fecc6bc6d52f56d0fdd4e075a150… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-29T09:55:33+01:00 siputils: docs for tel2sip2() function --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3d6fecc6bc6d52f56d0fdd4e075a150… Patch: https://github.com/kamailio/kamailio/commit/3d6fecc6bc6d52f56d0fdd4e075a150… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index 63984c60c67..d2197b1c3f4 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -539,13 +539,15 @@ if (uri_param_rm("param1")) { <para> The conversion follows the rules in RFC 3261 section 19.1.6: <itemizedlist> - <listitem> - <para>Visual separators ( "-", ".", "(", ")" ) are removed from tel URI number before converting it to SIP URI userinfo.</para> + <listitem> + <para>Visual separators ( "-", ".", "(", ")" ) are removed + from tel URI number before converting it to SIP URI userinfo.</para> </listitem> <listitem> - <para>tel URI parameters are downcased before appending them to SIP URI userinfo</para> - </listitem> - </itemizedlist> + <para>tel URI parameters are downcased before appending them + to SIP URI userinfo</para> + </listitem> + </itemizedlist> </para> <para> The SIP URI hostpart is taken from second param @@ -569,6 +571,36 @@ tel2sip("$ru", $fd", "$ru"); tel2sip("$ru", $fd", "$ru"); # $ru: sip:+12345678;ext=200;isub=+123-456@foo.com;user=phone ... +</programlisting> + </example> + </section> + <section id="siputils.f.tel2sip2"> + <title> + <function moreinfo="none">tel2sip2(uri, hostpart, result)</function> + </title> + <para> + Alternative to sip2tel() function that tries to follow closer the RFC + requrements (e.g., sort tel: uri parameters copied to the sip: uri in + the manner defined in the standard; deletes the phone-context parameter + if it is a domain, and, takes visual separators from the phone-context + parameter if it is a telephone number). + </para> + <para> + Its parameters have the same meaning as for tel2sip(). + </para> + <para> + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, + BRANCH_ROUTE, or ONREPLY_ROUTE. + </para> + <example> + <title><function>tel2sip2</function> usage</title> + <programlisting format="linespecific"> +... +# $ru: tel:+(34)-999-888-777 +# $fu: sip:test@foo.com +tel2sip2("$ru", $fd", "$ru"); +# $ru: sip:+34999888777@foo.com;user=phone +... </programlisting> </example> </section>

1 0

git:master:366e2862: siputils: added tel2sip2() function
by Daniel-Constantin Mierla 29 Dec '23

29 Dec '23

Module: kamailio Branch: master Commit: 366e28627dc7047d4dce2aefe67b5e97b5ae6682 URL: https://github.com/kamailio/kamailio/commit/366e28627dc7047d4dce2aefe67b5e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-29T09:43:10+01:00 siputils: added tel2sip2() function - based on proposal presented at: https://github.com/kamailio/kamailio/issues/1173#issuecomment-315198949 - alternative to tel2sip() which has a simpler approach, but it does not follow all the RFC requirements. This is still kept as it proved to be useful over the years Co-authored-by: Donald Carr <doncarr(a)gmail.com> Co-authored-by: Supreeth Herle <herlesupreeth(a)gmail.com> --- Modified: src/modules/siputils/checks.c Modified: src/modules/siputils/checks.h Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/366e28627dc7047d4dce2aefe67b5e9… Patch: https://github.com/kamailio/kamailio/commit/366e28627dc7047d4dce2aefe67b5e9…

1 0

[kamailio/kamailio] ims_ipsec_pcscf: dummy AOR sip:you@kamailio.org prevents ipsec_destroy() from finding contact (Issue #3570)
by jbipre2 29 Dec '23

29 Dec '23

### Description Have two 4G UE's registered (over Open5GS CN / Amarisoft eNB): UE1 (OnePlus) connects to P-CSCF over UDP, UE2 (Huawei) connects using IPSec SA. Immediately after registration, VoLTE calls work from UE1 to UE2 and vice-versa; but after some time, only from UE2 to UE1. Calls initiated from UE1 fail with a "network error" message. Following Kamailio logfile extract shows periodic OPTIONS processing failing (cause unknown to me) leading to de-registration: ``` Sep 14 00:56:07 corsa03 p-cscf[8138]: INFO: <script>: OPTIONS to sip:67435055-f201-4c46-a31f-10b7f30c9574@10.46.0.11:5060 via sip:10.46.0.11:5060;transport=tcp... Sep 14 00:56:07 corsa03 p-cscf[8138]: INFO: <script>: OPTIONS to sip:001010000051194@10.46.0.6:31907 via sip:10.46.0.6:31907;transport=tcp... Sep 14 00:57:07 corsa03 p-cscf[8138]: INFO: <script>: OPTIONS to sip:67435055-f201-4c46-a31f-10b7f30c9574@10.46.0.11:5060 via sip:10.46.0.11:5060;transport=tcp... Sep 14 00:57:07 corsa03 p-cscf[8138]: INFO: <script>: OPTIONS to sip:001010000051194@10.46.0.6:31907 via sip:10.46.0.6:31907;transport=tcp... Sep 14 00:58:01 corsa03 p-cscf[8124]: INFO: cdp [authstatemachine.c:270]: auth_client_statefull_sm_process(): after callback of event 1 Sep 14 00:58:01 corsa03 p-cscf[8134]: INFO: cdp [authstatemachine.c:270]: auth_client_statefull_sm_process(): after callback of event 17 Sep 14 00:58:01 corsa03 p-cscf[8134]: INFO: cdp [authstatemachine.c:425]: auth_client_statefull_sm_process(): state machine: AUTH_EV_RECV_STA about to clean up Sep 14 00:58:07 corsa03 p-cscf[8138]: INFO: <script>: OPTIONS to sip:67435055-f201-4c46-a31f-10b7f30c9574@10.46.0.11:5060 via sip:10.46.0.11:5060;transport=tcp... Sep 14 00:58:07 corsa03 p-cscf[8138]: INFO: <script>: OPTIONS to sip:001010000051194@10.46.0.6:31907 via sip:10.46.0.6:31907;transport=tcp... Sep 14 00:58:37 corsa03 p-cscf[8124]: NOTICE: <script>: request sent to sip:001010000051194@10.46.0.6:31907: Fail Counter is 1 Sep 14 00:59:07 corsa03 p-cscf[8138]: INFO: <script>: OPTIONS to sip:67435055-f201-4c46-a31f-10b7f30c9574@10.46.0.11:5060 via sip:10.46.0.11:5060;transport=tcp... Sep 14 00:59:07 corsa03 p-cscf[8138]: INFO: <script>: OPTIONS to sip:001010000051194@10.46.0.6:31907 via sip:10.46.0.6:31907;transport=tcp... Sep 14 00:59:37 corsa03 p-cscf[8124]: NOTICE: <script>: request sent to sip:001010000051194@10.46.0.6:31907: Fail Counter is 2 Sep 14 01:00:07 corsa03 p-cscf[8138]: INFO: <script>: OPTIONS to sip:67435055-f201-4c46-a31f-10b7f30c9574@10.46.0.11:5060 via sip:10.46.0.11:5060;transport=tcp... Sep 14 01:00:07 corsa03 p-cscf[8138]: INFO: <script>: OPTIONS to sip:001010000051194@10.46.0.6:31907 via sip:10.46.0.6:31907;transport=tcp... Sep 14 01:00:37 corsa03 p-cscf[8124]: NOTICE: <script>: request sent to sip:001010000051194@10.46.0.6:31907: Fail Counter is 3 Sep 14 01:01:07 corsa03 p-cscf[8138]: INFO: <script>: OPTIONS to sip:67435055-f201-4c46-a31f-10b7f30c9574@10.46.0.11:5060 via sip:10.46.0.11:5060;transport=tcp... Sep 14 01:01:07 corsa03 p-cscf[8138]: INFO: <script>: OPTIONS to sip:001010000051194@10.46.0.6:31907 via sip:10.46.0.6:31907;transport=tcp... Sep 14 01:01:37 corsa03 p-cscf[8124]: NOTICE: <script>: request sent to sip:001010000051194@10.46.0.6:31907: Fail Counter is 4 Sep 14 01:01:37 corsa03 p-cscf[8124]: NOTICE: <script>: Unregistering sip:001010000051194@10.46.0.6:31907;alias=10.46.0.6~31907~2 ``` But now the dummy AOR: sip:you@kamailio.org is used by ipsec_destroy(), instead of UE2's AOR: sip:001010000051194@10.46.0.6:31907: ``` Sep 14 01:01:37 corsa03 p-cscf[8124]: NOTICE: <script>: Unregistering sip:001010000051194@10.46.0.6:31907;alias=10.46.0.6~31907~2 Sep 14 01:01:37 corsa03 p-cscf[8124]: DEBUG: ims_ipsec_pcscf [cmd.c:198]: fill_contact(): using original uri for contact filling: sip:you@kamailio.org Sep 14 01:01:37 corsa03 p-cscf[8124]: DEBUG: <core> [core/mem/q_malloc.c:373]: qm_malloc(): qm_malloc(0x7f73e298e010, 50) called from ims_ipsec_pcscf: cmd.c: fill_contact(282) Sep 14 01:01:37 corsa03 p-cscf[8124]: DEBUG: <core> [core/mem/q_malloc.c:416]: qm_malloc(): qm_malloc(0x7f73e298e010, 56) returns address 0x7f73e2c5a0f8 frag. 0x7f73e2c5a0c0 (size=56) on 1 -th hit Sep 14 01:01:37 corsa03 p-cscf[8124]: DEBUG: ims_ipsec_pcscf [cmd.c:333]: fill_contact(): SIP REQUEST fill contact with AOR [sip:you@kamailio.org], VIA [0://kamailio.org:5060], received_host [1://1.0.0.127:5060] Sep 14 01:01:37 corsa03 p-cscf[8124]: DEBUG: ims_usrloc_pcscf [usrloc.c:157]: get_aor_hash(): Returning hash: [4128780523] Sep 14 01:01:37 corsa03 p-cscf[8124]: DEBUG: ims_usrloc_pcscf [usrloc.c:148]: get_hash_slot(): Returning hash slot: [235] Sep 14 01:01:37 corsa03 p-cscf[8124]: DEBUG: ims_usrloc_pcscf [udomain.c:459]: get_pcontact_from_cache(): Searching for contact with AOR [sip:you@kamailio.org] in P-CSCF usrloc based on VIA [0://kamailio.org:5060] Received [1://1.0.0.127:5060], Search flag is 0, reverse_search 0 Sep 14 01:01:37 corsa03 p-cscf[8124]: DEBUG: ims_usrloc_pcscf [udomain.c:469]: get_pcontact_from_cache(): Have an AOR to search for Sep 14 01:01:37 corsa03 p-cscf[8124]: DEBUG: ims_usrloc_pcscf [udomain.c:474]: get_pcontact_from_cache(): checking for rinstance Sep 14 01:01:37 corsa03 p-cscf[8124]: DEBUG: ims_usrloc_pcscf [usrloc.c:157]: get_aor_hash(): Returning hash: [4128780523] Sep 14 01:01:37 corsa03 p-cscf[8124]: DEBUG: ims_usrloc_pcscf [udomain.c:509]: get_pcontact_from_cache(): get_pcontact slot is [235] Sep 14 01:01:37 corsa03 p-cscf[8124]: DEBUG: ims_usrloc_pcscf [udomain.c:642]: get_pcontact_from_cache(): contact not found in memory Sep 14 01:01:37 corsa03 p-cscf[8124]: ERROR: ims_ipsec_pcscf [cmd.c:1062]: ipsec_destroy(): Contact doesn't exist ``` I assume that ipsec_destroy() determines that the contact doesn't exist, so no change can be made to any SA. The ipsec_destroy() function call in pcscf/kamailio.cfg is used as follows: ``` event_route[uac:reply] { #!ifdef WITH_DEBUG xnotice("request sent to $uac_req(ruri) completed with code: $uac_req(evcode), Type $uac_req(evtype)\n"); #!endif if (($uac_req(evtype) != 1) || ($uac_req(evcode) != 200)) { if ($sht(natpingfail=>$uac_req(ouri)) == $null) { $sht(natpingfail=>$uac_req(ouri)) = 1; } else { $sht(natpingfail=>$uac_req(ouri)) = $sht(natpingfail=>$uac_req(ouri)) + 1; } xnotice(" request sent to $uac_req(ruri): Fail Counter is $sht(natpingfail=>$uac_req(ouri))\n"); if ($sht(natpingfail=>$uac_req(ouri)) > 3) { if ($(uac_req(ouri){uri.transport}) == "tcp") { $var(alias) = "alias="+$(uac_req(ouri){uri.host})+"~"+$(uac_req(ouri){uri.port})+"~2"; } else if ($(uac_req(ouri){uri.transport}) == "tls") { $var(alias) = "alias="+$(uac_req(ouri){uri.host})+"~"+$(uac_req(ouri){uri.port})+"~3"; } else { $var(alias) = "alias="+$(uac_req(ouri){uri.host})+"~"+$(uac_req(ouri){uri.port})+"~1"; } xnotice(" Unregistering $uac_req(ruri);$var(alias)\n"); setdebug("9"); ipsec_destroy("location"); pcscf_unregister("location", "$uac_req(ruri);$var(alias)", "$(uac_req(ouri){uri.host})", "$(uac_req(ouri){uri.port})"); resetdebug(); sht_lock("natping=>natpinglock"); $sht(natping=>$uac_req(ouri)) = $null; sht_unlock("natping=>natpinglock"); sht_lock("natpingfrom=>natpingfromlock"); $sht(natpingfrom=>$uac_req(ouri)) = $null; sht_unlock("natpingfrom=>natpingfromlock"); $sht(natpingfail=>$uac_req(ouri)) = $null; } } else { $sht(natpingfail=>$uac_req(ouri)) = $null; } } ``` How do I ensure that ipsec_destroy() receives a real AOR, and not the dummy (default?) value sip:you@kamailio.org? ### Additional Information ``` 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 on 17:01:00 Aug 12 2023 with x86_64-pc-linux-gnu-gcc 13.2.0 ``` * **Operating System**: ``` Linux corsa03 6.5.2-gentoo-x86_64 #2 SMP PREEMPT_DYNAMIC Thu Sep 7 15:16:58 CEST 2023 x86_64 AMD EPYC 7513 32-Core Processor AuthenticAMD GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3570 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3570(a)github.com>

4 11

git:master:453a8f1e: pike: renamed short common name global variable
by Daniel-Constantin Mierla 28 Dec '23

28 Dec '23

Module: kamailio Branch: master Commit: 453a8f1e2ae10d765790ddafe92bcaaf7f5b9c32 URL: https://github.com/kamailio/kamailio/commit/453a8f1e2ae10d765790ddafe92bcaa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-28T16:44:20+01:00 pike: renamed short common name global variable --- Modified: src/modules/pike/pike_top.c --- Diff: https://github.com/kamailio/kamailio/commit/453a8f1e2ae10d765790ddafe92bcaa… Patch: https://github.com/kamailio/kamailio/commit/453a8f1e2ae10d765790ddafe92bcaa… --- diff --git a/src/modules/pike/pike_top.c b/src/modules/pike/pike_top.c index a5126760a3a..bf450ee5584 100644 --- a/src/modules/pike/pike_top.c +++ b/src/modules/pike/pike_top.c @@ -33,7 +33,7 @@ static struct TopListItem_t *top_list_root = 0; static struct TopListItem_t *top_list_iter = 0; -static char buff[PIKE_BUFF_SIZE]; +static char _pike_top_buff[PIKE_BUFF_SIZE]; struct TopListItem_t *pike_top_get_root() { @@ -72,7 +72,8 @@ char *pike_top_print_addr( /* if you do not need global buffer, you can use this simpler call */ static char *print_addr(unsigned char *ip, int iplen) { - return pike_top_print_addr(ip, iplen, buff, sizeof(buff)); + return pike_top_print_addr( + ip, iplen, _pike_top_buff, sizeof(_pike_top_buff)); } int pike_top_add_entry(unsigned char *ip_addr, int addr_len, @@ -88,8 +89,8 @@ int pike_top_add_entry(unsigned char *ip_addr, int addr_len, print_addr(ip_addr, addr_len); DBG("pike_top_add_enrty(ip: %s, leaf_hits[%d,%d], hits[%d,%d]," " expires: %d, status: %d)", - buff, leaf_hits[0], leaf_hits[1], hits[0], hits[1], expires, - status); + _pike_top_buff, leaf_hits[0], leaf_hits[1], hits[0], hits[1], + expires, status); assert(new_item != 0); memset((void *)new_item, 0, sizeof(struct TopListItem_t)); @@ -123,5 +124,5 @@ void pike_top_list_clear() top_list_iter = ptr; } top_list_root = 0; - memset(buff, 0, sizeof(buff)); + memset(_pike_top_buff, 0, sizeof(_pike_top_buff)); }

1 0

git:master:a1289520: pike: use buffer size parameter in pike_top_print_addr()
by Daniel-Constantin Mierla 28 Dec '23

28 Dec '23

Module: kamailio Branch: master Commit: a12895208595d966cc3d4ab06358c511d0222031 URL: https://github.com/kamailio/kamailio/commit/a12895208595d966cc3d4ab06358c51… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-28T14:25:51+01:00 pike: use buffer size parameter in pike_top_print_addr() --- Modified: src/modules/pike/pike_top.c --- Diff: https://github.com/kamailio/kamailio/commit/a12895208595d966cc3d4ab06358c51… Patch: https://github.com/kamailio/kamailio/commit/a12895208595d966cc3d4ab06358c51… --- diff --git a/src/modules/pike/pike_top.c b/src/modules/pike/pike_top.c index 0d9a5218e4c..a5126760a3a 100644 --- a/src/modules/pike/pike_top.c +++ b/src/modules/pike/pike_top.c @@ -41,33 +41,32 @@ struct TopListItem_t *pike_top_get_root() } char *pike_top_print_addr( - unsigned char *ip, int iplen, char *buff, int buffsize) + unsigned char *ip, int iplen, char *obuff, int obuffsize) { unsigned short *ipv6_ptr = (unsigned short *)ip; - int bsize; int blen; - bsize = PIKE_BUFF_SIZE * sizeof(char); - memset(buff, 0, bsize); + memset(obuff, 0, obuffsize); - DBG("pike:top:print_addr(iplen: %d, buffsize: %d)", iplen, buffsize); + DBG("address iplen: %d, buffsize: %d", iplen, obuffsize); if(iplen == 4) { - inet_ntop(AF_INET, ip, buff, buffsize); + inet_ntop(AF_INET, ip, obuff, obuffsize); } else if(iplen == 16) { - inet_ntop(AF_INET6, ip, buff, buffsize); + inet_ntop(AF_INET6, ip, obuff, obuffsize); } else { - blen = snprintf(buff, bsize, "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x", - htons(ipv6_ptr[0]), htons(ipv6_ptr[1]), htons(ipv6_ptr[2]), - htons(ipv6_ptr[3]), htons(ipv6_ptr[4]), htons(ipv6_ptr[5]), - htons(ipv6_ptr[6]), htons(ipv6_ptr[7])); - if(blen < 0 || blen >= bsize) { + blen = snprintf(obuff, obuffsize, + "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x", htons(ipv6_ptr[0]), + htons(ipv6_ptr[1]), htons(ipv6_ptr[2]), htons(ipv6_ptr[3]), + htons(ipv6_ptr[4]), htons(ipv6_ptr[5]), htons(ipv6_ptr[6]), + htons(ipv6_ptr[7])); + if(blen < 0 || blen >= obuffsize) { LM_ERR("failed to print the address - reset it\n"); - memset(buff, 0, bsize); + memset(obuff, 0, obuffsize); } } - return buff; + return obuff; } /* if you do not need global buffer, you can use this simpler call */

1 0

[kamailio/kamailio] cdp: add destination realm avp only if not present (PR #3692)
by Supreeth Herle 28 Dec '23

28 Dec '23

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR fixes duplicate "Destination-Realm" AVP being added to Session Termination Request Diameter message sent over Rx interface You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3692 -- Commit Summary -- * cdp: add destination realm avp only if not present -- File Changes -- M src/modules/cdp/authstatemachine.c (32) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3692.patch https://github.com/kamailio/kamailio/pull/3692.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3692 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3692(a)github.com>

2 2

git:master:159282d6: cdp: add destination realm avp only if not present
by Daniel-Constantin Mierla 28 Dec '23

28 Dec '23

Module: kamailio Branch: master Commit: 159282d6bd05b73961037b753e0a9df5ac9cdbe3 URL: https://github.com/kamailio/kamailio/commit/159282d6bd05b73961037b753e0a9df… Author: herlesupreeth <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-28T11:10:36+01:00 cdp: add destination realm avp only if not present --- Modified: src/modules/cdp/authstatemachine.c --- Diff: https://github.com/kamailio/kamailio/commit/159282d6bd05b73961037b753e0a9df… Patch: https://github.com/kamailio/kamailio/commit/159282d6bd05b73961037b753e0a9df… --- diff --git a/src/modules/cdp/authstatemachine.c b/src/modules/cdp/authstatemachine.c index 4a8d6f12ed9..a5aadb1c274 100644 --- a/src/modules/cdp/authstatemachine.c +++ b/src/modules/cdp/authstatemachine.c @@ -751,7 +751,7 @@ void auth_server_stateless_sm_process( int dup_routing_avps(AAAMessage *src, AAAMessage *dest) { - AAA_AVP *avp; + AAA_AVP *avp, *avp2; str dest_realm; if(!src) @@ -782,18 +782,24 @@ int dup_routing_avps(AAAMessage *src, AAAMessage *dest) LM_DBG("dup_routing_avps: Origin Realm AVP present, duplicating %.*s\n", avp->data.len, avp->data.s); dest_realm = avp->data; - avp = AAACreateAVP(AVP_Destination_Realm, AAA_AVP_FLAG_MANDATORY, 0, - dest_realm.s, dest_realm.len, AVP_DUPLICATE_DATA); - if(!avp) { - LM_ERR("dup_routing_avps: Failed creating Destination Host avp\n"); - goto error; - } - if(AAAAddAVPToMessage(dest, avp, dest->avpList.tail) - != AAA_ERR_SUCCESS) { - LM_ERR("dup_routing_avps: Failed adding Destination Host avp to " - "message\n"); - AAAFreeAVP(&avp); - goto error; + avp2 = AAAFindMatchingAVP(src, src->avpList.head, AVP_Destination_Realm, + 0, AAA_FORWARD_SEARCH); + if(!avp2) { + avp = AAACreateAVP(AVP_Destination_Realm, AAA_AVP_FLAG_MANDATORY, 0, + dest_realm.s, dest_realm.len, AVP_DUPLICATE_DATA); + if(!avp) { + LM_ERR("dup_routing_avps: Failed creating Destination Realm " + "avp\n"); + goto error; + } + if(AAAAddAVPToMessage(dest, avp, dest->avpList.tail) + != AAA_ERR_SUCCESS) { + LM_ERR("dup_routing_avps: Failed adding Destination Realm avp " + "to " + "message\n"); + AAAFreeAVP(&avp); + goto error; + } } }

1 0

[kamailio/kamailio] cdp: fix disabled parts for openssl version newer than 1.1.0 (PR #3691)
by Supreeth Herle 28 Dec '23

28 Dec '23

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR fixes the disabled parts of the TLS code in cdp module which resulted in getting an error (**undefined symbol init_ssl_methods**) whenever cdp module was loaded and following openssl version was used. ``` openssl version OpenSSL 1.1.1f 31 Mar 2020 ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3691 -- Commit Summary -- * cdp: fix disabled parts for openssl version newer than 1.1.0 -- File Changes -- M src/modules/cdp/cdp_tls.c (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3691.patch https://github.com/kamailio/kamailio/pull/3691.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3691 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3691(a)github.com>

2 2

git:master:7b9e90e0: cdp: fix disabled parts for openssl version newer than 1.1.0
by Daniel-Constantin Mierla 28 Dec '23

28 Dec '23

Module: kamailio Branch: master Commit: 7b9e90e06f95b4192fb40ed2c4854a8554fac45b URL: https://github.com/kamailio/kamailio/commit/7b9e90e06f95b4192fb40ed2c4854a8… Author: herlesupreeth <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-28T11:09:47+01:00 cdp: fix disabled parts for openssl version newer than 1.1.0 --- Modified: src/modules/cdp/cdp_tls.c --- Diff: https://github.com/kamailio/kamailio/commit/7b9e90e06f95b4192fb40ed2c4854a8… Patch: https://github.com/kamailio/kamailio/commit/7b9e90e06f95b4192fb40ed2c4854a8… --- diff --git a/src/modules/cdp/cdp_tls.c b/src/modules/cdp/cdp_tls.c index 3f1c15fd182..a3cfdfa9252 100644 --- a/src/modules/cdp/cdp_tls.c +++ b/src/modules/cdp/cdp_tls.c @@ -1,4 +1,3 @@ -#if OPENSSL_VERSION_NUMBER >= 0x10100000L #include "cdp_tls.h" cfg_option_t methods[] = {{"TLSv1", .val = TLS_USE_TLSv1}, @@ -14,6 +13,7 @@ cfg_option_t methods[] = {{"TLSv1", .val = TLS_USE_TLSv1}, tls_methods_t tls_methods[TLS_METHOD_MAX]; +#if OPENSSL_VERSION_NUMBER >= 0x10100000L void init_ssl_methods(void) { /* openssl 1.1.0+ */ @@ -76,10 +76,12 @@ void init_ssl_methods(void) tls_methods[TLS_USE_TLSv1_3_PLUS - 1].TLSMethodMin = TLS1_3_VERSION; #endif } +#endif /* * Convert TLS method string to integer */ +#if OPENSSL_VERSION_NUMBER >= 0x10100000L int tls_parse_method(str *m) { cfg_option_t *opt; @@ -95,7 +97,9 @@ int tls_parse_method(str *m) return opt->val; } +#endif +#if OPENSSL_VERSION_NUMBER >= 0x10100000L SSL_CTX *init_ssl_ctx(int method) { SSL_CTX *ctx; @@ -131,7 +135,9 @@ SSL_CTX *init_ssl_ctx(int method) } return ctx; } +#endif +#if OPENSSL_VERSION_NUMBER >= 0x10100000L int load_certificates(SSL_CTX *ctx, str *cert, str *key) { str cert_fixed = STR_NULL; @@ -163,6 +169,7 @@ int load_certificates(SSL_CTX *ctx, str *cert, str *key) } return 0; } +#endif /* * Get any leftover errors from OpenSSL and print them. @@ -170,6 +177,7 @@ int load_certificates(SSL_CTX *ctx, str *cert, str *key) * This is useful to call before any SSL_* IO calls to make sure * we don't have any leftover errors from previous calls (OpenSSL docs). */ +#if OPENSSL_VERSION_NUMBER >= 0x10100000L void cdp_openssl_clear_errors(void) { int i; @@ -179,7 +187,9 @@ void cdp_openssl_clear_errors(void) LM_INFO("clearing leftover error before SSL_* calls: %s\n", err); } } +#endif +#if OPENSSL_VERSION_NUMBER >= 0x10100000L SSL *init_ssl_conn(int client_fd, SSL_CTX *ctx) { X509 *cert = NULL; @@ -237,14 +247,18 @@ SSL *init_ssl_conn(int client_fd, SSL_CTX *ctx) return NULL; } +#endif +#if OPENSSL_VERSION_NUMBER >= 0x10100000L void cleanup_ssl(SSL_CTX *tls_ctx, SSL *tls_conn) { SSL_shutdown(tls_conn); SSL_free(tls_conn); SSL_CTX_free(tls_ctx); } +#endif +#if OPENSSL_VERSION_NUMBER >= 0x10100000L int to_ssl(SSL_CTX **tls_ctx_p, SSL **tls_conn_p, int tcp_sock, int method) { *tls_ctx_p = init_ssl_ctx(method); @@ -273,4 +287,4 @@ int to_ssl(SSL_CTX **tls_ctx_p, SSL **tls_conn_p, int tcp_sock, int method) } return 0; } -#endif \ No newline at end of file +#endif

1 0

[kamailio/kamailio] smsops: fix utf8 to ucs2 conversion (PR #3690)
by Supreeth Herle 28 Dec '23

28 Dec '23

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Fixes the conversion fro UTF-8 to UCS-2 conversion when SMS is sent with emojis You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3690 -- Commit Summary -- * smsops: fix utf8 to ucs2 conversion -- File Changes -- M src/modules/smsops/smsops_impl.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3690.patch https://github.com/kamailio/kamailio/pull/3690.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3690 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3690(a)github.com>

2 2

git:master:61d91d7a: smsops: fix utf8 to ucs2 conversion
by Daniel-Constantin Mierla 28 Dec '23

28 Dec '23

Module: kamailio Branch: master Commit: 61d91d7a684df73a328c3062653522a7439d4d61 URL: https://github.com/kamailio/kamailio/commit/61d91d7a684df73a328c3062653522a… Author: herlesupreeth <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-28T11:08:38+01:00 smsops: fix utf8 to ucs2 conversion --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/61d91d7a684df73a328c3062653522a… Patch: https://github.com/kamailio/kamailio/commit/61d91d7a684df73a328c3062653522a… --- diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c index 703092542b0..9ed55328d8e 100644 --- a/src/modules/smsops/smsops_impl.c +++ b/src/modules/smsops/smsops_impl.c @@ -606,17 +606,17 @@ int utf8_to_ucs2(char *utf8, int utf8_len, char *ucs2, int buffer_len) } else if((utf8_char & 0xF0) == 0xE0) { // Three-byte UTF-8 character codepoint = ((utf8_char & 0x0F) << 12) - | (((unsigned char)utf8[utf8_index + 1] & 0x3F) << 6) - | ((unsigned char)utf8[utf8_index + 2] & 0x3F); + | (((unsigned char)utf8[utf8_index] & 0x3F) << 6) + | ((unsigned char)utf8[utf8_index + 1] & 0x3F); utf8_index += 2; tmp_buff[ucs2_index++] = (uint8_t)(codepoint >> 8); tmp_buff[ucs2_index++] = (uint8_t)(codepoint & 0xFF); } else if((utf8_char & 0xF8) == 0xF0) { // Four-byte UTF-8 character codepoint = ((utf8_char & 0x07) << 18) - | (((unsigned char)utf8[utf8_index + 1] & 0x3F) << 12) - | (((unsigned char)utf8[utf8_index + 2] & 0x3F) << 6) - | ((unsigned char)utf8[utf8_index + 3] & 0x3F); + | (((unsigned char)utf8[utf8_index] & 0x3F) << 12) + | (((unsigned char)utf8[utf8_index + 1] & 0x3F) << 6) + | ((unsigned char)utf8[utf8_index + 2] & 0x3F); utf8_index += 3; // Convert to UCS-2 surrogate pair codepoint -= 0x10000;

1 0

[kamailio/kamailio] ims_ipsec_pcscf: reset destination URI after value is used to decide … (PR #3689)
by Supreeth Herle 28 Dec '23

28 Dec '23

…destination protocol to use   #### 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) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This commits rearrange the place where destination URI was resetted. This was needed because the value was used to decide destination protocol to use. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3689 -- Commit Summary -- * ims_ipsec_pcscf: reset destination URI after value is used to decide destination protocol to use -- File Changes -- M src/modules/ims_ipsec_pcscf/cmd.c (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3689.patch https://github.com/kamailio/kamailio/pull/3689.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3689 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3689(a)github.com>

2 4

git:master:75de09f3: ims_ipsec_pcscf: reset destination URI after value is used to decide destination protocol to use
by Daniel-Constantin Mierla 28 Dec '23

28 Dec '23

Module: kamailio Branch: master Commit: 75de09f369abad7192c853e74c99741feadec619 URL: https://github.com/kamailio/kamailio/commit/75de09f369abad7192c853e74c99741… Author: herlesupreeth <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-28T11:07:40+01:00 ims_ipsec_pcscf: reset destination URI after value is used to decide destination protocol to use --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/75de09f369abad7192c853e74c99741… Patch: https://github.com/kamailio/kamailio/commit/75de09f369abad7192c853e74c99741… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index de61ad7cf6b..47f9e401702 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -1016,13 +1016,6 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) // from URI //int uri_len = 4 /* strlen("sip:") */ + ci.via_host.len + 5 /* max len of port number */ ; - if(!(_cflags & IPSEC_NODSTURI_RESET) && (m->dst_uri.s != NULL)) { - LM_DBG("resetting dst uri [%.*s]\n", m->dst_uri.len, m->dst_uri.s); - pkg_free(m->dst_uri.s); - m->dst_uri.s = NULL; - m->dst_uri.len = 0; - } - if(_cflags & IPSEC_FORWARD_USEVIA) { vb = cscf_get_last_via(m); } @@ -1119,6 +1112,13 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) } } + if(!(_cflags & IPSEC_NODSTURI_RESET) && (m->dst_uri.s != NULL)) { + LM_DBG("resetting dst uri [%.*s]\n", m->dst_uri.len, m->dst_uri.s); + pkg_free(m->dst_uri.s); + m->dst_uri.s = NULL; + m->dst_uri.len = 0; + } + if(!(_cflags & IPSEC_NODSTURI_RESET)) { char buf[1024]; int buf_len;

1 0

[kamailio/kamailio] Dialogs loaded from the DB are no longer saved. (Issue #3669)
by Dennis 28 Dec '23

28 Dec '23

Hi ! ### Description I have а scenario where dialogs are saved at kamailio shutdown and loaded at startup, the dialog module related configuration: modparam("dialog", "db_url", DBURL) modparam("dialog", "db_mode", 3) When kamailio shut down first time all dialogs a saved in DB, upon startup they loaded as expected, but when in some resonable short time kamailio shutdowned again with active dialogs loaded at startup, they not saved in DB. I think this happens because the dialog dflags in load_dialog_info_from_db function set to zero after dialog loaded, so in update_dialog_dbinfo_unsafe such dialogs are ignored (no DLG_FLAG_NEW, no DLG_FLAG_CHANGED set). #### Debugging Data Before shutdown: kamcmd> dlg.list { h_entry: 521 h_id: 11463 ref: 2 call-id: 7z32YR9BCg from_uri: sip:XXXXX@[XXXX:XXXX:b081:1320::1:2c] to_uri: sip:YYYYY@[XXXX:XXXX:0:201d::a1] state: 4 start_ts: 1702137597 init_ts: 1702137595 end_ts: 0 duration: 18 timeout: 1702144797 lifetime: 7200 **dflags: 643** sflags: 0 iflags: 0 ..... After startup: kamcmd> dlg.list { h_entry: 521 h_id: 11463 ref: 2 call-id: 7z32YR9BCg from_uri: sip:XXXXX@[XXXX:XXXX:b081:1320::1:2c] to_uri: sip:YYYYY@[XXXX:XXXX:0:201d::a1] state: 4 start_ts: 1702137597 init_ts: 1702137636 end_ts: 0 duration: 46 timeout: 1702144798 lifetime: 7201 **dflags: 0** sflags: 0 iflags: 0 .... ### Possible Solutions At first glance, it's easy to set dlg->flags = DLG_FLAG_CHANGED (or may be to DLG_FLAG_NEW|DLG_FLAG_CHANGED) after loading from the database in load_dialog_info_from_db function, but I'm not sure if this could break anything else (e.g. DMQ). ### Additional Information * **Kamailio Version** - kamailio 5.7.2 (x86_64/linux) * **Operating System**: Ubuntu 18.04.6 LTS -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3669 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3669(a)github.com>

4 10

[kamailio/kamailio] Fixed saving dialogs on shutdown that are already loaded at startup in db_mode 3 (PR #3688)
by Dennis 28 Dec '23

28 Dec '23

…tartup when using db_mode 3 - The dialogs that loaded at startup are not saved in DB on shutdown, and so not loaded at restart, fixes issue #3669   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3688 -- Commit Summary -- * dialog: fixed saving dialogs on shutdown that are already loaded at startup when using db_mode 3 -- File Changes -- M src/modules/dialog/dlg_db_handler.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3688.patch https://github.com/kamailio/kamailio/pull/3688.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3688 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3688(a)github.com>

3 7

git:master:2d00ce54: dialog: fixed saving dialogs on shutdown that are already loaded at startup when using db_mode 3
by Daniel-Constantin Mierla 28 Dec '23

28 Dec '23

Module: kamailio Branch: master Commit: 2d00ce546bb0852dc1784d5bc2e794d06f919577 URL: https://github.com/kamailio/kamailio/commit/2d00ce546bb0852dc1784d5bc2e794d… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-28T11:06:12+01:00 dialog: fixed saving dialogs on shutdown that are already loaded at startup when using db_mode 3 - The dialogs that loaded at startup are not saved in DB on shutdown, and so not loaded at restart, fixes issue #3669 --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/2d00ce546bb0852dc1784d5bc2e794d… Patch: https://github.com/kamailio/kamailio/commit/2d00ce546bb0852dc1784d5bc2e794d… --- diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index ecfd872504f..b6fe1afda6f 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -509,6 +509,9 @@ int load_dialog_info_from_db( get_ticks()); dlg->dflags = 0; + if(mode == 0 && dlg_db_mode == DB_MODE_SHUTDOWN) { + dlg->dflags |= DLG_FLAG_NEW; + } if(mode != 0) { if(loaded_extra < DLG_MAX_DB_LOAD_EXTRA) {

1 0

[kamailio/kamailio] haproxy parser: wrong values (Issue #3683)
by sergey-safarov 28 Dec '23

28 Dec '23

### Description Found error in the haproxy protocol parser Does not properly parsed ``` $rcv(rcvip) $rcv(srcport) $rcv(rcvport) ``` #### Reproduction This can be tested suing config file ``` #!define IPV6_ADDR ::1 tcp_accept_haproxy=yes received_route_mode=1 listen=tcp:[IPV6_ADDR]:45060 loadmodule "xlog.so" loadmodule "pv.so" event_route[core:msg-received] { xerr("Source IP: $rcv(srcip)\n"); xerr("Received socket: $rcv(rcvip)\n"); xerr("Source port: $rcv(srcport)\n"); xerr("Received port: $rcv(rcvport)\n"); } request_route { drop; } ``` Then required send call via haproxy server ```sh sipp -l 1 -m 1 -t t1 -sn uac [2600::5] ``` #### Log Messages ``` 4(1749405) ERROR: <script>: Source IP: 2600:xxx:6d5:aa02::c3 4(1749405) ERROR: <script>: Received socket: 2600:xxx:6d5:aa02::c3 4(1749405) ERROR: <script>: Source port: 50707 4(1749405) ERROR: <script>: Received port: 50195 ``` Here is `received socket` contains "source ip" and porst parsed in the reverse order. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3683 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3683(a)github.com>

2 1

git:master:c5237830: core: fixed haproxy protocol parser
by Daniel-Constantin Mierla 28 Dec '23

28 Dec '23

Module: kamailio Branch: master Commit: c5237830f3e7fbeec403a0190471a066081c1117 URL: https://github.com/kamailio/kamailio/commit/c5237830f3e7fbeec403a0190471a06… Author: Nikolay Ivanuschak <ivanuschak.nikolay(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-28T11:05:14+01:00 core: fixed haproxy protocol parser fixes GH #3683 --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/c5237830f3e7fbeec403a0190471a06… Patch: https://github.com/kamailio/kamailio/commit/c5237830f3e7fbeec403a0190471a06… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 4972b7d20af..35034d1baa8 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1018,12 +1018,12 @@ int tcpconn_read_haproxy(struct tcp_connection *c) src_ip->af = AF_INET; src_ip->len = 4; src_ip->u.addr32[0] = hdr.v2.addr.ip4.src_addr; - c->rcv.src_port = hdr.v2.addr.ip4.src_port; + c->rcv.src_port = htons(hdr.v2.addr.ip4.src_port); dst_ip->af = AF_INET; dst_ip->len = 4; dst_ip->u.addr32[0] = hdr.v2.addr.ip4.dst_addr; - c->rcv.dst_port = hdr.v2.addr.ip4.dst_port; + c->rcv.dst_port = htons(hdr.v2.addr.ip4.dst_port); goto done; @@ -1031,12 +1031,12 @@ int tcpconn_read_haproxy(struct tcp_connection *c) src_ip->af = AF_INET6; src_ip->len = 16; memcpy(src_ip->u.addr, hdr.v2.addr.ip6.src_addr, 16); - c->rcv.src_port = hdr.v2.addr.ip6.src_port; + c->rcv.src_port = htons(hdr.v2.addr.ip6.src_port); dst_ip->af = AF_INET6; dst_ip->len = 16; - memcpy(dst_ip->u.addr, hdr.v2.addr.ip6.src_addr, 16); - c->rcv.dst_port = hdr.v2.addr.ip6.dst_port; + memcpy(dst_ip->u.addr, hdr.v2.addr.ip6.dst_addr, 16); + c->rcv.dst_port = htons(hdr.v2.addr.ip6.dst_port); goto done;

1 0

[kamailio/kamailio] core: fixed haproxy protocol parser (PR #3685)
by sergey-safarov 28 Dec '23

28 Dec '23

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

2 2

git:master:23a1d067: dialog: rename function parameter to avoid shadowing of global variable
by Daniel-Constantin Mierla 28 Dec '23

28 Dec '23

Module: kamailio Branch: master Commit: 23a1d06737fa6d2509b6f88574ad171aa32cf275 URL: https://github.com/kamailio/kamailio/commit/23a1d06737fa6d2509b6f88574ad171… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-28T10:21:01+01:00 dialog: rename function parameter to avoid shadowing of global variable --- Modified: src/modules/dialog/dlg_profile.c --- Diff: https://github.com/kamailio/kamailio/commit/23a1d06737fa6d2509b6f88574ad171… Patch: https://github.com/kamailio/kamailio/commit/23a1d06737fa6d2509b6f88574ad171… --- diff --git a/src/modules/dialog/dlg_profile.c b/src/modules/dialog/dlg_profile.c index 5dd3b372d49..43aee6278e0 100644 --- a/src/modules/dialog/dlg_profile.c +++ b/src/modules/dialog/dlg_profile.c @@ -70,21 +70,21 @@ static sruid_t _dlg_profile_sruid; /*! * \brief Add profile definitions to the global list * \see new_dlg_profile - * \param profiles profile name + * \param profiledef profile name * \param has_value set to 0 for a profile without value, otherwise it has a value * \return 0 on success, -1 on failure */ -int add_profile_definitions(char *profiles, unsigned int has_value) +int add_profile_definitions(char *profiledef, unsigned int has_value) { char *p; char *d; str name; unsigned int i; - if(profiles == NULL || strlen(profiles) == 0) + if(profiledef == NULL || strlen(profiledef) == 0) return 0; - p = profiles; + p = profiledef; do { /* locate name of profile */ name.s = p;

1 0

git:master:4b862326: timer: rename local variable to avoid shadowing global
by Daniel-Constantin Mierla 27 Dec '23

27 Dec '23

Module: kamailio Branch: master Commit: 4b862326cce4b16154353d393d60c8f12762da86 URL: https://github.com/kamailio/kamailio/commit/4b862326cce4b16154353d393d60c8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-27T12:09:26+01:00 timer: rename local variable to avoid shadowing global --- Modified: src/modules/timer/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/4b862326cce4b16154353d393d60c8f… Patch: https://github.com/kamailio/kamailio/commit/4b862326cce4b16154353d393d60c8f… --- diff --git a/src/modules/timer/timer.c b/src/modules/timer/timer.c index a7741496626..2f3f1b1bf34 100644 --- a/src/modules/timer/timer.c +++ b/src/modules/timer/timer.c @@ -88,12 +88,12 @@ static timer_action_t *timer_executed = 0; } static timer_action_t *find_action_by_name( - timer_action_t *timer_actions, char *name, int len) + timer_action_t *timer_actions_list, char *name, int len) { timer_action_t *a; if(len == -1) len = strlen(name); - for(a = timer_actions; a; a = a->next) { + for(a = timer_actions_list; a; a = a->next) { if(a->timer_name && strlen(a->timer_name) == len && strncmp(name, a->timer_name, len) == 0) return a;

1 0

[kamailio/kamailio] tm: Reset local_response_sent_lookup (PR #3687)
by Xenofon Karamanos 27 Dec '23

27 Dec '23

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #3064 (replace XXXX with an open issue number) #### Description  This PR fixes #3064. It resets the check variable back to 0 after sending a tm:local-response reply. As of currently, event_route[tm:local-response] will be called only max `children` times (one for each) and then won't process any more. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3687 -- Commit Summary -- * tm: Reset local_response_sent_lookup -- File Changes -- M src/modules/tm/t_reply.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3687.patch https://github.com/kamailio/kamailio/pull/3687.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3687 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3687(a)github.com>

2 3

git:master:9c72487c: sipcature: rename global variable to avoid shadowing by function parameter
by Daniel-Constantin Mierla 27 Dec '23

27 Dec '23

Module: kamailio Branch: master Commit: 9c72487cc5a54d7599e2904251133fc8cc29ed84 URL: https://github.com/kamailio/kamailio/commit/9c72487cc5a54d7599e2904251133fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-27T09:24:33+01:00 sipcature: rename global variable to avoid shadowing by function parameter --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/9c72487cc5a54d7599e2904251133fc… Patch: https://github.com/kamailio/kamailio/commit/9c72487cc5a54d7599e2904251133fc… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 320e351a371..7dc3ae81f80 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -176,7 +176,7 @@ static int hep_version(struct sip_msg *msg); static str db_url = str_init(DEFAULT_DB_URL); -static str table_name = str_init("sip_capture"); +static str _sipcap_table_name = str_init("sip_capture"); static str hash_source = str_init("call_id"); static str mt_mode = str_init("rand"); static str date_column = str_init("date"); @@ -338,7 +338,7 @@ int capture_mode_param(modparam_t type, void *val); * Exported parameters */ static param_export_t params[] = {{"db_url", PARAM_STR, &db_url}, - {"table_name", PARAM_STR, &table_name}, + {"table_name", PARAM_STR, &_sipcap_table_name}, {"hash_source", PARAM_STR, &hash_source}, {"mt_mode", PARAM_STR, &mt_mode}, {"date_column", PARAM_STR, &date_column}, @@ -818,9 +818,9 @@ static int mod_init(void) } } - /* Check the table name - if table_name is empty and no capture modes + /* Check the table name - if _sipcap_table_name is empty and no capture modes * are defined, then error*/ - if(!table_name.len && capture_modes_root == NULL) { + if(!_sipcap_table_name.len && capture_modes_root == NULL) { LM_ERR("ERROR: sipcapture: mod_init: table_name is not defined or " "empty\n"); return -1; @@ -831,14 +831,14 @@ static int mod_init(void) def_params = (char *)pkg_malloc( snprintf(NULL, 0, "db_url=%s;table_name=%s;mt_mode=%s;hash_source=%s", - db_url.s, table_name.s, mt_mode.s, hash_source.s) + db_url.s, _sipcap_table_name.s, mt_mode.s, hash_source.s) + 1); if(!def_params) { PKG_MEM_ERROR; return -1; } sprintf(def_params, "db_url=%s;table_name=%s;mt_mode=%s;hash_source=%s", - db_url.s, table_name.s, mt_mode.s, hash_source.s); + db_url.s, _sipcap_table_name.s, mt_mode.s, hash_source.s); str def_name, def_par; def_name.s = strdup("default"); @@ -1777,7 +1777,7 @@ static int sip_capture_store(struct _sipcapture_object *sco, str *dtable, } table = &c->table_names[ii]; } else { - table = &table_name; + table = &_sipcap_table_name; } tvsec_ = (time_t)(sco->tmstamp / 1000000);

1 0

git:master:0186246f: statsd: use bool type for local variable to match return of function
by Daniel-Constantin Mierla 27 Dec '23

27 Dec '23

Module: kamailio Branch: master Commit: 0186246fce8f0e4bb46b30c05174983cd957a3ba URL: https://github.com/kamailio/kamailio/commit/0186246fce8f0e4bb46b30c05174983… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-27T09:24:33+01:00 statsd: use bool type for local variable to match return of function --- Modified: src/modules/statsd/statsd.c --- Diff: https://github.com/kamailio/kamailio/commit/0186246fce8f0e4bb46b30c05174983… Patch: https://github.com/kamailio/kamailio/commit/0186246fce8f0e4bb46b30c05174983… --- diff --git a/src/modules/statsd/statsd.c b/src/modules/statsd/statsd.c index 9724c9244e2..e9d3682bbd4 100644 --- a/src/modules/statsd/statsd.c +++ b/src/modules/statsd/statsd.c @@ -99,7 +99,7 @@ struct module_exports exports = { static int mod_init(void) { - int rc = 0; + bool rc = false; if(!statsd_params.ip) { LM_INFO("Statsd init ip value is null. use default 127.0.0.1\n"); } else { @@ -113,7 +113,7 @@ static int mod_init(void) } rc = statsd_init(statsd_params.ip, statsd_params.port); - if(rc < 0) { + if(rc == false) { LM_ERR("Statsd connection failed (ERROR_CODE: %i)\n", rc); return -1; } else {

1 0

git:master:934a5dd1: xhttp_prom: renamed global ctx variable
by Daniel-Constantin Mierla 27 Dec '23

27 Dec '23

Module: kamailio Branch: master Commit: 934a5dd1347c7b54a2d5e4437e1d3ab581f90596 URL: https://github.com/kamailio/kamailio/commit/934a5dd1347c7b54a2d5e4437e1d3ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-27T09:24:33+01:00 xhttp_prom: renamed global ctx variable - avoid short name code scanner warning and shadowing with function parameter --- Modified: src/modules/xhttp_prom/xhttp_prom.c --- Diff: https://github.com/kamailio/kamailio/commit/934a5dd1347c7b54a2d5e4437e1d3ab… Patch: https://github.com/kamailio/kamailio/commit/934a5dd1347c7b54a2d5e4437e1d3ab… --- diff --git a/src/modules/xhttp_prom/xhttp_prom.c b/src/modules/xhttp_prom/xhttp_prom.c index 198fea7d09d..ee5a5520f3c 100644 --- a/src/modules/xhttp_prom/xhttp_prom.c +++ b/src/modules/xhttp_prom/xhttp_prom.c @@ -114,7 +114,7 @@ int prom_histogram_param(modparam_t type, void *val); * being currently processed. * @sa prom_ctx */ -static prom_ctx_t ctx; +static prom_ctx_t _prom_ctx; static xhttp_api_t xhttp_api; @@ -251,6 +251,8 @@ static int mod_init(void) if(buf_size == 0) buf_size = pkg_mem_size / 3; + memset(&_prom_ctx, 0, sizeof(prom_ctx_t)); + /* Initialize Prometheus metrics. */ if(prom_metric_init()) { LM_ERR("Cannot initialize Prometheus metrics\n"); @@ -441,22 +443,22 @@ static int ki_xhttp_prom_dispatch(sip_msg_t *msg) } /* Init xhttp_prom context */ - if(ctx.reply.buf.s) { - LM_ERR("Unexpected buf value [%p][%d]\n", ctx.reply.buf.s, - ctx.reply.buf.len); + if(_prom_ctx.reply.buf.s) { + LM_ERR("Unexpected buf value [%p][%d]\n", _prom_ctx.reply.buf.s, + _prom_ctx.reply.buf.len); /* Something happened and this memory was not freed. */ - xhttp_prom_reply_free(&ctx); + xhttp_prom_reply_free(&_prom_ctx); } - memset(&ctx, 0, sizeof(prom_ctx_t)); - ctx.msg = msg; - if(init_xhttp_prom_reply(&ctx) < 0) { + memset(&_prom_ctx, 0, sizeof(prom_ctx_t)); + _prom_ctx.msg = msg; + if(init_xhttp_prom_reply(&_prom_ctx) < 0) { goto send_reply; } send_reply: - if(!ctx.reply_sent) { - ret = prom_send(&ctx); + if(!_prom_ctx.reply_sent) { + ret = prom_send(&_prom_ctx); } if(ret < 0) { return -1; @@ -2317,18 +2319,18 @@ static void rpc_prom_histogram_observe(rpc_t *rpc, void *ct) static void rpc_prom_metric_list_print(rpc_t *rpc, void *ct) { /* We reuse ctx->reply for the occasion. */ - if(init_xhttp_prom_reply(&ctx) < 0) { + if(init_xhttp_prom_reply(&_prom_ctx) < 0) { goto clean; } - if(prom_metric_list_print(&ctx)) { + if(prom_metric_list_print(&_prom_ctx)) { LM_ERR("Cannot print a list of metrics\n"); goto clean; } /* Convert to zero terminated string. */ struct xhttp_prom_reply *reply; - reply = &(ctx.reply); + reply = &(_prom_ctx.reply); reply->body.s[reply->body.len] = '\0'; /* Print content of reply buffer. */ @@ -2339,7 +2341,7 @@ static void rpc_prom_metric_list_print(rpc_t *rpc, void *ct) clean: - xhttp_prom_reply_free(&ctx); + xhttp_prom_reply_free(&_prom_ctx); return; }

1 0

git:master:dde74dc1: tm: remove redundant check in if condition
by Daniel-Constantin Mierla 27 Dec '23

27 Dec '23

Module: kamailio Branch: master Commit: dde74dc1d3413bc677813502aa71d727cbe1e981 URL: https://github.com/kamailio/kamailio/commit/dde74dc1d3413bc677813502aa71d72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-27T09:24:33+01:00 tm: remove redundant check in if condition - else branch is already for >= 200 --- Modified: src/modules/tm/dlg.c --- Diff: https://github.com/kamailio/kamailio/commit/dde74dc1d3413bc677813502aa71d72… Patch: https://github.com/kamailio/kamailio/commit/dde74dc1d3413bc677813502aa71d72… --- diff --git a/src/modules/tm/dlg.c b/src/modules/tm/dlg.c index 29b8d50769f..96483259c8c 100644 --- a/src/modules/tm/dlg.c +++ b/src/modules/tm/dlg.c @@ -712,8 +712,9 @@ static inline int dlg_early_resp_uac(dlg_t *_d, struct sip_msg *_m) if(code < 200) { /* We are in early state already, do nothing */ - } else if((code >= 200) && (code <= 299)) { - /* Warning - we can handle here response for non-initial request (for + } else if(code <= 299) { + /* (200-299) + * Warning - we can handle here response for non-initial request (for * example UPDATE within early INVITE/BYE dialog) and move into * confirmed state may be error! But this depends on dialog type... */

1 0

git:master:09318b6d: seas: if expression on else not needed
by Daniel-Constantin Mierla 27 Dec '23

27 Dec '23

Module: kamailio Branch: master Commit: 09318b6d0f224cace31d7db925f792b66cefd469 URL: https://github.com/kamailio/kamailio/commit/09318b6d0f224cace31d7db925f792b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-27T09:24:33+01:00 seas: if expression on else not needed - evaluation of it is true on else branch --- Modified: src/modules/seas/event_dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/09318b6d0f224cace31d7db925f792b… Patch: https://github.com/kamailio/kamailio/commit/09318b6d0f224cace31d7db925f792b… --- diff --git a/src/modules/seas/event_dispatcher.c b/src/modules/seas/event_dispatcher.c index 57483212686..e827629e53f 100644 --- a/src/modules/seas/event_dispatcher.c +++ b/src/modules/seas/event_dispatcher.c @@ -312,9 +312,7 @@ int dispatcher_main_loop(void) poll_fds[3 + as_nr].revents = 0; as_nr++; /*not very sure if this is thread-safe*/ unc_as_nr--; - } else if( - fd - <= 0) { /* pull the upper set of incomplete AS down and take this one out*/ + } else { /* pull the upper set of incomplete AS down and take this one out*/ poll_tmp->revents = 0; for(k = i; k < (unc_as_nr - 1); k++) { j = 3 + as_nr + k;

1 0

git:master:440a9955: ss7ops: adapt if expression for uint
by Daniel-Constantin Mierla 27 Dec '23

27 Dec '23

Module: kamailio Branch: master Commit: 440a9955b4ce21b8c3dae9d6159d24a92ec28e7c URL: https://github.com/kamailio/kamailio/commit/440a9955b4ce21b8c3dae9d6159d24a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-27T09:24:33+01:00 ss7ops: adapt if expression for uint - equal 0 or less than 1 is same in this case --- Modified: src/modules/ss7ops/ss7ops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/440a9955b4ce21b8c3dae9d6159d24a… Patch: https://github.com/kamailio/kamailio/commit/440a9955b4ce21b8c3dae9d6159d24a… --- diff --git a/src/modules/ss7ops/ss7ops_mod.c b/src/modules/ss7ops/ss7ops_mod.c index b0f84694658..8772ff56b6b 100644 --- a/src/modules/ss7ops/ss7ops_mod.c +++ b/src/modules/ss7ops/ss7ops_mod.c @@ -221,9 +221,7 @@ static const uint8_t *extract_from_m2pa(const uint8_t *data, size_t *len) } data += 8; data_len -= 8; - if(data_len == 0) - return NULL; - else if(data_len < 1) { + if(data_len < 1) { LM_ERR("M2PA no space for prio %u\n", data_len); return NULL; }

1 0

git:master:439d451a: github: [skip ci]: bump tj-actions/changed-files from 40 to 41
by Victor Seva 26 Dec '23

26 Dec '23

Module: kamailio Branch: master Commit: 439d451ab3172c1a22f88fd4ba0756ede2318191 URL: https://github.com/kamailio/kamailio/commit/439d451ab3172c1a22f88fd4ba0756e… Author: dependabot[bot] <49699333+dependabot[bot](a)users.noreply.github.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-26T08:44:50+01:00 github: [skip ci]: bump tj-actions/changed-files from 40 to 41 Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 40 to 41. - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](https://github.com/tj-actions/changed-files/compare/v40...v41) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support(a)github.com> --- Modified: .github/workflows/devcontainer.yaml --- Diff: https://github.com/kamailio/kamailio/commit/439d451ab3172c1a22f88fd4ba0756e… Patch: https://github.com/kamailio/kamailio/commit/439d451ab3172c1a22f88fd4ba0756e… --- diff --git a/.github/workflows/devcontainer.yaml b/.github/workflows/devcontainer.yaml index bfecd095f55..1c2a584ed84 100644 --- a/.github/workflows/devcontainer.yaml +++ b/.github/workflows/devcontainer.yaml @@ -33,14 +33,14 @@ jobs: - name: Get changed files if: ${{ ! inputs.force }} id: changed-files - uses: tj-actions/changed-files@v40 + uses: tj-actions/changed-files@v41 with: since_last_remote_commit: true - name: changes in relevant files if: ${{ ! inputs.force }} id: changed-files-builder - uses: tj-actions/changed-files@v40 + uses: tj-actions/changed-files@v41 with: files: | .devcontainer/**

1 0

[kamailio/kamailio] github: [skip ci]: bump tj-actions/changed-files from 40 to 41 (PR #3693)
by dependabot[bot] 26 Dec '23

26 Dec '23

Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 40 to 41. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/tj-actions/changed-files/releases">tj… releases</a>.</em></p> <blockquote> <h2>v41</h2> <h1>Changes in v41.0.1</h1> <h2>What's Changed</h2> <ul> <li>Upgraded to v41 by <a href="https://github.com/tj-actions-bot"><code>@tj-acti… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1811&q… <li>chore(deps): update dependency eslint-plugin-prettier to v5.1.2 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1813&q… <li>fix: update characters escaped by safe output by <a href="https://github.com/jackton1"><code>@jackton1</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1815&q… </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/tj-actions/changed-files/compare/v41...v41.0.… <hr /> <h1>Changes in v41.0.0</h1> <h2>🔥 🔥 BREAKING CHANGE 🔥 🔥</h2> <p>A new <code>safe_output</code> input is now available to prevent outputting unsafe filename characters (Enabled by default). This would escape characters in the filename that could be used for command injection.</p> <blockquote> <p>[!NOTE] This can be disabled by setting the <code>safe_output</code> to false this comes with a recommendation to store all outputs generated in an environment variable first before using them.</p> </blockquote> <h4>Example</h4> <pre lang="yaml"><code>... - name: Get changed files id: changed-files uses: tj-actions/changed-files@v40 with: safe_output: false # set to false because we are using an environment variable to store the output and avoid command injection. <pre><code>- name: List all added files env: ADDED_FILES: ${{ steps.changed-files.outputs.added_files }} run: | for file in &amp;quot;$ADDED_FILES&amp;quot;; do echo &amp;quot;$file was added&amp;quot; done </code></pre> <p>... </code></pre></p> <h2>What's Changed</h2> <ul> <li>chore(deps): update typescript-eslint monorepo to v6.15.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1801&q… <li>Upgraded to v40.2.3 by <a href="https://github.com/tj-actions-bot"><code>@tj-acti… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1800&q… <li>chore(deps): update dependency eslint-plugin-prettier to v5.1.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1802&q… <li>chore(deps): lock file maintenance by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1803&q… <li>chore(deps): update dependency eslint-plugin-prettier to v5.1.1 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1804&q… <li>fix: update safe output regex and the docs by <a href="https://github.com/tj-actions-bot"><code>@tj-acti… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1805&q… <li>Revert &quot;chore(deps): update actions/download-artifact action to v4&quot; by <a href="https://github.com/jackton1"><code>@jackton1</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1806&q… <li>Update README.md by <a href="https://github.com/jackton1"><code>@jackton1</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1808&q… </ul>  </blockquote> <p>... (truncated)</p> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/tj-actions/changed-files/blob/main/HISTORY.md… changelog</a>.</em></p> <blockquote> <h1>Changelog</h1> <h1><a href="https://github.com/tj-actions/changed-files/compare/v41.0.0...v4… - (2023-12-24)</h1> <h2>🐛 Bug Fixes</h2> <ul> <li>Update characters escaped by safe output (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1815…) (<a href="https://github.com/tj-actions/changed-files/commit/716b1e1304286…) - (Tonye Jack)</li> </ul> <h2>⚙️ Miscellaneous Tasks</h2> <ul> <li><strong>deps:</strong> Update dependency eslint-plugin-prettier to v5.1.2 (<a href="https://github.com/tj-actions/changed-files/commit/7aaf10d9eef19…) - (renovate[bot])</li> </ul> <h2>⬆️ Upgrades</h2> <ul> <li>Upgraded to v41 (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1811… </ul> <p>Co-authored-by: jackton1 <a href="mailto:jackton1@users.noreply.github.com">jackton1@users.noreply.github.com</a> (<a href="https://github.com/tj-actions/changed-files/commit/cc08e170f4447…) - (tj-actions[bot])</p> <h1><a href="https://github.com/tj-actions/changed-files/compare/v40.2.3...v4… - (2023-12-23)</h1> <h2>🐛 Bug Fixes</h2> <ul> <li>Update safe output regex and the docs (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1805…) (<a href="https://github.com/tj-actions/changed-files/commit/ff2f6e6b91913…) - (tj-actions[bot])</li> </ul> <h2>⏪ Reverts</h2> <ul> <li>Revert &quot;chore(deps): update actions/download-artifact action to v4&quot; (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1806… </ul> <p>(<a href="https://github.com/tj-actions/changed-files/commit/4f573fed06c9a…) - (Tonye Jack)</p> <h2>🔄 Update</h2> <ul> <li>Update README.md (<a href="https://github.com/tj-actions/changed-files/commit/6e79d6e3dbe48…) - (Tonye Jack)</li> <li>Update README.md (<a href="https://github.com/tj-actions/changed-files/commit/d13ac1942fb3c…) - (Tonye Jack)</li> <li>Update README.md (<a href="https://github.com/tj-actions/changed-files/commit/bb89f97963be9…) - (Tonye Jack)</li> <li>Updated README.md (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1810… </ul> <p>Co-authored-by: renovate[bot]  (<a href="https://github.com/tj-actions/changed-files/commit/1864078d0afad…) - (tj-actions[bot])</p> <ul> <li>Update README.md (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1808… </ul> <p>(<a href="https://github.com/tj-actions/changed-files/commit/47371c50e97c0…) - (Tonye Jack)</p> <h2>📝 Other</h2> <ul> <li>Merge pull request from GHSA-mcph-m25j-8j63</li> </ul> <ul> <li> <p>feat: add <code>safe_output</code> input enabled by default</p> </li> <li> <p>fix: migrate README to safe uses of interpolation</p> </li> </ul>  </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/tj-actions/changed-files/commit/716b1e1304286… fix: update characters escaped by safe output (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1815… <li><a href="https://github.com/tj-actions/changed-files/commit/7aaf10d9eef19… chore(deps): update dependency eslint-plugin-prettier to v5.1.2</li> <li><a href="https://github.com/tj-actions/changed-files/commit/cc08e170f4447… Upgraded to v41 (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1811… <li><a href="https://github.com/tj-actions/changed-files/commit/6e79d6e3dbe48… Update README.md</li> <li><a href="https://github.com/tj-actions/changed-files/commit/d13ac1942fb3c… Update README.md</li> <li><a href="https://github.com/tj-actions/changed-files/commit/bb89f97963be9… Update README.md</li> <li><a href="https://github.com/tj-actions/changed-files/commit/1864078d0afad… Updated README.md (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1810… <li><a href="https://github.com/tj-actions/changed-files/commit/f495a0321d3ff… chore(deps): lock file maintenance</li> <li><a href="https://github.com/tj-actions/changed-files/commit/47371c50e97c0… Update README.md (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1808… <li><a href="https://github.com/tj-actions/changed-files/commit/4f573fed06c9a… Revert &quot;chore(deps): update actions/download-artifact action to v4&quot; (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1806… <li>Additional commits viewable in <a href="https://github.com/tj-actions/changed-files/compare/v40...v41&qu… view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?d… Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3693 -- Commit Summary -- * github: [skip ci]: bump tj-actions/changed-files from 40 to 41 -- File Changes -- M .github/workflows/devcontainer.yaml (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3693.patch https://github.com/kamailio/kamailio/pull/3693.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3693 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3693(a)github.com>

2 1

Merry Christmas and Happy Holidays 2023-2024!
by Daniel-Constantin Mierla 25 Dec '23

25 Dec '23

Kamailio project continued to evolve steadily, a new major release was out during this year, next one planned in a few months, relying on an amazing community of developers and users. We hope it kept helping people and companies world wide to connect with the dear ones and build a better way of living. The season holidays are ahead, time to relax, spend time with family and friends! I take again this chance to express my thanks and greetings to all the friends, developers, supporting companies and community members that made 2023 another fantastic year for Kamailio project. Enjoy the holidays! Merry Christmas! Daniel * Santa is flying Kamailio! * -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services Kamailio World Conference - April 18-19, 2024, Berlin

2 1

git:master:973803b0: pkg/obs: removed auth_identity modules
by Daniel-Constantin Mierla 24 Dec '23

24 Dec '23

Module: kamailio Branch: master Commit: 973803b0a3944b9de7ebdc4366b23e933e66ffbe URL: https://github.com/kamailio/kamailio/commit/973803b0a3944b9de7ebdc4366b23e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-24T19:59:52+01:00 pkg/obs: removed auth_identity modules --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/973803b0a3944b9de7ebdc4366b23e9… Patch: https://github.com/kamailio/kamailio/commit/973803b0a3944b9de7ebdc4366b23e9… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 978c1073ac8..1dc6687e645 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -2336,9 +2336,7 @@ fi %files tls %defattr(-,root,root) -%doc %{_docdir}/kamailio/modules/README.auth_identity %doc %{_docdir}/kamailio/modules/README.tls -%{_libdir}/kamailio/modules/auth_identity.so %{_libdir}/kamailio/modules/tls.so

1 0

git:master:8a07c21b: pkg/alpine: removed auth_identity module
by Daniel-Constantin Mierla 24 Dec '23

24 Dec '23

Module: kamailio Branch: master Commit: 8a07c21b45d8afd0a0b84c09bbac6361a0f979d3 URL: https://github.com/kamailio/kamailio/commit/8a07c21b45d8afd0a0b84c09bbac636… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-24T17:23:55+01:00 pkg/alpine: removed auth_identity module --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/8a07c21b45d8afd0a0b84c09bbac636… Patch: https://github.com/kamailio/kamailio/commit/8a07c21b45d8afd0a0b84c09bbac636… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index b3d5c4d64bd..0696216564a 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -131,7 +131,7 @@ _mod_list_purple="purple" _mod_list_memcached="memcached" # - modules depending on openssl library -_mod_list_tls="auth_identity crypto tls" +_mod_list_tls="crypto tls" # - modules depending on openssl library _mod_list_outbound="outbound"

1 0

git:master:3bdc5665: Makefile.groups: removed auth_identity module
by Daniel-Constantin Mierla 24 Dec '23

24 Dec '23

Module: kamailio Branch: master Commit: 3bdc56654874b7e94e7052823714440b6457a100 URL: https://github.com/kamailio/kamailio/commit/3bdc56654874b7e94e7052823714440… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-24T17:21:57+01:00 Makefile.groups: removed auth_identity module - relocated to kamailio-archive repository --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/3bdc56654874b7e94e7052823714440… Patch: https://github.com/kamailio/kamailio/commit/3bdc56654874b7e94e7052823714440… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 8d15b198cc3..d730a7eb51b 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -91,9 +91,6 @@ mod_list_tlsdeps=crypto tls # - modules depending on static openssl library mod_list_tlsa=tlsa -# - modules depending on openssl (+curl) library -mod_list_tlsdeps_curl=auth_identity - # - modules depending on static wolfssl library mod_list_tls_wolfssl=tls_wolfssl @@ -255,7 +252,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_xmpp) \ $(mod_list_berkeley) $(mod_list_utils) \ $(mod_list_memcached) \ - $(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) \ + $(mod_list_tlsdeps) \ $(mod_list_websocket) \ $(mod_list_snmpstats) $(mod_list_presence) \ $(mod_list_lua) $(mod_list_python) \ @@ -314,7 +311,7 @@ module_group_standard=$(mod_list_basic) $(mod_list_extra) \ module_group_common=$(mod_list_db) $(mod_list_dbuid) \ $(mod_list_pcre) $(mod_list_radius) \ $(mod_list_xmldeps) $(mod_list_presence) \ - $(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) + $(mod_list_tlsdeps) # For db use (db modules, excluding drivers) module_group_db=$(mod_list_db) @@ -409,10 +406,10 @@ module_group_ktls_basic=$(mod_list_tlsdeps) ifeq ($(KTLS_INCLUDE_TLSA),yes) # pkg tls module with curl -module_group_ktls=$(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) $(mod_list_tlsa) +module_group_ktls=$(mod_list_tlsdeps) $(mod_list_tlsa) else # pkg tls module with curl -module_group_ktls=$(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) +module_group_ktls=$(mod_list_tlsdeps) # pkg tlsa module module_group_ktlsa=$(mod_list_tlsa)

1 0

git:master:5192e5d2: tmx: rework cleaning up on init failure
by Daniel-Constantin Mierla 24 Dec '23

24 Dec '23

Module: kamailio Branch: master Commit: 5192e5d275761ccd1af49d4bf9dd12e1438947b7 URL: https://github.com/kamailio/kamailio/commit/5192e5d275761ccd1af49d4bf9dd12e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-24T12:20:57+01:00 tmx: rework cleaning up on init failure --- Modified: src/modules/tmx/tmx_pretran.c --- Diff: https://github.com/kamailio/kamailio/commit/5192e5d275761ccd1af49d4bf9dd12e… Patch: https://github.com/kamailio/kamailio/commit/5192e5d275761ccd1af49d4bf9dd12e… --- diff --git a/src/modules/tmx/tmx_pretran.c b/src/modules/tmx/tmx_pretran.c index 7600a3c7b4b..a7c7d52df87 100644 --- a/src/modules/tmx/tmx_pretran.c +++ b/src/modules/tmx/tmx_pretran.c @@ -103,10 +103,11 @@ int tmx_init_pretran_table(void) for(n = 0; n < _tmx_ptran_size; n++) { if(lock_init(&_tmx_ptran_table[n].lock) == NULL) { LM_ERR("cannot init the lock %d\n", n); - n--; - while(n >= 0) { - lock_destroy(&_tmx_ptran_table[n].lock); - n--; + if(n > 0) { + do { + n--; + lock_destroy(&_tmx_ptran_table[n].lock); + } while(n > 0); } shm_free(_tmx_ptran_table); _tmx_ptran_table = 0;

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev