- sr-dev - kamailio.org

git:master:2da8060f: pipelimit: init cpu load metrics and check returned value of fscanf()
by Daniel-Constantin Mierla 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: 2da8060f67f09949e11f77a281fcb4e3e5def582 URL: https://github.com/kamailio/kamailio/commit/2da8060f67f09949e11f77a281fcb4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T13:27:24+01:00 pipelimit: init cpu load metrics and check returned value of fscanf() --- Modified: src/modules/pipelimit/pipelimit.c Modified: src/modules/pipelimit/pl_ht.c Modified: src/modules/pipelimit/pl_statistics.c --- Diff: https://github.com/kamailio/kamailio/commit/2da8060f67f09949e11f77a281fcb4e… Patch: https://github.com/kamailio/kamailio/commit/2da8060f67f09949e11f77a281fcb4e… --- diff --git a/src/modules/pipelimit/pipelimit.c b/src/modules/pipelimit/pipelimit.c index e9fc83b7920..625da0e50dd 100644 --- a/src/modules/pipelimit/pipelimit.c +++ b/src/modules/pipelimit/pipelimit.c @@ -214,13 +214,16 @@ int get_num_cpus() /* not using /proc/loadavg because it only works when our_timer_interval == theirs */ static int get_cpuload(double *load) { - static long long o_user, o_nice, o_sys, o_idle, o_iow, o_irq, o_sirq, o_stl; - long long n_user, n_nice, n_sys, n_idle, n_iow, n_irq, n_sirq, n_stl; + static long long o_user = 0, o_nice = 0, o_sys = 0, o_idle = 0, o_iow = 0, + o_irq = 0, o_sirq = 0, o_stl = 0; + long long n_user = 0, n_nice = 0, n_sys = 0, n_idle = 0, n_iow = 0, + n_irq = 0, n_sirq = 0, n_stl = 0; static int first_time = 1; FILE *f = fopen("/proc/stat", "r"); - double vload; - int ncpu; + double vload = 0.0; + int ncpu = 0; static int errormsg = 0; + int n = 0; if(!f) { /* Only write this error message five times. Otherwise you will annoy @@ -231,9 +234,9 @@ static int get_cpuload(double *load) } return -1; } - if(fscanf(f, "cpu %lld%lld%lld%lld%lld%lld%lld%lld", &n_user, &n_nice, - &n_sys, &n_idle, &n_iow, &n_irq, &n_sirq, &n_stl) - < 0) { + n = fscanf(f, "cpu %lld%lld%lld%lld%lld%lld%lld%lld", &n_user, &n_nice, + &n_sys, &n_idle, &n_iow, &n_irq, &n_sirq, &n_stl); + if(n < 8) { LM_ERR("could not parse load information\n"); fclose(f); return -1; diff --git a/src/modules/pipelimit/pl_ht.c b/src/modules/pipelimit/pl_ht.c index 5f9b52dfc4a..c4e30de6190 100644 --- a/src/modules/pipelimit/pl_ht.c +++ b/src/modules/pipelimit/pl_ht.c @@ -56,6 +56,7 @@ str_map_t algo_names[] = { int pl_init_htable(unsigned int hsize) { int i; + int j; if(_pl_pipes_ht != NULL) return -1; @@ -80,10 +81,10 @@ int pl_init_htable(unsigned int hsize) for(i = 0; i < _pl_pipes_ht->htsize; i++) { if(lock_init(&_pl_pipes_ht->slots[i].lock) == 0) { LM_ERR("cannot initialize lock[%d]\n", i); - i--; - while(i >= 0) { - lock_destroy(&_pl_pipes_ht->slots[i].lock); - i--; + j = i - 1; + while(j >= 0) { + lock_destroy(&_pl_pipes_ht->slots[j].lock); + j--; } shm_free(_pl_pipes_ht->slots); shm_free(_pl_pipes_ht); diff --git a/src/modules/pipelimit/pl_statistics.c b/src/modules/pipelimit/pl_statistics.c index c350acb0fc1..40d48b0a7c3 100644 --- a/src/modules/pipelimit/pl_statistics.c +++ b/src/modules/pipelimit/pl_statistics.c @@ -184,7 +184,7 @@ int get_socket_list_from_proto_and_family( return 0; } - *ipList = pkg_malloc(numberOfSockets * (num_ip_octets + 1) * sizeof(int)); + *ipList = pkg_malloc(sizeof(int) * numberOfSockets * (num_ip_octets + 1)); /* We couldn't allocate memory for the IP List. So all we can do is * fail. */

1 0

git:master:d439a040: sms: more printing to buffer with size limit
by Daniel-Constantin Mierla 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: d439a0400caee337419cb2645b549d4926ede04e URL: https://github.com/kamailio/kamailio/commit/d439a0400caee337419cb2645b549d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T12:58:17+01:00 sms: more printing to buffer with size limit --- Modified: src/modules/sms/libsms_getsms.c Modified: src/modules/sms/libsms_modem.c Modified: src/modules/sms/sms_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/d439a0400caee337419cb2645b549d4… Patch: https://github.com/kamailio/kamailio/commit/d439a0400caee337419cb2645b549d4… --- diff --git a/src/modules/sms/libsms_getsms.c b/src/modules/sms/libsms_getsms.c index 94f50f917b2..e4ff2296707 100644 --- a/src/modules/sms/libsms_getsms.c +++ b/src/modules/sms/libsms_getsms.c @@ -160,7 +160,7 @@ static int fetchsms(struct modem *mdm, int sim, char *pdu) } } else { LM_DBG("Trying to get stored message %i\n", sim); - clen = sprintf(command, "AT+CMGR=%i\r", sim); + clen = snprintf(command, 16, "AT+CMGR=%i\r", sim); put_command(mdm, command, clen, answer, sizeof(answer), 50, 0); /* search for beginning of the answer */ position = strstr(answer, "+CMGR:"); @@ -200,7 +200,7 @@ static void deletesms(struct modem *mdm, int sim) int clen; LM_DBG("Deleting message %i !\n", sim); - clen = sprintf(command, "AT+CMGD=%i\r", sim); + clen = snprintf(command, 32, "AT+CMGD=%i\r", sim); put_command(mdm, command, clen, answer, sizeof(answer), 50, 0); } @@ -308,13 +308,13 @@ static int splitascii(struct modem *mdm, char *source, struct incame_sms *sms) } /* Get the date */ start = end + 3; - sprintf(dbuf, "%c%c-%c%c-%c%c", start[3], start[4], start[0], start[1], - start[6], start[7]); + snprintf(dbuf, DATE_LEN + 1, "%c%c-%c%c-%c%c", start[3], start[4], start[0], + start[1], start[6], start[7]); memcpy(sms->date, dbuf, DATE_LEN); /* Get the time */ start += 9; - sprintf(tbuf, "%c%c:%c%c:%c%c", start[0], start[1], start[3], start[4], - start[7], start[7]); + snprintf(tbuf, TIME_LEN + 1, "%c%c:%c%c:%c%c", start[0], start[1], start[3], + start[4], start[7], start[7]); memcpy(sms->time, tbuf, TIME_LEN); sms->userdatalength = strlen(sms->ascii); return 1; diff --git a/src/modules/sms/libsms_modem.c b/src/modules/sms/libsms_modem.c index 1740b2ab463..7540b99ab33 100644 --- a/src/modules/sms/libsms_modem.c +++ b/src/modules/sms/libsms_modem.c @@ -225,7 +225,8 @@ int initmodem(struct modem *mdm, cds_report cds_report_f) put_command(mdm, "AT+CPIN?\r", 9, answer, sizeof(answer), 50, 0); if(strstr(answer, "+CPIN: SIM PIN")) { LM_INFO("Modem needs PIN, entering PIN...\n"); - clen = sprintf(command, "AT+CPIN=\"%s\"\r", mdm->pin); + clen = snprintf( + command, MAX_CHAR_BUF + 12, "AT+CPIN=\"%s\"\r", mdm->pin); put_command(mdm, command, clen, answer, sizeof(answer), 100, 0); put_command(mdm, "AT+CPIN?\r", 9, answer, sizeof(answer), 50, 0); if(!strstr(answer, "+CPIN: READY")) { @@ -377,7 +378,7 @@ int setsmsc(struct modem *mdm, char *smsc) int clen; if(smsc && smsc[0]) { - clen = sprintf(command, "AT+CSCA=\"+%s\"\r", smsc); + clen = snprintf(command, 100, "AT+CSCA=\"+%s\"\r", smsc); put_command(mdm, command, clen, answer, sizeof(answer), 50, 0); } return 0; diff --git a/src/modules/sms/sms_funcs.c b/src/modules/sms/sms_funcs.c index 7c45d8c5967..f0cf47afa7d 100644 --- a/src/modules/sms/sms_funcs.c +++ b/src/modules/sms/sms_funcs.c @@ -487,7 +487,7 @@ int send_as_sms(struct sms_msg *sms_messg, struct modem *mdm) goto error; if(sms_report_type != NO_REPORT) add_sms_into_report_queue(ret_code, sms_messg, - p - use_nice * (nr_chunks > 1) * SMS_EDGE_PART_LEN, + p - SMS_EDGE_PART_LEN * use_nice * (nr_chunks > 1), len_array[i]); }

1 0

git:5.6:3a7afccf: rabbitmq: backport of RABBITMQ_ERR_CREATE needed for handling allocation error
by Victor Seva 21 Nov '23

21 Nov '23

Module: kamailio Branch: 5.6 Commit: 3a7afccf8db3936d46bcc1b190ea23c3b5d27447 URL: https://github.com/kamailio/kamailio/commit/3a7afccf8db3936d46bcc1b190ea23c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-11-21T14:37:33+01:00 rabbitmq: backport of RABBITMQ_ERR_CREATE needed for handling allocation error (cherry picked from commit f764cef139d55adb5d38ffc6a1a65fd14bda5f4c) --- Modified: src/modules/rabbitmq/rabbitmq.h --- Diff: https://github.com/kamailio/kamailio/commit/3a7afccf8db3936d46bcc1b190ea23c… Patch: https://github.com/kamailio/kamailio/commit/3a7afccf8db3936d46bcc1b190ea23c… --- diff --git a/src/modules/rabbitmq/rabbitmq.h b/src/modules/rabbitmq/rabbitmq.h index 30f39ca7fd5..4eb31958643 100644 --- a/src/modules/rabbitmq/rabbitmq.h +++ b/src/modules/rabbitmq/rabbitmq.h @@ -49,6 +49,7 @@ typedef enum RABBITMQ_ERR_CHANNEL, RABBITMQ_ERR_QUEUE, RABBITMQ_ERR_PUBLISH, + RABBITMQ_ERR_CREATE, RABBITMQ_ERR_SOCK, RABBITMQ_ERR_CONSUME, RABBITMQ_ERR_NULL,

1 0

git:master:1ded1730: mediaproxy: print to buffer with size limit
by Daniel-Constantin Mierla 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: 1ded1730c7fe81596d874fdc314dab64a7dab25b URL: https://github.com/kamailio/kamailio/commit/1ded1730c7fe81596d874fdc314dab6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T12:04:01+01:00 mediaproxy: print to buffer with size limit --- Modified: src/modules/mediaproxy/mediaproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/1ded1730c7fe81596d874fdc314dab6… Patch: https://github.com/kamailio/kamailio/commit/1ded1730c7fe81596d874fdc314dab6… --- diff --git a/src/modules/mediaproxy/mediaproxy.c b/src/modules/mediaproxy/mediaproxy.c index 8b8d87616ad..782bc202893 100644 --- a/src/modules/mediaproxy/mediaproxy.c +++ b/src/modules/mediaproxy/mediaproxy.c @@ -1614,7 +1614,7 @@ static int use_media_proxy( if(session.supported_count == 0) return 1; // there are no supported media streams. we have nothing to do. - len = sprintf(media_str, "%s", "media: "); + len = snprintf(media_str, sizeof(media_str), "%s", "media: "); for(i = 0, str_buf.len = sizeof(media_str) - len - 2, str_buf.s = media_str + len; i < session.stream_count; i++) { @@ -1628,15 +1628,15 @@ static int use_media_proxy( (unsigned long)sizeof(media_str)); return -1; } - len = sprintf(str_buf.s, "%.*s:%.*s:%.*s:%.*s:%s,", stream.type.len, - stream.type.s, stream.ip.len, stream.ip.s, stream.port.len, - stream.port.s, stream.direction.len, stream.direction.s, - stream.has_ice ? "ice=yes" : "ice=no"); + len = snprintf(str_buf.s, str_buf.len, "%.*s:%.*s:%.*s:%.*s:%s,", + stream.type.len, stream.type.s, stream.ip.len, stream.ip.s, + stream.port.len, stream.port.s, stream.direction.len, + stream.direction.s, stream.has_ice ? "ice=yes" : "ice=no"); str_buf.s += len; str_buf.len -= len; } *(str_buf.s - 1) = 0; // remove the last comma - sprintf(str_buf.s - 1, "%s", "\r\n"); + snprintf(str_buf.s - 1, str_buf.len + 1, "%s", "\r\n"); } else { media_str[0] = 0; } @@ -1819,7 +1819,7 @@ static int use_media_proxy( : ice_data->priority; port = strtoint(&tokens[j]); candidate.s = buf; - candidate.len = sprintf(candidate.s, + candidate.len = snprintf(candidate.s, sizeof(buf), "a=candidate:R%x 1 UDP %u %.*s %i typ relay%.*s", hexip.s_addr, priority, tokens[0].len, tokens[0].s, port, session.separator.len, session.separator.s); @@ -1833,7 +1833,7 @@ static int use_media_proxy( if(stream.has_rtcp_ice) { candidate.s = buf; - candidate.len = sprintf(candidate.s, + candidate.len = snprintf(candidate.s, sizeof(buf), "a=candidate:R%x 2 UDP %u %.*s %i typ relay%.*s", hexip.s_addr, priority - 1, tokens[0].len, tokens[0].s, port + 1, session.separator.len, session.separator.s); @@ -2199,4 +2199,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_mediaproxy_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:7a2ad119: sms: print to buffer with size limit
by Daniel-Constantin Mierla 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: 7a2ad1190553911770e3a78246ef037c6de49e5c URL: https://github.com/kamailio/kamailio/commit/7a2ad1190553911770e3a78246ef037… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T11:49:12+01:00 sms: print to buffer with size limit --- Modified: src/modules/sms/libsms_putsms.c --- Diff: https://github.com/kamailio/kamailio/commit/7a2ad1190553911770e3a78246ef037… Patch: https://github.com/kamailio/kamailio/commit/7a2ad1190553911770e3a78246ef037… --- diff --git a/src/modules/sms/libsms_putsms.c b/src/modules/sms/libsms_putsms.c index 1622a1bb0f5..a130d4acf6c 100644 --- a/src/modules/sms/libsms_putsms.c +++ b/src/modules/sms/libsms_putsms.c @@ -101,7 +101,8 @@ int binary2pdu(char *binary, int length, char *pdu) /* make the PDU string. The destination variable pdu has to be big enough. */ -int make_pdu(struct sms_msg *msg, struct modem *mdm, char *pdu) +int make_pdu(struct sms_msg *msg, struct modem *mdm, char *pdu, + unsigned int pdu_size) { int coding; int flags; @@ -127,11 +128,11 @@ int make_pdu(struct sms_msg *msg, struct modem *mdm, char *pdu) flags += 16; // Validity field /* concatenate the first part of the PDU string */ if(mdm->mode == MODE_OLD) - pdu_len += sprintf(pdu, "%02X00%02X91%s00%02X%02X", flags, msg->to.len, - tmp, coding, msg->text.len); - else - pdu_len += sprintf(pdu, "00%02X00%02X91%s00%02XA7%02X", flags, + pdu_len += snprintf(pdu, pdu_size, "%02X00%02X91%s00%02X%02X", flags, msg->to.len, tmp, coding, msg->text.len); + else + pdu_len += snprintf(pdu, pdu_size, "00%02X00%02X91%s00%02XA7%02X", + flags, msg->to.len, tmp, coding, msg->text.len); /* Create the PDU string of the message */ /* pdu_len += binary2pdu(msg->text.s,msg->text.len,pdu+pdu_len); */ pdu_len += @@ -180,20 +181,20 @@ int putsms(struct sms_msg *sms_messg, struct modem *mdm) int pdu_len; int sms_id; - pdu_len = make_pdu(sms_messg, mdm, pdu); + pdu_len = make_pdu(sms_messg, mdm, pdu, 500); if(mdm->mode == MODE_OLD) - clen = sprintf(command, "AT+CMGS=%i\r", pdu_len / 2); + clen = snprintf(command, 500, "AT+CMGS=%i\r", pdu_len / 2); else if(mdm->mode == MODE_ASCII) - clen = sprintf(command, "AT+CMGS=\"+%.*s\"\r", sms_messg->to.len, + clen = snprintf(command, 500, "AT+CMGS=\"+%.*s\"\r", sms_messg->to.len, sms_messg->to.s); else - clen = sprintf(command, "AT+CMGS=%i\r", pdu_len / 2 - 1); + clen = snprintf(command, 500, "AT+CMGS=%i\r", pdu_len / 2 - 1); if(mdm->mode == MODE_ASCII) - clen2 = sprintf( - command2, "%.*s\x1A", sms_messg->text.len, sms_messg->text.s); + clen2 = snprintf(command2, 500, "%.*s\x1A", sms_messg->text.len, + sms_messg->text.s); else - clen2 = sprintf(command2, "%.*s\x1A", pdu_len, pdu); + clen2 = snprintf(command2, 500, "%.*s\x1A", pdu_len, pdu); sms_id = 0; for(err_code = 0, retries = 0; err_code < 2 && retries < mdm->retry;

1 0

git:master:20b690a3: topos: open db connection in mod init only when checking table version
by Daniel-Constantin Mierla 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: 20b690a31ee0d3fbaa86fdf87790d842a982bcf5 URL: https://github.com/kamailio/kamailio/commit/20b690a31ee0d3fbaa86fdf87790d84… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T11:36:10+01:00 topos: open db connection in mod init only when checking table version --- Modified: src/modules/topos/topos_mod.c Modified: src/modules/topos/tps_storage.h --- Diff: https://github.com/kamailio/kamailio/commit/20b690a31ee0d3fbaa86fdf87790d84… Patch: https://github.com/kamailio/kamailio/commit/20b690a31ee0d3fbaa86fdf87790d84… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 40133099bf4..440936f294c 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -79,6 +79,9 @@ db_func_t _tpsdbf; /* sruid to get internal uid */ sruid_t _tps_sruid; +extern str tt_table_name; +extern str td_table_name; + /** module parameters */ static str _tps_db_url = str_init(DEFAULT_DB_URL); int _tps_param_mask_callid = 0; @@ -259,26 +262,24 @@ static int mod_init(void) "provide all functions needed\n"); return -1; } - topos_db_con = _tpsdbf.init(&_tps_db_url); - if(topos_db_con == NULL) { - LM_ERR("failed to open database connection\n"); - goto dberror; - } - if(_tps_version_table_check != 0 - && db_check_table_version(&_tpsdbf, topos_db_con, - &td_table_name, TD_TABLE_VERSION) - < 0) { - DB_TABLE_VERSION_ERROR(td_table_name); - goto dberror; - } - if(_tps_version_table_check != 0 - && db_check_table_version(&_tpsdbf, topos_db_con, - &tt_table_name, TT_TABLE_VERSION) - < 0) { - DB_TABLE_VERSION_ERROR(tt_table_name); - goto dberror; - } - if(topos_db_con) { + if(_tps_version_table_check != 0) { + topos_db_con = _tpsdbf.init(&_tps_db_url); + if(topos_db_con == NULL) { + LM_ERR("failed to open database connection\n"); + goto dberror; + } + if(db_check_table_version( + &_tpsdbf, topos_db_con, &td_table_name, TD_TABLE_VERSION) + < 0) { + DB_TABLE_VERSION_ERROR(td_table_name); + goto dberror; + } + if(db_check_table_version( + &_tpsdbf, topos_db_con, &tt_table_name, TT_TABLE_VERSION) + < 0) { + DB_TABLE_VERSION_ERROR(tt_table_name); + goto dberror; + } _tpsdbf.close(topos_db_con); topos_db_con = NULL; } diff --git a/src/modules/topos/tps_storage.h b/src/modules/topos/tps_storage.h index 65d2c5d8be9..4c2585a1ff6 100644 --- a/src/modules/topos/tps_storage.h +++ b/src/modules/topos/tps_storage.h @@ -85,8 +85,6 @@ typedef struct tps_data int32_t expires; } tps_data_t; -extern str tt_table_name; -extern str td_table_name; int tps_storage_dialog_find(sip_msg_t *msg, tps_data_t *td); int tps_storage_dialog_save(sip_msg_t *msg, tps_data_t *td); int tps_storage_dialog_rm(sip_msg_t *msg, tps_data_t *td);

1 0

git:master:650117eb: modules: readme files regenerated - topos ... [skip ci]
by Kamailio Dev 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: 650117ebc0a3e0369dd47015f7e96358515fedc9 URL: https://github.com/kamailio/kamailio/commit/650117ebc0a3e0369dd47015f7e9635… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-11-21T11:32:12+01:00 modules: readme files regenerated - topos ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/650117ebc0a3e0369dd47015f7e9635… Patch: https://github.com/kamailio/kamailio/commit/650117ebc0a3e0369dd47015f7e9635… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index ad13698a204..70af19ae47e 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -52,6 +52,7 @@ Frederic Gaisnon 3.19. methods_nocontact (str) 3.20. header_mode (int) 3.21. methods_noinitial (str) + 3.22. version_table (integer) 4. Functions @@ -87,11 +88,12 @@ Frederic Gaisnon 1.19. Set methods_nocontact parameter 1.20. Set header_mode parameter 1.21. Set methods_noinitial parameter - 1.22. tps_set_context usage - 1.23. Usage of event_route[topos:msg-outgoing] - 1.24. Usage of event_route[topos:msg-sending] - 1.25. Usage of event_route[topos:msg-incoming] - 1.26. Usage of event_route[topos:msg-receiving] + 1.22. version_table parameter usage + 1.23. tps_set_context usage + 1.24. Usage of event_route[topos:msg-outgoing] + 1.25. Usage of event_route[topos:msg-sending] + 1.26. Usage of event_route[topos:msg-incoming] + 1.27. Usage of event_route[topos:msg-receiving] Chapter 1. Admin Guide @@ -126,6 +128,7 @@ Chapter 1. Admin Guide 3.19. methods_nocontact (str) 3.20. header_mode (int) 3.21. methods_noinitial (str) + 3.22. version_table (integer) 4. Functions @@ -202,6 +205,7 @@ Chapter 1. Admin Guide 3.19. methods_nocontact (str) 3.20. header_mode (int) 3.21. methods_noinitial (str) + 3.22. version_table (integer) 3.1. storage (str) @@ -526,6 +530,17 @@ modparam("topos", "header_mode", 1) modparam("topos", "methods_noinitial", "OPTIONS,NOTIFY") ... +3.22. version_table (integer) + + If set to 0, the module will skip checking the version of the tables. + + Default value is ��1 (check for table version)��. + + Example 1.22. version_table parameter usage +... +modparam("topos", "version_table", 0) +... + 4. Functions 4.1. tps_set_context(ctx) @@ -537,7 +552,7 @@ modparam("topos", "methods_noinitial", "OPTIONS,NOTIFY") This function can be used from ANY_ROUTE. - Example 1.22. tps_set_context usage + Example 1.23. tps_set_context usage ... request_route { ... @@ -565,7 +580,7 @@ request_route { reparsing the outgoing SIP message for the cases when topology hiding is not wanted. - Example 1.23. Usage of event_route[topos:msg-outgoing] + Example 1.24. Usage of event_route[topos:msg-outgoing] ... event_route[topos:msg-outgoing] { if($sndto(ip)=="10.1.1.10") { @@ -584,7 +599,7 @@ event_route[topos:msg-outgoing] { $sndto(proto) point to the destination. The SIP message is the one to be sent out. - Example 1.24. Usage of event_route[topos:msg-sending] + Example 1.25. Usage of event_route[topos:msg-sending] ... event_route[topos:msg-sending] { if(is_request() and $fU=="alice") { @@ -604,7 +619,7 @@ event_route[topos:msg-sending] { internally generated one at startup, to avoid reparsing the outgoing SIP message for the cases when topology hiding is not wanted. - Example 1.25. Usage of event_route[topos:msg-incoming] + Example 1.26. Usage of event_route[topos:msg-incoming] ... event_route[topos:msg-incoming] { if($si=="10.1.1.10") { @@ -622,7 +637,7 @@ event_route[topos:msg-incoming] { Inside the event route the variables $si, $sp and $proto point to the source address. The SIP message is the one to be sent out. - Example 1.26. Usage of event_route[topos:msg-receiving] + Example 1.27. Usage of event_route[topos:msg-receiving] ... event_route[topos:msg-receiving] { if(is_request() and $fU=="alice") {

1 0

[kamailio/kamailio] topos: Add db version check (PR #3639)
by Xenofon Karamanos 21 Nov '23

21 Nov '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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Add a database version check and fail gracefully if it does not match. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3639 -- Commit Summary -- * topos: Add db version check -- File Changes -- M src/modules/topos/topos_mod.c (26) M src/modules/topos/tps_storage.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3639.patch https://github.com/kamailio/kamailio/pull/3639.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3639 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3639(a)github.com>

2 9

git:master:dab123bf: topos: Add version_table documentation
by Daniel-Constantin Mierla 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: dab123bf9c19bbd67eab05cbadf9efea5682c0dc URL: https://github.com/kamailio/kamailio/commit/dab123bf9c19bbd67eab05cbadf9efe… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T11:22:14+01:00 topos: Add version_table documentation --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/dab123bf9c19bbd67eab05cbadf9efe… Patch: https://github.com/kamailio/kamailio/commit/dab123bf9c19bbd67eab05cbadf9efe… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index 441c099d8ec..4ccc4b7790f 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -600,6 +600,23 @@ modparam("topos", "methods_noinitial", "OPTIONS,NOTIFY") </programlisting> </example> </section> + <section id="topos.p.version_table"> + <title><varname>version_table</varname> (integer)</title> + <para> + If set to 0, the module will skip checking the version of the tables. + </para> + <para> + Default value is <quote>1 (check for table version)</quote>. + </para> + <example> + <title><varname>version_table</varname> parameter usage</title> + <programlisting format="linespecific"> +... +modparam("topos", "version_table", 0) +... + </programlisting> + </example> + </section> </section> <section>

1 0

git:master:356f4f9e: topos: Add version_table parameter
by Daniel-Constantin Mierla 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: 356f4f9e1319ecfdede4b46f636de3143b85ca5e URL: https://github.com/kamailio/kamailio/commit/356f4f9e1319ecfdede4b46f636de31… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T11:22:14+01:00 topos: Add version_table parameter --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/356f4f9e1319ecfdede4b46f636de31… Patch: https://github.com/kamailio/kamailio/commit/356f4f9e1319ecfdede4b46f636de31… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index d7efd055535..40133099bf4 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -104,6 +104,9 @@ int _tps_clean_interval = 60; #define TPS_EVENTRT_RECEIVING 8 #define TT_TABLE_VERSION 2 #define TD_TABLE_VERSION 2 + +static int _tps_version_table_check = 1; + static int _tps_eventrt_mode = TPS_EVENTRT_OUTGOING | TPS_EVENTRT_SENDING | TPS_EVENTRT_INCOMING | TPS_EVENTRT_RECEIVING; static int _tps_eventrt_outgoing = -1; @@ -177,6 +180,7 @@ static param_export_t params[] = {{"storage", PARAM_STR, &_tps_storage}, {"context", PARAM_STR, &_tps_context_param}, {"methods_nocontact", PARAM_STR, &_tps_methods_nocontact_list}, {"methods_noinitial", PARAM_STR, &_tps_methods_noinitial_list}, + {"version_table", INT_PARAM, &_tps_version_table_check}, {0, 0, 0}}; @@ -260,15 +264,17 @@ static int mod_init(void) LM_ERR("failed to open database connection\n"); goto dberror; } - if(db_check_table_version( - &_tpsdbf, topos_db_con, &td_table_name, TD_TABLE_VERSION) - < 0) { + if(_tps_version_table_check != 0 + && db_check_table_version(&_tpsdbf, topos_db_con, + &td_table_name, TD_TABLE_VERSION) + < 0) { DB_TABLE_VERSION_ERROR(td_table_name); goto dberror; } - if(db_check_table_version( - &_tpsdbf, topos_db_con, &tt_table_name, TT_TABLE_VERSION) - < 0) { + if(_tps_version_table_check != 0 + && db_check_table_version(&_tpsdbf, topos_db_con, + &tt_table_name, TT_TABLE_VERSION) + < 0) { DB_TABLE_VERSION_ERROR(tt_table_name); goto dberror; }

1 0

git:master:132a0024: topos: Close db connection
by Daniel-Constantin Mierla 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: 132a0024394494da8766c31c94f42822c79a0a51 URL: https://github.com/kamailio/kamailio/commit/132a0024394494da8766c31c94f4282… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T11:22:14+01:00 topos: Close db connection --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/132a0024394494da8766c31c94f4282… Patch: https://github.com/kamailio/kamailio/commit/132a0024394494da8766c31c94f4282… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 3d570953cff..d7efd055535 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -272,6 +272,10 @@ static int mod_init(void) DB_TABLE_VERSION_ERROR(tt_table_name); goto dberror; } + if(topos_db_con) { + _tpsdbf.close(topos_db_con); + topos_db_con = NULL; + } } else { if(_tps_storage.len != 7 && strncmp(_tps_storage.s, "redis", 5) != 0) { LM_ERR("unknown storage type: %.*s\n", _tps_storage.len,

1 0

git:master:c0639031: topos: Add db version check
by Daniel-Constantin Mierla 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: c06390319a7afcca498a4a72cdcd0c11b7bb2ff2 URL: https://github.com/kamailio/kamailio/commit/c06390319a7afcca498a4a72cdcd0c1… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T11:22:14+01:00 topos: Add db version check --- Modified: src/modules/topos/topos_mod.c Modified: src/modules/topos/tps_storage.h --- Diff: https://github.com/kamailio/kamailio/commit/c06390319a7afcca498a4a72cdcd0c1… Patch: https://github.com/kamailio/kamailio/commit/c06390319a7afcca498a4a72cdcd0c1… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 4540382b725..3d570953cff 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -102,6 +102,8 @@ int _tps_clean_interval = 60; #define TPS_EVENTRT_SENDING 2 #define TPS_EVENTRT_INCOMING 4 #define TPS_EVENTRT_RECEIVING 8 +#define TT_TABLE_VERSION 2 +#define TD_TABLE_VERSION 2 static int _tps_eventrt_mode = TPS_EVENTRT_OUTGOING | TPS_EVENTRT_SENDING | TPS_EVENTRT_INCOMING | TPS_EVENTRT_RECEIVING; static int _tps_eventrt_outgoing = -1; @@ -198,6 +200,7 @@ struct module_exports exports = { */ static int mod_init(void) { + db1_con_t *topos_db_con = NULL; _tps_eventrt_outgoing = route_lookup(&event_rt, _tps_eventrt_outgoing_name.s); if(_tps_eventrt_outgoing < 0 @@ -252,6 +255,23 @@ static int mod_init(void) "provide all functions needed\n"); return -1; } + topos_db_con = _tpsdbf.init(&_tps_db_url); + if(topos_db_con == NULL) { + LM_ERR("failed to open database connection\n"); + goto dberror; + } + if(db_check_table_version( + &_tpsdbf, topos_db_con, &td_table_name, TD_TABLE_VERSION) + < 0) { + DB_TABLE_VERSION_ERROR(td_table_name); + goto dberror; + } + if(db_check_table_version( + &_tpsdbf, topos_db_con, &tt_table_name, TT_TABLE_VERSION) + < 0) { + DB_TABLE_VERSION_ERROR(tt_table_name); + goto dberror; + } } else { if(_tps_storage.len != 7 && strncmp(_tps_storage.s, "redis", 5) != 0) { LM_ERR("unknown storage type: %.*s\n", _tps_storage.len, @@ -303,6 +323,12 @@ static int mod_init(void) return 0; error: return -1; +dberror: + if(topos_db_con) { + _tpsdbf.close(topos_db_con); + topos_db_con = NULL; + } + return -1; } /** diff --git a/src/modules/topos/tps_storage.h b/src/modules/topos/tps_storage.h index 4c2585a1ff6..65d2c5d8be9 100644 --- a/src/modules/topos/tps_storage.h +++ b/src/modules/topos/tps_storage.h @@ -85,6 +85,8 @@ typedef struct tps_data int32_t expires; } tps_data_t; +extern str tt_table_name; +extern str td_table_name; int tps_storage_dialog_find(sip_msg_t *msg, tps_data_t *td); int tps_storage_dialog_save(sip_msg_t *msg, tps_data_t *td); int tps_storage_dialog_rm(sip_msg_t *msg, tps_data_t *td);

1 0

git:5.6:351c8c96: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 21 Nov '23

21 Nov '23

Module: kamailio Branch: 5.6 Commit: 351c8c962bc4573863b1b21da4d3728e8c7d0e33 URL: https://github.com/kamailio/kamailio/commit/351c8c962bc4573863b1b21da4d3728… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-11-21T11:16:58+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/app_lua/README Modified: src/modules/htable/README Modified: src/modules/http_async_client/README Modified: src/modules/kemix/README Modified: src/modules/mqueue/README Modified: src/modules/xhttp/README Modified: src/modules/xlog/README --- Diff: https://github.com/kamailio/kamailio/commit/351c8c962bc4573863b1b21da4d3728… Patch: https://github.com/kamailio/kamailio/commit/351c8c962bc4573863b1b21da4d3728…

1 0

git: new commits in branch 5.6
by Daniel-Constantin Mierla 21 Nov '23

21 Nov '23

- URL: https://github.com/kamailio/kamailio/commit/1121b39f80a371e670480997e91f956… Author: Ihor Olkhovskyi <ihor.olkhovskyi(a)cern.ch> Date: 2023-11-20T14:09:34+01:00 doc/htable: adding examples in a case of key value is an integer (cherry picked from commit 23c67322c244fc4bf6e990379d2fd876b55b2cbe) - URL: https://github.com/kamailio/kamailio/commit/cd156834b7217fbbbefff7367a83dc8… Author: Henning Westerholt <hw(a)gilawa.com> Date: 2023-11-20T14:09:55+01:00 htable: fix XML syntax errors introduced in 23c67322c244fc4bf (cherry picked from commit 70d8308bbf849b00be69d5c3091b57dfe214b81b) - URL: https://github.com/kamailio/kamailio/commit/b2083e806c0a8c5d2a202482e3670fa… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-11-20T14:14:47+01:00 lcr: fix building warnings initializating values > https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=… > [...] > lcr_mod.c:2630:9: warning: 'tmp_tag.len' may be used uninitialized [-Wmaybe-uninitialized] (cherry picked from commit 781ee072593f16a100ef00b5ef71fcfd6f8ded2b) - URL: https://github.com/kamailio/kamailio/commit/d6c60c09e30da3a1cd8ab1cf333650c… Author: Pantelis Kolatsis <pk(a)gilawa.com> Date: 2023-11-21T08:27:05+01:00 dispatcher: add missing memory allocation checks, convert to memory log macros (cherry picked from commit 6aee3bd7c86a1874cc140a7874b740981f14f5f5) - URL: https://github.com/kamailio/kamailio/commit/bf47b53fbd5f2dfa82060a3c4f2ec44… Author: Henning Westerholt <hw(a)gilawa.com> Date: 2023-11-21T08:27:23+01:00 dispatcher: small formatting adaption related to 6aee3bd7c (cherry picked from commit aa4d015a58bb24ba5bda6e6133b0e9f314e2318e) - URL: https://github.com/kamailio/kamailio/commit/8c11f2f93e30c41221a0c43836a1f07… Author: Pantelis Kolatsis <pk(a)gilawa.com> Date: 2023-11-21T08:27:35+01:00 dmq: add missing memory allocation checks, convert to memory log macros (cherry picked from commit 7e617ab89f5275f1b269382ae2c1fee508854cf1) - URL: https://github.com/kamailio/kamailio/commit/e547217dd93db36b107b92f224fea07… Author: Pantelis Kolatsis <pk(a)gilawa.com> Date: 2023-11-21T08:29:10+01:00 async: convert to memory error logging helper (cherry picked from commit b9d397c84cb3e0911e9823386b6eb4944b02c9ed) - URL: https://github.com/kamailio/kamailio/commit/8c7224f575018302e9efd6555e90cac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T10:36:47+01:00 siprepo: translate pointers to the new buffer - GH #3418 (cherry picked from commit 15c7f861d72c57ee57f41c108d948027e50a0a27) - URL: https://github.com/kamailio/kamailio/commit/69f483cc9195d912fbdb04bbd7588b3… Author: �� <git-dpa(a)aegee.org> Date: 2023-11-21T10:38:58+01:00 kemix: update Kamailio URLs to HTTP �� HTTPS (cherry picked from commit 79fc3f1fc9561f43146a107c824d1d97d3a8b021) - URL: https://github.com/kamailio/kamailio/commit/357230ff85dfeb46819e527be255faa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T10:45:23+01:00 siprepo: check if list is set on insert (cherry picked from commit 423a818cf6e8f6d672630a0365e13877a173508f) (cherry picked from commit e95a79eef0589be2f7d0470bfe6ba19b006730c6) - URL: https://github.com/kamailio/kamailio/commit/9705b10871c7056c192c54c3ba5c76f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T10:45:42+01:00 cfgt: reworked test on dest.s for freeing (cherry picked from commit b2f99145fa7f4088c80dd3e759372445f93f5492) (cherry picked from commit 3b6d0bd508d62b6f6cd0176551311d25225bf63e) - URL: https://github.com/kamailio/kamailio/commit/3c48704f19133f29f730ecaf8e53461… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T10:46:30+01:00 async: use _async_timer_exec_last_slot = UINT_MAX for initial value (cherry picked from commit bc544daea2ee4bb568cf0314f6d32b8aa0c81ecc) (cherry picked from commit b68cb1ace4d44ba0a471a9fd9a6138f3738efef4) - URL: https://github.com/kamailio/kamailio/commit/106a8da206220ba9148845b4c7027e8… Author: Akash Gupta <listen2akash(a)gmail.com> Date: 2023-11-21T10:47:28+01:00 tool: port the route_graph.py script to python version 3.x (cherry picked from commit fa2a69e2ae919b7ba221e87e2001bde83113ce2a) (cherry picked from commit 14638ef43f9b2ef710ae3a6464fb5db0b9de3377) - URL: https://github.com/kamailio/kamailio/commit/49b3285b8cd2be85e85862ca2896ab0… Author: Henning Westerholt <hw(a)gilawa.com> Date: 2023-11-21T10:47:46+01:00 tools: use python3 for route_graph.py tool, for old systems with both python2/python3, fix file closing (cherry picked from commit 7b1fe0483b684693c7baea9b62b471b64c6e22a9) (cherry picked from commit 4f3c32e48b79688ab905802c173b981f92c54e56) - URL: https://github.com/kamailio/kamailio/commit/82d774a3611a0c91cbd357efde8b894… Author: Ovidiu Sas <osas(a)voipembedded.com> Date: 2023-11-21T10:50:58+01:00 mqueue: fix documentation to match the code (cherry picked from commit 23d43645332451ec1ec6dab11da777f9c3bfe304) (cherry picked from commit 91cb5d0adf887db6a34e2a394ab34aae51f475bf) - URL: https://github.com/kamailio/kamailio/commit/a6830a127b0a135f7b5e8164c278d45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T10:51:54+01:00 http_client: fix depecration of CURLOPT_PROTOCOLS and CURLINFO_SIZE_DOWNLOAD - GH #3484 (cherry picked from commit b7b3c67fc1205d114fadf360a594930ef69835a3) (cherry picked from commit 23a121e5d8ffa172f71433c2ef74f323a54e8315) - URL: https://github.com/kamailio/kamailio/commit/6c833deb60daa4382974aa234b53b3f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T10:52:07+01:00 http_client: fix depecration of CURLOPT_REDIR_PROTOCOLS - GH #3492 (cherry picked from commit 4d8263f9be97a541a24cbc6acc9855509640780b) (cherry picked from commit 2bd813b0c4c1b942ee634eca5e68a025be9fab8e) - URL: https://github.com/kamailio/kamailio/commit/99ec027801904aacbb4e2c34c030c3f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T10:52:46+01:00 http_client: use LIBCURL_VERSION_NUM instead of CURL_AT_LEAST_VERSION - older distros have compilers that don't cope with the later (cherry picked from commit 7cd32bf9631a81c7c4382d45f498bdc9c7f9b34c) (cherry picked from commit 7630473f57c7c0ad600067cea7a89693d9926a81) - URL: https://github.com/kamailio/kamailio/commit/515420337ec110252012522f405cbc6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T10:54:53+01:00 jansson: print unknown type in log message (cherry picked from commit b8cae4fbcd026ffb81e8242500212582d9672ad5) (cherry picked from commit e681aa8236b502de31ad6600932517a259b6b62e) - URL: https://github.com/kamailio/kamailio/commit/16a1a3aff860efa54c3523792bf4b9a… Author: Norbert Kopp��ny Legyes <norbert.legyes(a)protonmail.com> Date: 2023-11-21T10:55:06+01:00 xlog: fix docs example for modparam methods_filter (cherry picked from commit b5a37683e364f596b6c5b4ebbba1fff951d7be84) (cherry picked from commit 80b26beb7d4f9cd4b3858e9e2dae4588feec8e28) - URL: https://github.com/kamailio/kamailio/commit/be104e03ede628ac130073a2a22f30c… Author: MVONDO Eric OBS/OINIS <bycl2332(a)orange.com> Date: 2023-11-21T10:56:24+01:00 siptrace: fix pseudo var direction attribute length (cherry picked from commit 508886c3054a8470fe4469e78e63aa37ae93922d) (cherry picked from commit 3e197c7c41c97badece29cbc6477119180b8dcad) - URL: https://github.com/kamailio/kamailio/commit/20b947cbd9c5379be34597d5dd8f866… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T10:56:43+01:00 http_async_client: docs - dependency on libevent - list style for dependencies and links to projects (cherry picked from commit f16d2658bbefb7a9f43076cbaa958fb3a27f6a0c) (cherry picked from commit 5b1592900920143c9ce5c188e2835c1afd27d489) - URL: https://github.com/kamailio/kamailio/commit/fc0faa5a7701720de17de734dab261a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T10:57:01+01:00 xhttp: note about available variables during http request processing (cherry picked from commit 170067e633ef32ea7b17adad46fdfe2c85fadda0) (cherry picked from commit 774b464af7c561e49253066e8ce3b4ee55463d9a) - URL: https://github.com/kamailio/kamailio/commit/f2ba8a78c9981740d7db22195bb8286… Author: Rick Barenthin <rick(a)ng-voice.com> Date: 2023-11-21T10:57:16+01:00 core: cfg.y typo in parsing XAVPVIAFIELDS In the XAVPVIAFIELDS block there is the string written to the wrong variable. The string is stored in _ksr_xavp_via_params.s but the lenght is stored in _ksr_xavp_via_fields.len. This breaks XAVPVIAPARAMS and XAVPVIAFIELDS. (cherry picked from commit 722a79a9ba8ca2608e699ec14684ce004ae10d60) (cherry picked from commit 34a2d87479d1bcc37d74f3d8fcb4186aea90fc84) - URL: https://github.com/kamailio/kamailio/commit/d77981dbb365d2fc345872fc8695a1f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T10:57:26+01:00 rabbitmq: proper check for allocated pointer (cherry picked from commit 4d58141ab84cf248e8c44a96181642ad0f187e80) (cherry picked from commit 3a217af6b9229989b3c7a788a01609e9513024c4) - URL: https://github.com/kamailio/kamailio/commit/d1334e78eca6601195caa786de5d99d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T10:58:16+01:00 core: parser - set via->params.len when body is finished (cherry picked from commit 82b0f273e1cf65051b6c50301c5073dce56c1149) (cherry picked from commit 59d0ebe41017c2270b62f6171285bae02673da3a) - URL: https://github.com/kamailio/kamailio/commit/f5c9c75eff82182174d1af52aa57d65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T10:58:27+01:00 msilo: cast to fix storage size warning (cherry picked from commit c11fcbbe9ed19bc54b800100d15d9ae269735f0c) (cherry picked from commit 35f0efadeceaecc8e3315f4682d9ac4eba36e363) - URL: https://github.com/kamailio/kamailio/commit/198af0d4777487650c2893ce3b2ebea… Author: �� <git-dpa(a)aegee.org> Date: 2023-11-21T10:58:41+01:00 [app_lua] clarify the file scripts can be in source or bytecode (cherry picked from commit a8747aa02ff3fbffd7a63bdc1e5c06188472edfa) (cherry picked from commit 9be895a16c91bcf4eb299ce0ffb14624755baa48) - URL: https://github.com/kamailio/kamailio/commit/8f56ad7736399588305188f068fd012… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T11:02:00+01:00 kamctl: check if kamctlrc is readable - related to GH #3594 (cherry picked from commit a3fd3b12ca9b1c3688255e9d645085947052bc6d) (cherry picked from commit 259812f03ec26d49776050ca5eb657f2771ce8d5) - URL: https://github.com/kamailio/kamailio/commit/49e01375e6d6c43a432ff11dc215564… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T11:02:08+01:00 kamdbctl: check if kamctlrc is readable (cherry picked from commit f16ec35fa448d03613e6bbbff4c354012f56073e) (cherry picked from commit b503b95a2a62a2e51a5cff20caaa30212d078e84) - URL: https://github.com/kamailio/kamailio/commit/76c538ec31184456ce57487ee6deec2… Author: VoIPNuggets.com <akash(a)voipnuggets.com> Date: 2023-11-21T11:03:26+01:00 tools: route_graph - added README file and updated reference URL [skip ci] (cherry picked from commit 976da8c72e9a056b724f584a803a4a8114f70d30) (cherry picked from commit acd47ad9a175684548dd3fb9c45d18ca81ba6fdb) - URL: https://github.com/kamailio/kamailio/commit/7f5fc6f5fbae4f0edd694a5f9400779… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T11:04:33+01:00 dmq_usrloc: avoid needless second local socket search - remove overwriting local socket string value with received item (cherry picked from commit f97149aec9da71085df9dcf4541abba7b756939c) (cherry picked from commit ba19a8f30d6c9f7757ef0c8d55e2139a8279d375) - URL: https://github.com/kamailio/kamailio/commit/17907f4137b28862a1bc86c5b61de96… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T11:05:42+01:00 db_redis: init allocated redis table structure (cherry picked from commit e24df12d10d8b88582907481d161c6a2db5cf8f1) (cherry picked from commit d015ee9c06a8cb6644101d08e4b54f80b96accf6) - URL: https://github.com/kamailio/kamailio/commit/25521d7a7d433eed271f5c44da88595… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T11:06:59+01:00 app_python3: enable error log mode for some of missing callback functions - tm-specific callbacks should trigger error log messages if not found (cherry picked from commit 695dc54dc1547fdee18b00cfa8e4d15f047834a5) (cherry picked from commit 40f5343d4ca2b4c1cf76eaf168a9b1ae4a722a6a)

1 0

[kamailio/kamailio] OpenSSL 3.0 deprecated-declarations on CentOS 9 (Issue #3647)
by sergey-safarov 21 Nov '23

21 Nov '23

``` make[3]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M db_sqlite.so] db_sqlite.so CC (gcc) [M log_systemd.so] journal_send.o CC (gcc) [M log_systemd.so] log_systemd_mod.o LD (gcc) [M log_systemd.so] log_systemd.so CC (gcc) [M systemdops.so] systemdops_mod.o LD (gcc) [M systemdops.so] systemdops.so CC (gcc) [M crypto.so] api.o CC (gcc) [M crypto.so] crypto_aes.o CC (gcc) [M crypto.so] crypto_evcb.o CC (gcc) [M crypto.so] crypto_mod.o CC (gcc) [M crypto.so] crypto_uuid.o LD (gcc) [M crypto.so] crypto.so CC (gcc) [M tls.so] tls_bio.o CC (gcc) [M tls.so] tls_cfg.o CC (gcc) [M tls.so] tls_config.o CC (gcc) [M tls.so] tls_ct_wrq.o CC (gcc) [M tls.so] tls_domain.o CC (gcc) [M tls.so] tls_dump_vf.o CC (gcc) [M tls.so] tls_init.o CC (gcc) [M tls.so] tls_locking.o CC (gcc) [M tls.so] tls_map.o CC (gcc) [M tls.so] tls_mod.o CC (gcc) [M tls.so] tls_rand.o CC (gcc) [M tls.so] tls_rpc.o CC (gcc) [M tls.so] tls_select.o CC (gcc) [M tls.so] tls_server.o CC (gcc) [M tls.so] tls_util.o CC (gcc) [M tls.so] tls_verify.o LD (gcc) [M tls.so] tls.so CC (gcc) [M auth_identity.so] auth_crypt.o auth_crypt.c: In function 'rsa_sha1_enc': auth_crypt.c:214:9: warning: 'RSA_sign' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 214 | if(RSA_sign(NID_sha1, sstrcrypted, sizeof sstrcrypted, | ^~ In file included from /usr/include/openssl/x509.h:36, from /usr/include/openssl/pem.h:23, from auth_crypt.c:33: /usr/include/openssl/rsa.h:356:27: note: declared here 356 | OSSL_DEPRECATEDIN_3_0 int RSA_sign(int type, const unsigned char *m, | ^~~~~~~~ auth_crypt.c: In function 'rsa_sha1_dec': auth_crypt.c:258:9: warning: 'EVP_PKEY_get1_RSA' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 258 | hpubkey = EVP_PKEY_get1_RSA(pkey); | ^~~~~~~ In file included from /usr/include/openssl/pem.h:22, from auth_crypt.c:33: /usr/include/openssl/evp.h:1359:16: note: declared here 1359 | struct rsa_st *EVP_PKEY_get1_RSA(EVP_PKEY *pkey); | ^~~~~~~~~~~~~~~~~ auth_crypt.c:266:9: warning: 'RSA_verify' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 266 | if(RSA_verify(NID_sha1, (unsigned char *)ssha, sshasize, | ^~ In file included from /usr/include/openssl/x509.h:36, from /usr/include/openssl/pem.h:23, from auth_crypt.c:33: /usr/include/openssl/rsa.h:359:27: note: declared here 359 | OSSL_DEPRECATEDIN_3_0 int RSA_verify(int type, const unsigned char *m, | ^~~~~~~~~~ auth_crypt.c:273:17: warning: 'RSA_free' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 273 | RSA_free(hpubkey); | ^~~~~~~~ In file included from /usr/include/openssl/x509.h:36, from /usr/include/openssl/pem.h:23, from auth_crypt.c:33: /usr/include/openssl/rsa.h:301:28: note: declared here 301 | OSSL_DEPRECATEDIN_3_0 void RSA_free(RSA *r); | ^~~~~~~~ auth_crypt.c:298:9: warning: 'RSA_free' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 298 | RSA_free(hpubkey); | ^~~~~~~~ In file included from /usr/include/openssl/x509.h:36, from /usr/include/openssl/pem.h:23, from auth_crypt.c:33: /usr/include/openssl/rsa.h:301:28: note: declared here 301 | OSSL_DEPRECATEDIN_3_0 void RSA_free(RSA *r); | ^~~~~~~~ CC (gcc) [M auth_identity.so] auth_dynstr.o CC (gcc) [M auth_identity.so] auth_hdrs.o CC (gcc) [M auth_identity.so] auth_http.o CC (gcc) [M auth_identity.so] auth_identity.o auth_identity.c: In function 'mod_init': auth_identity.c:414:9: warning: 'PEM_read_RSAPrivateKey' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 414 | glb_hmyprivkey = PEM_read_RSAPrivateKey(hpemfile, NULL, NULL, NULL); | ^~~~~~~~~~~~~~ In file included from auth_identity.c:43: /usr/include/openssl/pem.h:447:1: note: declared here 447 | DECLARE_PEM_rw_cb_attr(OSSL_DEPRECATEDIN_3_0, RSAPrivateKey, RSA) | ^~~~~~~~~~~~~~~~~~~~~~ auth_identity.c:425:9: warning: 'RSA_size' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 425 | if(initdynstr(&glb_encedmsg, RSA_size(glb_hmyprivkey))) | ^~ In file included from /usr/include/openssl/x509.h:36, from /usr/include/openssl/pem.h:23, from auth_identity.c:43: /usr/include/openssl/rsa.h:212:27: note: declared here 212 | OSSL_DEPRECATEDIN_3_0 int RSA_size(const RSA *rsa); | ^~~~~~~~ auth_identity.c:429:9: warning: 'RSA_size' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 429 | if(initdynstr(&glb_b64encedmsg, (RSA_size(glb_hmyprivkey) / 3 + 1) * 4)) | ^~ In file included from /usr/include/openssl/x509.h:36, from /usr/include/openssl/pem.h:23, from auth_identity.c:43: /usr/include/openssl/rsa.h:212:27: note: declared here 212 | OSSL_DEPRECATEDIN_3_0 int RSA_size(const RSA *rsa); | ^~~~~~~~ CC (gcc) [M auth_identity.so] auth_tables.o LD (gcc) [M auth_identity.so] auth_identity.so CC (gcc) [M db_unixodbc.so] connection.o CC (gcc) [M db_unixodbc.so] db_unixodbc.o CC (gcc) [M db_unixodbc.so] dbase.o CC (gcc) [M db_unixodbc.so] list.o CC (gcc) [M db_unixodbc.so] res.o CC (gcc) [M db_unixodbc.so] row.o CC (gcc) [M db_unixodbc.so] val.o ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3647 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3647(a)github.com>

2 2

git:master:775b819b: pkg/kamailio/deb: set WOLFSSL_INTERNAL=no
by Victor Seva 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: 775b819bc90a46d33d231572013bf82fb021f004 URL: https://github.com/kamailio/kamailio/commit/775b819bc90a46d33d231572013bf82… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-11-21T08:33:23+01:00 pkg/kamailio/deb: set WOLFSSL_INTERNAL=no --- Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jammy/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/775b819bc90a46d33d231572013bf82… Patch: https://github.com/kamailio/kamailio/commit/775b819bc90a46d33d231572013bf82…

2 1

[kamailio/kamailio] dmq: Add find dmq node by IP (PR #3642)
by Xenofon Karamanos 21 Nov '23

21 Nov '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) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR fixes a double insertion of DMQ nodes (one insertion for DNS name, one insertion for IP address), which can cause problems related to the handling of TCP sockets for DMQ usrloc. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3642 -- Commit Summary -- * dmq: Add find dmq node by IP -- File Changes -- M src/modules/dmq/dmqnode.c (27) M src/modules/dmq/dmqnode.h (2) M src/modules/dmq/notification_peer.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3642.patch https://github.com/kamailio/kamailio/pull/3642.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3642 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3642(a)github.com>

2 3

git:master:26ba1d9f: dmq: Add find dmq node by IP
by Henning Westerholt 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: 26ba1d9f42c77362de5ceb185d2fc1d1bb3f2d0c URL: https://github.com/kamailio/kamailio/commit/26ba1d9f42c77362de5ceb185d2fc1d… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-11-21T08:50:18+01:00 dmq: Add find dmq node by IP - Add find_dmq_node_ip - Add cmp_dmq_node_ip - Add check in notification peer --- Modified: src/modules/dmq/dmqnode.c Modified: src/modules/dmq/dmqnode.h Modified: src/modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/26ba1d9f42c77362de5ceb185d2fc1d… Patch: https://github.com/kamailio/kamailio/commit/26ba1d9f42c77362de5ceb185d2fc1d… --- diff --git a/src/modules/dmq/dmqnode.c b/src/modules/dmq/dmqnode.c index 75bfdb7dbef..28b2b3e5f7b 100644 --- a/src/modules/dmq/dmqnode.c +++ b/src/modules/dmq/dmqnode.c @@ -91,6 +91,18 @@ int cmp_dmq_node(dmq_node_t *node, dmq_node_t *cmpnode) && (node->uri.proto == cmpnode->uri.proto); } +/** + * @brief compare dmq node ip addresses + */ +int cmp_dmq_node_ip(dmq_node_t *node, dmq_node_t *cmpnode) +{ + if(!node || !cmpnode) { + LM_ERR("cmp_dmq_node_ip - null node received\n"); + return -1; + } + return ip_addr_cmp(&node->ip_address, &cmpnode->ip_address); +} + /** * @brief get the value of a parameter */ @@ -271,6 +283,21 @@ dmq_node_t *find_dmq_node(dmq_node_list_t *list, dmq_node_t *node) return NULL; } +/** + * @brief find dmq node ip + */ +dmq_node_t *find_dmq_node_ip(dmq_node_list_t *list, dmq_node_t *node) +{ + dmq_node_t *cur = list->nodes; + while(cur) { + if(cmp_dmq_node_ip(cur, node)) { + return cur; + } + cur = cur->next; + } + return NULL; +} + /** * @brief duplicate dmq node */ diff --git a/src/modules/dmq/dmqnode.h b/src/modules/dmq/dmqnode.h index cba9968e106..dad5dd23c52 100644 --- a/src/modules/dmq/dmqnode.h +++ b/src/modules/dmq/dmqnode.h @@ -68,9 +68,11 @@ dmq_node_t *add_dmq_node(dmq_node_list_t *list, str *uri); dmq_node_t *find_dmq_node(dmq_node_list_t *list, dmq_node_t *node); dmq_node_t *find_dmq_node_uri(dmq_node_list_t *list, str *uri); dmq_node_t *find_dmq_node_uri2(str *uri); +dmq_node_t *find_dmq_node_ip(dmq_node_list_t *list, dmq_node_t *node); int del_dmq_node(dmq_node_list_t *list, dmq_node_t *node); int dmq_node_del_by_uri(dmq_node_list_t *list, str *suri); int cmp_dmq_node(dmq_node_t *node, dmq_node_t *cmpnode); +int cmp_dmq_node_ip(dmq_node_t *node, dmq_node_t *cmpnode); int update_dmq_node_status(dmq_node_list_t *list, dmq_node_t *node, int status); dmq_node_t *shm_dup_node(dmq_node_t *node); void destroy_dmq_node(dmq_node_t *node, int shm); diff --git a/src/modules/dmq/notification_peer.c b/src/modules/dmq/notification_peer.c index b2470d5ff86..6189acf5359 100644 --- a/src/modules/dmq/notification_peer.c +++ b/src/modules/dmq/notification_peer.c @@ -408,6 +408,12 @@ int extract_node_list(dmq_node_list_t *update_list, struct sip_msg *msg) if(find == NULL) return -1; ret = find_dmq_node(update_list, find); + + if(!ret) { + LM_INFO("dmq node not found by name,try again with IP address\n"); + ret = find_dmq_node_ip(update_list, find); + } + if(!ret) { LM_DBG("found new node %.*s\n", STR_FMT(&tmp_uri)); cur = build_dmq_node(&tmp_uri, 1);

1 0

git:master:159f4762: pkg/kamailio/deb: introduce wolftls package
by Victor Seva 21 Nov '23

21 Nov '23

Module: kamailio Branch: master Commit: 159f476265ba9ee37650c3dc6aadd7b73f7612ec URL: https://github.com/kamailio/kamailio/commit/159f476265ba9ee37650c3dc6aadd7b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-11-21T08:16:03+01:00 pkg/kamailio/deb: introduce wolftls package --- Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bookworm/control Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/backports/bionic Modified: pkg/kamailio/deb/debian/backports/bullseye Modified: pkg/kamailio/deb/debian/backports/buster Modified: pkg/kamailio/deb/debian/backports/focal Modified: pkg/kamailio/deb/debian/backports/jessie Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/stretch Modified: pkg/kamailio/deb/debian/backports/trusty Modified: pkg/kamailio/deb/debian/backports/wheezy Modified: pkg/kamailio/deb/debian/backports/xenial Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jammy/control Modified: pkg/kamailio/deb/jammy/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/159f476265ba9ee37650c3dc6aadd7b… Patch: https://github.com/kamailio/kamailio/commit/159f476265ba9ee37650c3dc6aadd7b…

1 0

[kamailio/kamailio] core: add socket timestamp of received packets and keep track of receive delay (PR #3404)
by Nicolas C 20 Nov '23

20 Nov '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) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description This is a proposed evolution that adds socket timestamping of received UDP packets (using SO_TIMESTAMPNS). It computes the delay between this timestamp and the time at which the packet is read by Kamailio. This can then be accessed using pv "$TV(RD)" (RD for "receive relay"). Rationale : The Kamailio server is handling traffic that is irregular and can temporarily spike to a point where all children are still busy when new packets are incoming on the network interface. Consequently, these packets have to wait until a worker is available. The client will see a higher response time, that currently cannot be monitored by Kamailio itself. This evolution allows to make this wait time observable by Kamailio, allowing to log or write the information to CDR for example. If this is possible, I'd like to merge this feature in Kamailio. Of course, I'm ready to discuss the PR and make any necessary changes. All comments and reviews are most welcome. I've tested this locally on Linux (3.10.0-957.10.1.el7.x86_64) with the latest Kamailio master as of 2023/03/23. Thanks! You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3404 -- Commit Summary -- * core: add socket timestamp of received packets and keep track of receive delay * pv: add $TV(RD) to get the new information "receive delay" -- File Changes -- M src/core/ip_addr.h (1) M src/core/parser/msg_parser.h (1) M src/core/receive.c (8) M src/core/udp_server.c (60) M src/core/ut.h (34) M src/modules/pv/pv_time.c (15) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3404.patch https://github.com/kamailio/kamailio/pull/3404.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3404 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3404(a)github.com>

5 8

git:master:10aa4442: core: cfg.y - copy number string value with memcpy()
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: 10aa4442ac68024e062f7776000cfc0b93129c5a URL: https://github.com/kamailio/kamailio/commit/10aa4442ac68024e062f7776000cfc0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T13:52:03+01:00 core: cfg.y - copy number string value with memcpy() --- Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/10aa4442ac68024e062f7776000cfc0… Patch: https://github.com/kamailio/kamailio/commit/10aa4442ac68024e062f7776000cfc0… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index 9cfce12ce94..b9e293aa923 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -2761,11 +2761,13 @@ host_if_id: ID | NUM_ID | NUMBER { /* get string version */ - $$=pkg_malloc(strlen(yy_number_str)+1); + i_tmp = strlen(yy_number_str); + $$=pkg_malloc(i_tmp + 1); if ($$==0) { PKG_MEM_ERROR; } else { - strcpy($$, yy_number_str); + memcpy($$, yy_number_str, i_tmp); + $$[i_tmp] = '\0'; } } ;

1 0

git:master:4b11820c: rtpproxy: print the ip address directly to local buffer
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: 4b11820cb4337718854f1b80963e204764bc23b1 URL: https://github.com/kamailio/kamailio/commit/4b11820cb4337718854f1b80963e204… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T13:27:33+01:00 rtpproxy: print the ip address directly to local buffer - avoid extra copy --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/4b11820cb4337718854f1b80963e204… Patch: https://github.com/kamailio/kamailio/commit/4b11820cb4337718854f1b80963e204… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 74da691e705..f6ea6b1b12d 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -1815,11 +1815,11 @@ static int rtpproxy_manage2(struct sip_msg *msg, char *flags, char *ip) static int rtpproxy_offer1_helper_f(struct sip_msg *msg, char *flags) { - char *cp; char newip[IP_ADDR_MAX_STR_SIZE]; + int len; - cp = ip_addr2a(&msg->rcv.dst_ip); - strcpy(newip, cp); + len = ip_addr2sbuf(&msg->rcv.dst_ip, newip, IP_ADDR_MAX_STR_SIZE - 1); + newip[len] = 0; return force_rtp_proxy(msg, flags, newip, 1, 0); }

1 0

Route $hfl negative index strange behaviour:
by Xenofon Karamanos 20 Nov '23

20 Nov '23

Hello, I am working on extending $hfl and $hflc supporting some more headers. During some experimentation, i stumbled in some weird behavior regarding $(hfl(Route)[-1]) and negative indexing of $hfl pseudo-variable. Here is a breakdown of what's happening: in kamailio.cfg: request_route { xlog("L_INFO", "Route headers hdr: $hdr(Route)\n"); xlog("L_INFO", "Route headers hfl: $hfl(Route)\n"); xlog("L_INFO", "Route headers count: $hflc(Route)\n"); xlog("L_INFO", "Route headers 0: $(hfl(Route)[0])\n"); xlog("L_INFO", "Route headers 1: $(hfl(Route)[1])\n"); xlog("L_INFO", "Route headers 4: $(hfl(Route)[4])\n"); xlog("L_INFO", "Route headers -1: $(hfl(Route)[-1])\n"); xlog("L_INFO", "Route headers -2: $(hfl(Route)[-2])\n"); xlog("L_INFO", "Route headers -3: $(hfl(Route)[-3])\n"); ... } Now when sending a SIP message containing multiple headers that have comma separated values ie: OPTIONS_MSG_2CONTACTS="OPTIONS sip:example.com SIP/2.0 Via: SIP/2.0/UDP 192.168.1.100:5060;branch=z9hG4bK123456789 Max-Forwards: 70 From: <sip:bob@example.com>;tag=123456789 To: <sip:alice@example.com> Call-ID: 987654321(a)192.168.1.100 CSeq: 1 OPTIONS Contact: <sip:bob@example.com>;expires=3600,<sip:bob2@example.com>;expires=3600,<sip:bob3@example.com>;expires=3600 Route: <sip:server1.example.com;lr;ftag=1234>, <sip:server2.example.com;lr;ftag=5678>, <sip:server3.example.com;lr;ftag=9012> Route: <sip:server4.example.com;lr;ftag=1234>, <sip:server5.example.com;lr;ftag=5678> Content-Length: 0 " the logs show the weird behavior: Negative -1 should print the last header found and so on (as stated by https://www.kamailio.org/wikidocs/cookbooks/devel/pseudovariables/#hflname-… $hdr $hfl doc). Currently, -1 prints null and -2 prints the last one, -3 second to last and so on. This is probably a bug and not the expected behavior, or am i missing something? INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers hdr: <sip:server1.example.com;lr;ftag=1234>, <sip:server2.example.com;lr;ftag=5678>, <sip:server3.example.com;lr;ftag=9012> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers hfl: <sip:server1.example.com;lr;ftag=1234> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers count: 5 INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers 0: <sip:server1.example.com;lr;ftag=1234> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers 1: <sip:server2.example.com;lr;ftag=5678> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers 4: <sip:server5.example.com;lr;ftag=5678> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers -1: <null> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers -2: <sip:server5.example.com;lr;ftag=5678> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers -3: <sip:server4.example.com;lr;ftag=1234> Thanks, Xenofon

1 0

git:master:71969c61: mohqueue: switch to use snprintf() for a couple of string formatting cases
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: 71969c6126e6885f2ba312c692c9c646d8f870ef URL: https://github.com/kamailio/kamailio/commit/71969c6126e6885f2ba312c692c9c64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T13:03:52+01:00 mohqueue: switch to use snprintf() for a couple of string formatting cases --- Modified: src/modules/mohqueue/mohq_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/71969c6126e6885f2ba312c692c9c64… Patch: https://github.com/kamailio/kamailio/commit/71969c6126e6885f2ba312c692c9c64… --- diff --git a/src/modules/mohqueue/mohq_funcs.c b/src/modules/mohqueue/mohq_funcs.c index 530137a2afb..75130381746 100644 --- a/src/modules/mohqueue/mohq_funcs.c +++ b/src/modules/mohqueue/mohq_funcs.c @@ -183,7 +183,7 @@ void ack_msg(sip_msg_t *pmsg, call_lst *pcall) **********/ pcall->call_hash = pcall->call_label = 0; - sprintf(pcall->call_addr, "%s %s", + snprintf(pcall->call_addr, IP_ADDR_MAX_STR_SIZE + 4, "%s %s", pmsg->rcv.dst_ip.af == AF_INET ? "IP4" : "IP6", ip_addr2a(&pmsg->rcv.dst_ip)); pcall->call_state = CLSTA_INQUEUE; @@ -412,12 +412,12 @@ void close_call(sip_msg_t *pmsg, call_lst *pcall) + strlen(pcall->call_via) // Via + strlen(pcall->call_route) // Route + strlen(pquri); // Contact - phdr = pkg_malloc(npos1); + phdr = pkg_malloc(npos1 + 1); if(!phdr) { LM_ERR("%sNo more memory!\n", pfncname); goto bye_err; } - sprintf(phdr, pbyemsg, + snprintf(phdr, npos1 + 1, pbyemsg, pcall->call_via, // Via pcall->call_route, // Route pquri); // Contact @@ -1097,15 +1097,16 @@ void first_invite_msg(sip_msg_t *pmsg, call_lst *pcall) str pcontact[1]; char *pcontacthdr = "Contact: <%s>" SIPEOL; - pcontact->s = - pkg_malloc(strlen(pcall->pmohq->mohq_uri) + strlen(pcontacthdr)); + int tblen; + tblen = strlen(pcall->pmohq->mohq_uri) + strlen(pcontacthdr); + pcontact->s = pkg_malloc(tblen + 1); if(!pcontact->s) { LM_ERR("%sNo more memory!\n", pfncname); end_RTP(pmsg, pcall); delete_call(pcall); return; } - sprintf(pcontact->s, pcontacthdr, pcall->pmohq->mohq_uri); + snprintf(pcontact->s, tblen + 1, pcontacthdr, pcall->pmohq->mohq_uri); pcontact->len = strlen(pcontact->s); if(!add_lump_rpl2(pmsg, pcontact->s, pcontact->len, LUMP_RPL_HDR)) { LM_ERR("%sUnable to add contact (%s) to call (%s)!\n", pfncname, @@ -1557,12 +1558,12 @@ int refer_call(call_lst *pcall, mohq_lock *plock) + strlen(pcall->pmohq->mohq_uri) // Contact + puri->len // Refer-To + strlen(pcall->pmohq->mohq_uri); // Referred-By - char *pbuf = pkg_malloc(npos1); + char *pbuf = pkg_malloc(npos1 + 1); if(!pbuf) { LM_ERR("%sNo more memory!\n", pfncname); goto refererr; } - sprintf(pbuf, prefermsg, + snprintf(pbuf, npos1 + 1, prefermsg, pcall->call_via, // Via pcall->call_route, // Route pcall->pmohq->mohq_uri, // Contact @@ -1863,7 +1864,7 @@ int send_prov_rsp(sip_msg_t *pmsg, call_lst *pcall) char phdrtmp[200]; char *phdrtmplt = "Accept-Language: en" SIPEOL "Require: 100rel" SIPEOL "RSeq: %d" SIPEOL; - sprintf(phdrtmp, phdrtmplt, pcall->call_cseq); + snprintf(phdrtmp, 200, phdrtmplt, pcall->call_cseq); struct lump_rpl **phdrlump = add_lump_rpl2(pmsg, phdrtmp, strlen(phdrtmp), LUMP_RPL_HDR); if(!phdrlump) { @@ -2006,7 +2007,7 @@ int send_rtp_answer(sip_msg_t *pmsg, call_lst *pcall) npos1 += pparse[npos2].len; } char pbodylen[30]; - sprintf(pbodylen, "%s: %d\r\n\r\n", pclenhdr, pSDP->len); + snprintf(pbodylen, 30, "%s: %d\r\n\r\n", pclenhdr, pSDP->len); npos1 += pextrahdr->len + strlen(pbodylen) + pSDP->len + 1; char *pnewbuf = pkg_malloc(npos1); if(!pnewbuf) { @@ -2858,4 +2859,4 @@ int mohq_send(sip_msg_t *pmsg, char *pqueue) return -1; } return 1; -} \ No newline at end of file +}

1 0

git:master:1eb94377: core: review and update/remove old comments
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: 1eb943773f52ea659c8dd812226ad07bcd15caaa URL: https://github.com/kamailio/kamailio/commit/1eb943773f52ea659c8dd812226ad07… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T10:43:19+01:00 core: review and update/remove old comments --- Modified: src/core/dns_cache.c Modified: src/core/fix_lumps.h Modified: src/core/forward.c Modified: src/core/globals.h Modified: src/core/local_timer.c Modified: src/core/mem/q_malloc.c Modified: src/core/msg_translator.c Modified: src/core/proxy.c Modified: src/core/pv_core.c Modified: src/core/raw_sock.c Modified: src/core/tcp_read.c Modified: src/core/tcp_stats.h Modified: src/core/timer.c Modified: src/core/usr_avp.c Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/1eb943773f52ea659c8dd812226ad07… Patch: https://github.com/kamailio/kamailio/commit/1eb943773f52ea659c8dd812226ad07…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev