sr-dev March 2024

sr-dev@lists.kamailio.org

14 participants
233 discussions

git:5.8:6ee44373: tls: remove unused ENGINE define

by S-P Chan

Module: kamailio Branch: 5.8 Commit: 6ee443731a23032fce9a32ce9609ae5b7c6bd171 URL: https://github.com/kamailio/kamailio/commit/6ee443731a23032fce9a32ce9609ae5… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-03-02T21:42:51+08:00 tls: remove unused ENGINE define (cherry-picked from commit 73e7123c2dd19b82db167ceee93444e43f70f446) --- Modified: src/modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/6ee443731a23032fce9a32ce9609ae5… Patch: https://github.com/kamailio/kamailio/commit/6ee443731a23032fce9a32ce9609ae5… --- diff --git a/src/modules/tls/tls_server.c b/src/modules/tls/tls_server.c index 3e22ec42712..3bfea131cf2 100644 --- a/src/modules/tls/tls_server.c +++ b/src/modules/tls/tls_server.c @@ -128,11 +128,6 @@ int tls_run_event_routes(struct tcp_connection *c); #endif /* __SUNPRO_c */ #endif /* TLS_RD_DEBUG */ -/* only OpenSSL <= 1.1.1 */ -#if !defined(OPENSSL_NO_ENGINE) && OPENSSL_VERSION_NUMBER < 0x030000000L -#define KSR_SSL_ENGINE -#endif - extern str sr_tls_xavp_cfg; static str _ksr_tls_connect_server_id = STR_NULL;

2 months, 2 weeks

git:master:73e7123c: tls: remove unused ENGINE define

by S-P Chan

Module: kamailio Branch: master Commit: 73e7123c2dd19b82db167ceee93444e43f70f446 URL: https://github.com/kamailio/kamailio/commit/73e7123c2dd19b82db167ceee93444e… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-03-02T21:41:11+08:00 tls: remove unused ENGINE define --- Modified: src/modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/73e7123c2dd19b82db167ceee93444e… Patch: https://github.com/kamailio/kamailio/commit/73e7123c2dd19b82db167ceee93444e… --- diff --git a/src/modules/tls/tls_server.c b/src/modules/tls/tls_server.c index 3e22ec42712..3bfea131cf2 100644 --- a/src/modules/tls/tls_server.c +++ b/src/modules/tls/tls_server.c @@ -128,11 +128,6 @@ int tls_run_event_routes(struct tcp_connection *c); #endif /* __SUNPRO_c */ #endif /* TLS_RD_DEBUG */ -/* only OpenSSL <= 1.1.1 */ -#if !defined(OPENSSL_NO_ENGINE) && OPENSSL_VERSION_NUMBER < 0x030000000L -#define KSR_SSL_ENGINE -#endif - extern str sr_tls_xavp_cfg; static str _ksr_tls_connect_server_id = STR_NULL;

2 months, 2 weeks

git:5.8:8e81774d: tlsa: removed the map files used in the past for tls engine

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.8 Commit: 8e81774d5a71c06906df84fb4809bcfb73bd532e URL: https://github.com/kamailio/kamailio/commit/8e81774d5a71c06906df84fb4809bcf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-02T08:18:15+01:00 tlsa: removed the map files used in the past for tls engine - sync with code of tls module (cherry picked from commit d443a1e37d85e0eec6f6c9875bb8e821b34c8d6b) --- Removed: src/modules/tlsa/tls_map.c Removed: src/modules/tlsa/tls_map.h --- Diff: https://github.com/kamailio/kamailio/commit/8e81774d5a71c06906df84fb4809bcf… Patch: https://github.com/kamailio/kamailio/commit/8e81774d5a71c06906df84fb4809bcf… --- diff --git a/src/modules/tlsa/tls_map.c b/src/modules/tlsa/tls_map.c deleted file mode 100644 index ad799b5cdff..00000000000 --- a/src/modules/tlsa/tls_map.c +++ /dev/null @@ -1,27 +0,0 @@ -/** - * Copyright (C) 2021 Daniel-Constantin Mierla (asipto.com) - * - * This file is part of Kamailio, a free SIP server. - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version - * - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -/** - * THIS FILE IS GENERATED - DO NOT MODIFY IT - */ - -#include "../tls/tls_map.c" diff --git a/src/modules/tlsa/tls_map.h b/src/modules/tlsa/tls_map.h deleted file mode 100644 index 96705a7f7fa..00000000000 --- a/src/modules/tlsa/tls_map.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - * Copyright (C) 2021 Daniel-Constantin Mierla (asipto.com) - * - * This file is part of Kamailio, a free SIP server. - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version - * - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -/** - * THIS FILE IS GENERATED - DO NOT MODIFY IT - */ - -#include "../tls/tls_map.h"

2 months, 2 weeks

git:master:d443a1e3: tlsa: removed the map files used in the past for tls engine

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d443a1e37d85e0eec6f6c9875bb8e821b34c8d6b URL: https://github.com/kamailio/kamailio/commit/d443a1e37d85e0eec6f6c9875bb8e82… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-02T08:13:40+01:00 tlsa: removed the map files used in the past for tls engine - sync with code of tls module --- Removed: src/modules/tlsa/tls_map.c Removed: src/modules/tlsa/tls_map.h --- Diff: https://github.com/kamailio/kamailio/commit/d443a1e37d85e0eec6f6c9875bb8e82… Patch: https://github.com/kamailio/kamailio/commit/d443a1e37d85e0eec6f6c9875bb8e82… --- diff --git a/src/modules/tlsa/tls_map.c b/src/modules/tlsa/tls_map.c deleted file mode 100644 index ad799b5cdff..00000000000 --- a/src/modules/tlsa/tls_map.c +++ /dev/null @@ -1,27 +0,0 @@ -/** - * Copyright (C) 2021 Daniel-Constantin Mierla (asipto.com) - * - * This file is part of Kamailio, a free SIP server. - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version - * - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -/** - * THIS FILE IS GENERATED - DO NOT MODIFY IT - */ - -#include "../tls/tls_map.c" diff --git a/src/modules/tlsa/tls_map.h b/src/modules/tlsa/tls_map.h deleted file mode 100644 index 96705a7f7fa..00000000000 --- a/src/modules/tlsa/tls_map.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - * Copyright (C) 2021 Daniel-Constantin Mierla (asipto.com) - * - * This file is part of Kamailio, a free SIP server. - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version - * - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -/** - * THIS FILE IS GENERATED - DO NOT MODIFY IT - */ - -#include "../tls/tls_map.h"

2 months, 2 weeks

git:5.8:9d42e4aa: tls: clean-up of ENGINE

by S-P Chan

Module: kamailio Branch: 5.8 Commit: 9d42e4aacab4a7bf18192701cd66cba95c2c98dd URL: https://github.com/kamailio/kamailio/commit/9d42e4aacab4a7bf18192701cd66cba… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-03-02T08:47:48+08:00 tls: clean-up of ENGINE - remove tls_map.* - not needed anymore - install an ENGINE in each worker SSL_CTX no need to replicate to all processes Cherry-pick from 5933893b91 --- Modified: src/modules/tls/tls_domain.c Modified: src/modules/tls/tls_server.c Removed: src/modules/tls/tls_map.c Removed: src/modules/tls/tls_map.h --- Diff: https://github.com/kamailio/kamailio/commit/9d42e4aacab4a7bf18192701cd66cba… Patch: https://github.com/kamailio/kamailio/commit/9d42e4aacab4a7bf18192701cd66cba…

2 months, 2 weeks

git:master:5933893b: tls: clean-up of ENGINE

by S-P Chan

Module: kamailio Branch: master Commit: 5933893b919bccdc1c35e7bb0505e3a49d72c403 URL: https://github.com/kamailio/kamailio/commit/5933893b919bccdc1c35e7bb0505e3a… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-03-02T08:46:39+08:00 tls: clean-up of ENGINE - remove tls_map.* - not needed anymore - install an ENGINE in each worker SSL_CTX no need to replicate to all processes --- Modified: src/modules/tls/tls_domain.c Modified: src/modules/tls/tls_server.c Removed: src/modules/tls/tls_map.c Removed: src/modules/tls/tls_map.h --- Diff: https://github.com/kamailio/kamailio/commit/5933893b919bccdc1c35e7bb0505e3a… Patch: https://github.com/kamailio/kamailio/commit/5933893b919bccdc1c35e7bb0505e3a…

2 months, 2 weeks

git:master:d8e0942c: core: select - handle ws and wss inside select_ip_port()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d8e0942c9e83c8cad7c182bf41c156ba35bf24d2 URL: https://github.com/kamailio/kamailio/commit/d8e0942c9e83c8cad7c182bf41c156b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-01T12:46:17+01:00 core: select - handle ws and wss inside select_ip_port() --- Modified: src/core/select_core.c --- Diff: https://github.com/kamailio/kamailio/commit/d8e0942c9e83c8cad7c182bf41c156b… Patch: https://github.com/kamailio/kamailio/commit/d8e0942c9e83c8cad7c182bf41c156b… --- diff --git a/src/core/select_core.c b/src/core/select_core.c index 12b884ead04..57dad2f78e5 100644 --- a/src/core/select_core.c +++ b/src/core/select_core.c @@ -1387,7 +1387,7 @@ int select_ip_port(str *res, select_t *s, struct sip_msg *msg) if(param & SEL_PROTO) { switch(msg->rcv.proto) { case PROTO_NONE: - proto_str.s = 0; + proto_str.s = ""; proto_str.len = 0; break; @@ -1411,6 +1411,16 @@ int select_ip_port(str *res, select_t *s, struct sip_msg *msg) proto_str.len = 4; break; + case PROTO_WS: + proto_str.s = "ws"; + proto_str.len = 2; + break; + + case PROTO_WSS: + proto_str.s = "wss"; + proto_str.len = 3; + break; + default: LM_ERR("Unknown transport protocol\n"); return -1;

2 months, 2 weeks

git:master:daac0bdb: core: ppcfg - jump to end when defexp eval does not get a str val

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: daac0bdb88f6f732bda7c683af45b90f87fdb7c9 URL: https://github.com/kamailio/kamailio/commit/daac0bdb88f6f732bda7c683af45b90… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-01T12:41:13+01:00 core: ppcfg - jump to end when defexp eval does not get a str val --- Modified: src/core/ppcfg.c --- Diff: https://github.com/kamailio/kamailio/commit/daac0bdb88f6f732bda7c683af45b90… Patch: https://github.com/kamailio/kamailio/commit/daac0bdb88f6f732bda7c683af45b90… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 262a7931cd2..d77a237882b 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -510,6 +510,8 @@ char *pp_defexp_eval(char *exval, int exlen, int qmode) LM_DBG("expression string result: [%s]\n", result->param.stz.sval); sval.s = result->param.stz.sval; sval.len = strlen(result->param.stz.sval); + } else { + goto done; } if(qmode == 1) {

2 months, 2 weeks

git:master:19894425: file_out: additional checks for silenting warnings

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 19894425684504e2a19622ae5a9cdfc565f16fd3 URL: https://github.com/kamailio/kamailio/commit/19894425684504e2a19622ae5a9cdfc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-01T11:42:45+01:00 file_out: additional checks for silenting warnings --- Modified: src/modules/file_out/file_out.c --- Diff: https://github.com/kamailio/kamailio/commit/19894425684504e2a19622ae5a9cdfc… Patch: https://github.com/kamailio/kamailio/commit/19894425684504e2a19622ae5a9cdfc… --- diff --git a/src/modules/file_out/file_out.c b/src/modules/file_out/file_out.c index ad055f1852c..f3dcfb831d9 100644 --- a/src/modules/file_out/file_out.c +++ b/src/modules/file_out/file_out.c @@ -226,28 +226,31 @@ static void fo_log_writer_process(int rank) LM_ERR("deque error\n"); return; } - FILE *out = fo_get_file_handle(log_message.dest_file); - if(out == NULL) { - LM_ERR("file handle is NULL\n"); - return; - } + if(log_message.message != NULL) { + FILE *out = fo_get_file_handle(log_message.dest_file); + if(out == NULL) { + LM_ERR("file handle is NULL\n"); + return; + } - /* Get prefix for the file */ - if(log_message.prefix != NULL && log_message.prefix->len > 0) { - if(fprintf(out, "%.*s", log_message.prefix->len, - log_message.prefix->s) + /* Get prefix for the file */ + if(log_message.prefix != NULL && log_message.prefix->len > 0) { + if(fprintf(out, "%.*s", log_message.prefix->len, + log_message.prefix->s) + < 0) { + LM_ERR("Failed to write prefix to file with err {%s}\n", + strerror(errno)); + } + } + if(fprintf(out, "%.*s\n", log_message.message->len, + log_message.message->s) < 0) { - LM_ERR("Failed to write prefix to file with err {%s}\n", + LM_ERR("Failed to write to file with err {%s}\n", strerror(errno)); } - } - if(fprintf(out, "%.*s\n", log_message.message->len, - log_message.message->s) - < 0) { - LM_ERR("Failed to write to file with err {%s}\n", strerror(errno)); - } - if(fflush(out) < 0) { - LM_ERR("Failed to flush file with err {%s}\n", strerror(errno)); + if(fflush(out) < 0) { + LM_ERR("Failed to flush file with err {%s}\n", strerror(errno)); + } } if(log_message.prefix != NULL) { @@ -337,7 +340,11 @@ static int fo_fixup_free_int_pvar(void **param, int param_no) static int fo_add_filename(modparam_t type, void *val) { - if(val != NULL && strlen((char *)val) == 0) { + if(val == NULL) { + LM_ERR("modparam value is null\n"); + return -1; + } + if(strlen((char *)val) == 0) { LM_ERR("modparam value is empty\n"); return -1; }

2 months, 2 weeks

git:master:73c66150: influxdbc: copy with buffer size limit

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 73c66150c604326c07d454002c12cb221289936a URL: https://github.com/kamailio/kamailio/commit/73c66150c604326c07d454002c12cb2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-01T09:55:16+01:00 influxdbc: copy with buffer size limit --- Modified: src/modules/influxdbc/ic.c --- Diff: https://github.com/kamailio/kamailio/commit/73c66150c604326c07d454002c12cb2… Patch: https://github.com/kamailio/kamailio/commit/73c66150c604326c07d454002c12cb2… --- diff --git a/src/modules/influxdbc/ic.c b/src/modules/influxdbc/ic.c index 09ab462ffcb..dc493619f28 100644 --- a/src/modules/influxdbc/ic.c +++ b/src/modules/influxdbc/ic.c @@ -107,7 +107,7 @@ void ic_influx_database(char *host, long port, he = gethostbyname(host); if(he == NULL) { - sprintf(errorbuf, + snprintf(errorbuf, 1024, "influx host=%s to ip address convertion failed " "gethostbyname(), bailing out\n", host); @@ -115,22 +115,24 @@ void ic_influx_database(char *host, long port, } /* this could return multiple ip addresses but we assume its the first one */ if(he->h_addr_list[0] != NULL) { - strcpy(influx_ip, - inet_ntoa(*(struct in_addr *)(he->h_addr_list[0]))); + strncpy(influx_ip, + inet_ntoa(*(struct in_addr *)(he->h_addr_list[0])), 16); + influx_ip[16] = '\0'; DEBUG fprintf(stderr, "ic_influx_by_hostname hostname=%s converted to ip " "address %s))\n", host, influx_ip); } else { - sprintf(errorbuf, + snprintf(errorbuf, 1024, "influx host=%s to ip address convertion failed (empty " "list), bailing out\n", host); error(errorbuf); } } else { - strcpy(influx_ip, - host); /* perhaps the hostname is actually an ip address */ + strncpy(influx_ip, host, + 16); /* perhaps the hostname is actually an ip address */ + influx_ip[16] = '\0'; } } } @@ -338,7 +340,7 @@ void ic_push() } for(i = 0; i < 1024; i++) /* empty the buffer */ result[i] = 0; - if((ret = read(sockfd, result, sizeof(result))) > 0) { + if((ret = read(sockfd, result, sizeof(result) - 1)) > 0) { result[ret] = 0; DEBUG fprintf( stderr, "received bytes=%d data=<%s>\n", ret, result);

2 months, 2 weeks

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2024