sr-dev

sr-dev@lists.kamailio.org

22 participants
45186 discussions

git:master:2cebd46f: dialog: remove strlen() checks when setting a variable
by Daniel-Constantin Mierla 01 Sep '22

01 Sep '22

Module: kamailio Branch: master Commit: 2cebd46f8f2dc3f87c9cfd2054976e347aa75ace URL: https://github.com/kamailio/kamailio/commit/2cebd46f8f2dc3f87c9cfd2054976e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-01T10:53:54+02:00 dialog: remove strlen() checks when setting a variable - assumed key->s and val->s are 0-terminated, which may not be the case --- Modified: src/modules/dialog/dlg_var.c --- Diff: https://github.com/kamailio/kamailio/commit/2cebd46f8f2dc3f87c9cfd2054976e3… Patch: https://github.com/kamailio/kamailio/commit/2cebd46f8f2dc3f87c9cfd2054976e3… --- diff --git a/src/modules/dialog/dlg_var.c b/src/modules/dialog/dlg_var.c index 6c4da06742..ef73c022d0 100644 --- a/src/modules/dialog/dlg_var.c +++ b/src/modules/dialog/dlg_var.c @@ -352,7 +352,7 @@ int get_dlg_variable_uintval(struct dlg_cell *dlg, str *key, unsigned int *uval) int set_dlg_variable(struct dlg_cell *dlg, str *key, str *val) { int ret = -1; - if( !dlg || !key || key->len > strlen(key->s) || (val && val->len > strlen(val->s))) + if( !dlg || !key || !key->s || key->len<=0 ) { LM_ERR("BUG - bad parameters\n"); return -1;

1 0

git:master:b7dc2ac6: dialog: wrapper function to set a dlg var with unsigned integer parameter
by Daniel-Constantin Mierla 01 Sep '22

01 Sep '22

Module: kamailio Branch: master Commit: b7dc2ac6d66839b38ba8d6f36e9f28bc0a2d1425 URL: https://github.com/kamailio/kamailio/commit/b7dc2ac6d66839b38ba8d6f36e9f28b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-01T10:50:30+02:00 dialog: wrapper function to set a dlg var with unsigned integer parameter - use it to set cseq diff value --- Modified: src/modules/dialog/dlg_cseq.c Modified: src/modules/dialog/dlg_var.c Modified: src/modules/dialog/dlg_var.h --- Diff: https://github.com/kamailio/kamailio/commit/b7dc2ac6d66839b38ba8d6f36e9f28b… Patch: https://github.com/kamailio/kamailio/commit/b7dc2ac6d66839b38ba8d6f36e9f28b… --- diff --git a/src/modules/dialog/dlg_cseq.c b/src/modules/dialog/dlg_cseq.c index e5555441fe..d5ffe20c85 100644 --- a/src/modules/dialog/dlg_cseq.c +++ b/src/modules/dialog/dlg_cseq.c @@ -173,8 +173,7 @@ int dlg_cseq_update(sip_msg_t *msg) LM_DBG("nothing to increment\n"); goto done; } - nval.s = int2str(vinc, &nval.len); - if(set_dlg_variable(dlg, &_dlg_cseq_diff_var_name, &nval) <0) { + if(set_dlg_variable_uintval(dlg, &_dlg_cseq_diff_var_name, vinc) <0) { LM_ERR("failed to set the dlg cseq diff var\n"); goto done; } diff --git a/src/modules/dialog/dlg_var.c b/src/modules/dialog/dlg_var.c index 04e48fa636..6c4da06742 100644 --- a/src/modules/dialog/dlg_var.c +++ b/src/modules/dialog/dlg_var.c @@ -378,6 +378,18 @@ int set_dlg_variable(struct dlg_cell *dlg, str *key, str *val) return ret; } +int set_dlg_variable_uintval(struct dlg_cell *dlg, str *key, unsigned int uval) +{ + str sval = STR_NULL; + + sval.s = int2str(uval, &sval.len); + if(sval.s==NULL) { + return -1; + } + + return set_dlg_variable(dlg, key, &sval); +} + int pv_get_dlg_variable(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { dlg_cell_t *dlg; diff --git a/src/modules/dialog/dlg_var.h b/src/modules/dialog/dlg_var.h index 70579810bf..a4b497dbd7 100644 --- a/src/modules/dialog/dlg_var.h +++ b/src/modules/dialog/dlg_var.h @@ -63,6 +63,7 @@ str* get_dlg_variable(dlg_cell_t *dlg, str *key); int set_dlg_variable(dlg_cell_t *dlg, str *key, str *val); int get_dlg_variable_uintval(struct dlg_cell *dlg, str *key, unsigned int *uval); +int set_dlg_variable_uintval(struct dlg_cell *dlg, str *key, unsigned int uval); int pv_parse_dialog_var_name(pv_spec_p sp, str *in);

1 0

[kamailio/kamailio] Function sql_xquery returns 1 for empty query result. (Issue #3163)
by admin-toneca 01 Sep '22

01 Sep '22

### Description Function sql_xquery returns 1 for empty query result. #### Reproduction Table sbc_uacreg is empty modparam("sqlops", "sqlcon", "con=>mysql://kamailio:pass@172.31.1.237/fs") if (sql_xquery("con", "SELECT * FROM sbc_uacreg WHERE l_uuid = '$hdr(X-Gateway)'", "ra") == 1) { xlog("(PSTN) SELECT * FROM sbc_uacreg WHERE l_uuid = '$hdr(X-Gateway)' =============================================================================\n"); $var(register) = "1"; } #### Log Messages ``` Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [db_query.c:72]: db_do_submit_query(): submitted query: SELECT * FROM sbc_uacreg WHERE l_uuid = 'GwProdIpAuth', result 0 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [db_res.c:119]: db_new_result(): allocate 56 bytes for result set at 0x7fa7c2c91170 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:67]: db_mysql_get_columns(): 16 columns returned from the query Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [db_res.c:156]: db_allocate_columns(): allocate 128 bytes for result names at 0x7fa7c2c91288 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [db_res.c:167]: db_allocate_columns(): allocate 64 bytes for result types at 0x7fa7c2c91370 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:84]: db_mysql_get_columns(): allocate 16 bytes for RES_NAMES[0] at 0x7fa7c2c91418 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:91]: db_mysql_get_columns(): RES_NAMES(0x7fa7c2c91418)[0]=[id] Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:105]: db_mysql_get_columns(): use DB1_INT result type Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:84]: db_mysql_get_columns(): allocate 16 bytes for RES_NAMES[1] at 0x7fa7c2c91490 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:91]: db_mysql_get_columns(): RES_NAMES(0x7fa7c2c91490)[1]=[l_uuid] Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:148]: db_mysql_get_columns(): use DB1_STRING result type Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:84]: db_mysql_get_columns(): allocate 16 bytes for RES_NAMES[2] at 0x7fa7c2c91508 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:91]: db_mysql_get_columns(): RES_NAMES(0x7fa7c2c91508)[2]=[l_username] Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:148]: db_mysql_get_columns(): use DB1_STRING result type Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:84]: db_mysql_get_columns(): allocate 16 bytes for RES_NAMES[3] at 0x7fa7c2c91580 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:91]: db_mysql_get_columns(): RES_NAMES(0x7fa7c2c91580)[3]=[l_domain] Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:148]: db_mysql_get_columns(): use DB1_STRING result type Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:84]: db_mysql_get_columns(): allocate 16 bytes for RES_NAMES[4] at 0x7fa7c2c915f8 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:91]: db_mysql_get_columns(): RES_NAMES(0x7fa7c2c915f8)[4]=[r_username] Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:148]: db_mysql_get_columns(): use DB1_STRING result type Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:84]: db_mysql_get_columns(): allocate 16 bytes for RES_NAMES[5] at 0x7fa7c2c91670 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:91]: db_mysql_get_columns(): RES_NAMES(0x7fa7c2c91670)[5]=[r_domain] Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:148]: db_mysql_get_columns(): use DB1_STRING result type Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:84]: db_mysql_get_columns(): allocate 16 bytes for RES_NAMES[6] at 0x7fa7c2c916e8 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:91]: db_mysql_get_columns(): RES_NAMES(0x7fa7c2c916e8)[6]=[realm] Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:148]: db_mysql_get_columns(): use DB1_STRING result type Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:84]: db_mysql_get_columns(): allocate 16 bytes for RES_NAMES[7] at 0x7fa7c2c91760 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:91]: db_mysql_get_columns(): RES_NAMES(0x7fa7c2c91760)[7]=[auth_username] Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:148]: db_mysql_get_columns(): use DB1_STRING result type Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:84]: db_mysql_get_columns(): allocate 16 bytes for RES_NAMES[8] at 0x7fa7c2c917d8 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:91]: db_mysql_get_columns(): RES_NAMES(0x7fa7c2c917d8)[8]=[auth_password] Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:148]: db_mysql_get_columns(): use DB1_STRING result type Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:84]: db_mysql_get_columns(): allocate 16 bytes for RES_NAMES[9] at 0x7fa7c2c91850 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:91]: db_mysql_get_columns(): RES_NAMES(0x7fa7c2c91850)[9]=[auth_ha1] Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:148]: db_mysql_get_columns(): use DB1_STRING result type Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:84]: db_mysql_get_columns(): allocate 16 bytes for RES_NAMES[10] at 0x7fa7c2cbe3c8 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:91]: db_mysql_get_columns(): RES_NAMES(0x7fa7c2cbe3c8)[10]=[auth_proxy] Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:148]: db_mysql_get_columns(): use DB1_STRING result type Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:84]: db_mysql_get_columns(): allocate 16 bytes for RES_NAMES[11] at 0x7fa7c2cbe440 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:91]: db_mysql_get_columns(): RES_NAMES(0x7fa7c2cbe440)[11]=[expires] Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:105]: db_mysql_get_columns(): use DB1_INT result type Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:84]: db_mysql_get_columns(): allocate 16 bytes for RES_NAMES[12] at 0x7fa7c2cbe4b8 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:91]: db_mysql_get_columns(): RES_NAMES(0x7fa7c2cbe4b8)[12]=[flags] Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:105]: db_mysql_get_columns(): use DB1_INT result type Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:84]: db_mysql_get_columns(): allocate 16 bytes for RES_NAMES[13] at 0x7fa7c2cbe530 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:91]: db_mysql_get_columns(): RES_NAMES(0x7fa7c2cbe530)[13]=[reg_delay] Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:105]: db_mysql_get_columns(): use DB1_INT result type Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:84]: db_mysql_get_columns(): allocate 16 bytes for RES_NAMES[14] at 0x7fa7c2cbe5a8 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:91]: db_mysql_get_columns(): RES_NAMES(0x7fa7c2cbe5a8)[14]=[contact_addr] Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:148]: db_mysql_get_columns(): use DB1_STRING result type Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:84]: db_mysql_get_columns(): allocate 16 bytes for RES_NAMES[15] at 0x7fa7c2cbe620 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:91]: db_mysql_get_columns(): RES_NAMES(0x7fa7c2cbe620)[15]=[socket] Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:148]: db_mysql_get_columns(): use DB1_STRING result type Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} db_mysql [km_res.c:181]: db_mysql_convert_rows(): no rows returned from the query Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} sqlops [sql_api.c:494]: sql_exec_xquery(): no result after query Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [db_res.c:79]: db_free_columns(): freeing 16 columns Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [db_res.c:83]: db_free_columns(): freeing RES_NAMES[0] at 0x7fa7c2c91418 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [db_res.c:83]: db_free_columns(): freeing RES_NAMES[1] at 0x7fa7c2c91490 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [db_res.c:83]: db_free_columns(): freeing RES_NAMES[2] at 0x7fa7c2c91508 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [db_res.c:83]: db_free_columns(): freeing RES_NAMES[3] at 0x7fa7c2c91580 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [db_res.c:83]: db_free_columns(): freeing RES_NAMES[4] at 0x7fa7c2c915f8 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [db_res.c:83]: db_free_columns(): freeing RES_NAMES[5] at 0x7fa7c2c91670 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [db_res.c:83]: db_free_columns(): freeing RES_NAMES[6] at 0x7fa7c2c916e8 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [db_res.c:83]: db_free_columns(): freeing RES_NAMES[7] at 0x7fa7c2c91760 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [db_res.c:83]: db_free_columns(): freeing RES_NAMES[8] at 0x7fa7c2c917d8 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [db_res.c:83]: db_free_columns(): freeing RES_NAMES[9] at 0x7fa7c2c91850 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [db_res.c:83]: db_free_columns(): freeing RES_NAMES[10] at 0x7fa7c2cbe3c8 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [db_res.c:83]: db_free_columns(): freeing RES_NAMES[11] at 0x7fa7c2cbe440 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [db_res.c:83]: db_free_columns(): freeing RES_NAMES[12] at 0x7fa7c2cbe4b8 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [db_res.c:83]: db_free_columns(): freeing RES_NAMES[13] at 0x7fa7c2cbe530 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [db_res.c:83]: db_free_columns(): freeing RES_NAMES[14] at 0x7fa7c2cbe5a8 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [db_res.c:83]: db_free_columns(): freeing RES_NAMES[15] at 0x7fa7c2cbe620 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [db_res.c:96]: db_free_columns(): freeing result names at 0x7fa7c2c91288 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [db_res.c:101]: db_free_columns(): freeing result types at 0x7fa7c2c91370 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [db_res.c:138]: db_free_result(): freeing result set at 0x7fa7c2c91170 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: exec: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} *** cfgtrace:dbg_cfg_trace(): request_route=[PSTN] c=[/usr/local/etc/kamailio/kamailio.cfg] l=1155 a=25 n=xlog Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [Via] type 1 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [X-Gateway] type 0 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [Max-Forwards] type 8 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [X-Gateway] type 0 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [From] type 4 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [X-Gateway] type 0 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [To] type 3 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [X-Gateway] type 0 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [Call-ID] type 6 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [X-Gateway] type 0 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [CSeq] type 5 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [X-Gateway] type 0 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [Contact] type 7 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [X-Gateway] type 0 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [User-Agent] type 28 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [X-Gateway] type 0 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [Allow] type 21 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [X-Gateway] type 0 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [Supported] type 17 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [X-Gateway] type 0 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [Allow-Events] type 39 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [X-Gateway] type 0 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [Content-Type] type 11 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [X-Gateway] type 0 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [Content-Disposition] type 30 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [X-Gateway] type 0 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [Content-Length] type 12 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [X-Gateway] type 0 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [X-Gateway] type 0 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: DEBUG: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [X-Gateway] type 0 Jun 24 17:14:52 ip-172-31-3-158 /usr/local/sbin/kamailio[49325]: ERROR: {1 53491654 INVITE 00a98cb1-6e84-123b-fca2-069c0e3bf50e} <script>: (PSTN) SELECT * FROM sbc_uacreg WHERE l_uuid = 'GwProdIpAuth' ============================================================================= ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.7.0-dev0 (x86_64/linux) 0d9380 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, 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: 0d9380 compiled on 14:06:32 May 26 2022 with gcc 11.2.0 ``` * **Operating System**:  ``` Distributor ID: Ubuntu Description: Ubuntu 22.04 LTS Release: 22.04 Codename: jammy Linux ip-172-31-3-158 5.15.0-1011-aws #14-Ubuntu SMP Wed Jun 1 20:54:22 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3163 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3163(a)github.com>

2 4

The SIP TLS/ALPN identifier is now registred
by Olle E. Johansson 31 Aug '22

31 Aug '22

I’ve finally got confirmation that the SIP ALPN identifier is registered. https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype… For Kamailio, this could assist when we multiplex multiple protocols on the same port, like we do for HTTPs and SIP/TLS many times. ALPN Is part of the TLS handshake, indicating what protocol comes after TLS is done. For it to help, both phones and servers needs to support it. I do think it would be helpful. Cheers, /O

1 0

git:master:30c62873: siptrace: use socket name for hep mirroring
by Daniel-Constantin Mierla 31 Aug '22

31 Aug '22

Module: kamailio Branch: master Commit: 30c628732092108e8d73856a5c9ec60b16d5ef99 URL: https://github.com/kamailio/kamailio/commit/30c628732092108e8d73856a5c9ec60… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-31T11:35:51+02:00 siptrace: use socket name for hep mirroring - GH #3174 --- Modified: src/modules/siptrace/siptrace_hep.c --- Diff: https://github.com/kamailio/kamailio/commit/30c628732092108e8d73856a5c9ec60… Patch: https://github.com/kamailio/kamailio/commit/30c628732092108e8d73856a5c9ec60…

1 0

git:master:1553a6c0: pua_dialoginfo: clone dlg var values
by Daniel-Constantin Mierla 31 Aug '22

31 Aug '22

Module: kamailio Branch: master Commit: 1553a6c0efb2cec0b5962bba13bc0095211ee75d URL: https://github.com/kamailio/kamailio/commit/1553a6c0efb2cec0b5962bba13bc009… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-31T10:44:13+02:00 pua_dialoginfo: clone dlg var values --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/1553a6c0efb2cec0b5962bba13bc009… Patch: https://github.com/kamailio/kamailio/commit/1553a6c0efb2cec0b5962bba13bc009… --- diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index f9e4b02b842..a1953ef2382 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -653,14 +653,18 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type, int disable if(caller_dlg_var.len>0 && (s = dlg_api.get_dlg_var(dlg, &caller_dlg_var))!=0) { dlginfo->pubruris_caller = - (struct str_list*)shm_malloc( sizeof(struct str_list) ); + (struct str_list*)shm_malloc(sizeof(struct str_list) + s->len + 1); if (dlginfo->pubruris_caller==0) { SHM_MEM_ERROR; free_dlginfo_cell(dlginfo); return NULL; } - memset( dlginfo->pubruris_caller, 0, sizeof(struct str_list)); - dlginfo->pubruris_caller->s=*s; + memset(dlginfo->pubruris_caller, 0, sizeof(struct str_list)); + dlginfo->pubruris_caller->s.s = (char*)dlginfo->pubruris_caller + + sizeof(sizeof(struct str_list)); + memcpy(dlginfo->pubruris_caller->s.s, s->s, s->len); + dlginfo->pubruris_caller->s.s[s->len] = '\0'; + dlginfo->pubruris_caller->s.len = s->len; LM_DBG("Found pubruris_caller in dialog '%.*s'\n", dlginfo->pubruris_caller->s.len, dlginfo->pubruris_caller->s.s); } @@ -668,14 +672,18 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type, int disable if(callee_dlg_var.len>0 && (s = dlg_api.get_dlg_var(dlg, &callee_dlg_var))!=0) { dlginfo->pubruris_callee = - (struct str_list*)shm_malloc( sizeof(struct str_list) ); + (struct str_list*)shm_malloc(sizeof(struct str_list) + s->len + 1); if (dlginfo->pubruris_callee==0) { SHM_MEM_ERROR; free_dlginfo_cell(dlginfo); return NULL; } - memset( dlginfo->pubruris_callee, 0, sizeof(struct str_list)); - dlginfo->pubruris_callee->s=*s; + memset(dlginfo->pubruris_callee, 0, sizeof(struct str_list)); + dlginfo->pubruris_callee->s.s = (char*)dlginfo->pubruris_callee + + sizeof(sizeof(struct str_list)); + memcpy(dlginfo->pubruris_callee->s.s, s->s, s->len); + dlginfo->pubruris_callee->s.s[s->len] = '\0'; + dlginfo->pubruris_callee->s.len = s->len; LM_DBG("Found pubruris_callee in dialog '%.*s'\n", dlginfo->pubruris_callee->s.len, dlginfo->pubruris_callee->s.s); }

1 0

git:master:54905e6b: acc: duplicate dlg var values used in extra2strar_dlg_only()
by Daniel-Constantin Mierla 31 Aug '22

31 Aug '22

Module: kamailio Branch: master Commit: 54905e6b02e36e72bb74a92c77b273cf57822f18 URL: https://github.com/kamailio/kamailio/commit/54905e6b02e36e72bb74a92c77b273c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-31T10:18:07+02:00 acc: duplicate dlg var values used in extra2strar_dlg_only() - avoid buffer index overlapping and be coherent with extra2strar() --- Modified: src/modules/acc/acc_cdr.c Modified: src/modules/acc/acc_extra.c --- Diff: https://github.com/kamailio/kamailio/commit/54905e6b02e36e72bb74a92c77b273c… Patch: https://github.com/kamailio/kamailio/commit/54905e6b02e36e72bb74a92c77b273c… --- diff --git a/src/modules/acc/acc_cdr.c b/src/modules/acc/acc_cdr.c index b54e3a37cef..d3009c85383 100644 --- a/src/modules/acc/acc_cdr.c +++ b/src/modules/acc/acc_cdr.c @@ -227,12 +227,13 @@ static int db_write_cdr( struct dlg_cell* dialog, m += n; } else if (cdr_expired_dlg_enable){ LM_WARN( "fallback to dlg_only search because of message doesn't exist.\n"); - m += extra2strar_dlg_only( cdr_extra, + n += extra2strar_dlg_only( cdr_extra, dialog, cdr_value_array + m, cdr_int_array + m, cdr_type_array +m, &dlgb); + m += n; } for( ; i<m; i++) { @@ -311,7 +312,7 @@ static int log_write_cdr( struct dlg_cell* dialog, cdr_type_array + message_index); } else if (cdr_expired_dlg_enable){ LM_DBG("fallback to dlg_only search because of message does not exist.\n"); - message_index += extra2strar_dlg_only( cdr_extra, + extra_index += extra2strar_dlg_only( cdr_extra, dialog, cdr_value_array + message_index, cdr_int_array + message_index, diff --git a/src/modules/acc/acc_extra.c b/src/modules/acc/acc_extra.c index 5c29cc7a047..01fbcb9c82b 100644 --- a/src/modules/acc/acc_extra.c +++ b/src/modules/acc/acc_extra.c @@ -268,6 +268,7 @@ int extra2strar_dlg_only(struct acc_extra *extra, struct dlg_cell* dlg, str *val //string value; str* value = 0; int n=0; + int i; if( !dlg || !val_arr || !int_arr || !type_arr || !p_dlgb) { @@ -297,7 +298,22 @@ int extra2strar_dlg_only(struct acc_extra *extra, struct dlg_cell* dlg, str *val if (value) { - val_arr[n].s = value->s; + val_arr[n].s = (char *)pkg_malloc(value->len + 1); + if (val_arr[n].s == NULL ) { + PKG_MEM_ERROR; + /* cleanup already allocated memory and + * return that we didn't do anything */ + for (i = 0; i < n ; i++) { + if (NULL != val_arr[i].s){ + pkg_free(val_arr[i].s); + val_arr[i].s = NULL; + } + } + n = 0; + goto done; + } + memcpy(val_arr[n].s, value->s, value->len); + val_arr[n].s[value->len] = '\0'; val_arr[n].len = value->len; type_arr[n] = TYPE_STR; }

1 0

git:master:590d00f0: tm: exported t_exists() to kemi
by Daniel-Constantin Mierla 31 Aug '22

31 Aug '22

Module: kamailio Branch: master Commit: 590d00f04ce714ad7ce3ae6a9ca7bd2853925cba URL: https://github.com/kamailio/kamailio/commit/590d00f04ce714ad7ce3ae6a9ca7bd2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-31T09:54:54+02:00 tm: exported t_exists() to kemi --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/590d00f04ce714ad7ce3ae6a9ca7bd2… Patch: https://github.com/kamailio/kamailio/commit/590d00f04ce714ad7ce3ae6a9ca7bd2… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 15dc85dc7b..470e33e663 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -3507,6 +3507,11 @@ static sr_kemi_t tm_kemi_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("tm"), str_init("t_exists"), + SR_KEMIP_INT, ki_t_exists, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } }

1 0

[kamailio/kamailio] Add More Logging Option (PR #3228)
by Andrew Webster 31 Aug '22

31 Aug '22

#### 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 - [x ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Will you accept this? I find this extremely useful for troubleshooting. If accepted I'd like to add to most of the routing blocks. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3228 -- Commit Summary -- * Add More Logging Option -- File Changes -- M etc/kamailio.cfg (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3228.patch https://github.com/kamailio/kamailio/pull/3228.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3228 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3228(a)github.com>

2 2

git:master:aded00bb: dialog: safer version for getting dlg variable value
by Daniel-Constantin Mierla 30 Aug '22

30 Aug '22

Module: kamailio Branch: master Commit: aded00bbfe75771cef8d0ee9ae8401772f7644a9 URL: https://github.com/kamailio/kamailio/commit/aded00bbfe75771cef8d0ee9ae84017… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-30T13:32:16+02:00 dialog: safer version for getting dlg variable value - clone to ensure that reference is not becoming invalid over the time --- Modified: src/modules/dialog/dlg_var.c --- Diff: https://github.com/kamailio/kamailio/commit/aded00bbfe75771cef8d0ee9ae84017… Patch: https://github.com/kamailio/kamailio/commit/aded00bbfe75771cef8d0ee9ae84017… --- diff --git a/src/modules/dialog/dlg_var.c b/src/modules/dialog/dlg_var.c index cd151fd115..04e48fa636 100644 --- a/src/modules/dialog/dlg_var.c +++ b/src/modules/dialog/dlg_var.c @@ -279,22 +279,46 @@ void print_lists(struct dlg_cell *dlg) { } } +static str _dlg_var_strval = STR_NULL; + str * get_dlg_variable(struct dlg_cell *dlg, str *key) { - str* var = NULL; + str* var = NULL; - if( !dlg || !key || key->len > strlen(key->s)) - { - LM_ERR("BUG - bad parameters\n"); + if( !dlg || !key || key->len > strlen(key->s)) + { + LM_ERR("BUG - bad parameters\n"); - return NULL; - } + return NULL; + } - dlg_lock(d_table, &(d_table->entries[dlg->h_entry])); - var = get_dlg_variable_unsafe( dlg, key); - dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); + dlg_lock(d_table, &(d_table->entries[dlg->h_entry])); + var = get_dlg_variable_unsafe( dlg, key); + if(var) { + _dlg_var_strval.len = pv_get_buffer_size(); + if(_dlg_var_strval.len < var->len+1) { + LM_ERR("pv buffer too small (%d) - needed %d\n", + _dlg_var_strval.len, var->len); + _dlg_var_strval.s = NULL; + _dlg_var_strval.len = 0; + var = NULL; + } else { + _dlg_var_strval.s = pv_get_buffer(); + strncpy(_dlg_var_strval.s, var->s, var->len); + _dlg_var_strval.len = var->len; + _dlg_var_strval.s[_dlg_var_strval.len] = '\0'; + } + } else { + _dlg_var_strval.s = NULL; + _dlg_var_strval.len = 0; + } + + dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); - return var; + if(var) { + return &_dlg_var_strval; + } + return NULL; } int get_dlg_variable_uintval(struct dlg_cell *dlg, str *key, unsigned int *uval)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev