sr-dev November 2023

sr-dev@lists.kamailio.org

15 participants
391 discussions

git:master:3539a0c4: print: clang format
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: 3539a0c4d3579055172f1c12a81bb804d3fabbe7 URL: https://github.com/kamailio/kamailio/commit/3539a0c4d3579055172f1c12a81bb80… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T09:43:15+01:00 print: clang format --- Modified: src/lib/print/print.c Modified: src/lib/print/print.h --- Diff: https://github.com/kamailio/kamailio/commit/3539a0c4d3579055172f1c12a81bb80… Patch: https://github.com/kamailio/kamailio/commit/3539a0c4d3579055172f1c12a81bb80… --- diff --git a/src/lib/print/print.c b/src/lib/print/print.c index 2cfb08ba87f..c2783d096f9 100644 --- a/src/lib/print/print.c +++ b/src/lib/print/print.c @@ -3,10 +3,9 @@ */ - #include <stdio.h> -int stderr_println(char* text) +int stderr_println(char *text) { fprintf(stderr, "%s\n", text); return 0; diff --git a/src/lib/print/print.h b/src/lib/print/print.h index 0e7e04580f8..4fd823c5002 100644 --- a/src/lib/print/print.h +++ b/src/lib/print/print.h @@ -2,6 +2,6 @@ #ifndef _print_h #define _print_h -int stderr_println(char* text); +int stderr_println(char *text); #endif

1 0

git:master:62fafc25: presence: clang format
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: 62fafc2501bb6f213e8bc68f5485a25f8737b0bb URL: https://github.com/kamailio/kamailio/commit/62fafc2501bb6f213e8bc68f5485a25… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T09:43:15+01:00 presence: clang format --- Modified: src/lib/presence/domain_maintainer.c Modified: src/lib/presence/domain_maintainer.h Modified: src/lib/presence/lpidf.c Modified: src/lib/presence/lpidf.h Modified: src/lib/presence/notifier.h Modified: src/lib/presence/notifier_domain.c Modified: src/lib/presence/notifier_domain.h Modified: src/lib/presence/pidf.c Modified: src/lib/presence/pidf.h Modified: src/lib/presence/pres_doc.c Modified: src/lib/presence/pres_doc.h Modified: src/lib/presence/qsa.c Modified: src/lib/presence/qsa.h Modified: src/lib/presence/qsa_params.c Modified: src/lib/presence/qsa_params.h Modified: src/lib/presence/subscriber.h Modified: src/lib/presence/subscription_info.h Modified: src/lib/presence/utils.c Modified: src/lib/presence/xml_utils.c Modified: src/lib/presence/xml_utils.h Modified: src/lib/presence/xpidf.c Modified: src/lib/presence/xpidf.h --- Diff: https://github.com/kamailio/kamailio/commit/62fafc2501bb6f213e8bc68f5485a25… Patch: https://github.com/kamailio/kamailio/commit/62fafc2501bb6f213e8bc68f5485a25…

1 0

git:master:dbe5851e: ims: clang format
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: dbe5851eaab6de1e56caf2eb3063a487d23bbd2c URL: https://github.com/kamailio/kamailio/commit/dbe5851eaab6de1e56caf2eb3063a48… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T09:43:15+01:00 ims: clang format --- Modified: src/lib/ims/ims_getters.c Modified: src/lib/ims/ims_getters.h Modified: src/lib/ims/useful_defs.h --- Diff: https://github.com/kamailio/kamailio/commit/dbe5851eaab6de1e56caf2eb3063a48… Patch: https://github.com/kamailio/kamailio/commit/dbe5851eaab6de1e56caf2eb3063a48…

1 0

git:master:f2173298: cds: clang format
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: f21732981789fa8317327a7e8c8edd7901df6d74 URL: https://github.com/kamailio/kamailio/commit/f21732981789fa8317327a7e8c8edd7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T09:43:15+01:00 cds: clang format --- Modified: src/lib/cds/base64.c Modified: src/lib/cds/base64.h Modified: src/lib/cds/cds.h Modified: src/lib/cds/dbid.c Modified: src/lib/cds/dbid.h Modified: src/lib/cds/dstring.c Modified: src/lib/cds/dstring.h Modified: src/lib/cds/hash_table.c Modified: src/lib/cds/hash_table.h Modified: src/lib/cds/list.h Modified: src/lib/cds/logger.h Modified: src/lib/cds/memory.c Modified: src/lib/cds/memory.h Modified: src/lib/cds/msg_queue.c Modified: src/lib/cds/msg_queue.h Modified: src/lib/cds/ptr_vector.c Modified: src/lib/cds/ref_cntr.c Modified: src/lib/cds/ref_cntr.h Modified: src/lib/cds/rr_serialize.c Modified: src/lib/cds/ser_profile.c Modified: src/lib/cds/ser_profile.h Modified: src/lib/cds/serialize.c Modified: src/lib/cds/serialize.h Modified: src/lib/cds/simple_profile.c Modified: src/lib/cds/simple_profile.h Modified: src/lib/cds/sip_utils.c Modified: src/lib/cds/sstr.c Modified: src/lib/cds/sstr.h Modified: src/lib/cds/sync.h Modified: src/lib/cds/vector.c Modified: src/lib/cds/vector.h --- Diff: https://github.com/kamailio/kamailio/commit/f21732981789fa8317327a7e8c8edd7… Patch: https://github.com/kamailio/kamailio/commit/f21732981789fa8317327a7e8c8edd7…

1 0

git:master:e70a5294: binrpc: clang format
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: e70a52944af73fba31981f529101b28fe635e16e URL: https://github.com/kamailio/kamailio/commit/e70a52944af73fba31981f529101b28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T09:43:15+01:00 binrpc: clang format --- Modified: src/lib/binrpc/binrpc_api.c Modified: src/lib/binrpc/binrpc_api.h --- Diff: https://github.com/kamailio/kamailio/commit/e70a52944af73fba31981f529101b28… Patch: https://github.com/kamailio/kamailio/commit/e70a52944af73fba31981f529101b28…

1 0

git:master:c99f0f49: lib/trie: clang format
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: c99f0f49a5aca0181a5d24e5798361b37a28cea3 URL: https://github.com/kamailio/kamailio/commit/c99f0f49a5aca0181a5d24e5798361b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T09:43:15+01:00 lib/trie: clang format --- Modified: src/lib/trie/dtrie.c Modified: src/lib/trie/dtrie.h --- Diff: https://github.com/kamailio/kamailio/commit/c99f0f49a5aca0181a5d24e5798361b… Patch: https://github.com/kamailio/kamailio/commit/c99f0f49a5aca0181a5d24e5798361b…

1 0

git:master:f967d2ba: lib/trie: proper support for very long numbers
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: f967d2ba2f0f6699fddf25c587fa007493d9b727 URL: https://github.com/kamailio/kamailio/commit/f967d2ba2f0f6699fddf25c587fa007… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T09:43:15+01:00 lib/trie: proper support for very long numbers --- Modified: src/lib/trie/dtrie.c --- Diff: https://github.com/kamailio/kamailio/commit/f967d2ba2f0f6699fddf25c587fa007… Patch: https://github.com/kamailio/kamailio/commit/f967d2ba2f0f6699fddf25c587fa007… --- diff --git a/src/lib/trie/dtrie.c b/src/lib/trie/dtrie.c index 905ddead201..02107023080 100644 --- a/src/lib/trie/dtrie.c +++ b/src/lib/trie/dtrie.c @@ -126,7 +126,8 @@ int dtrie_insert(struct dtrie_node_t *root, const char *number, void *data, const unsigned int branches) { struct dtrie_node_t *node = root; - unsigned char digit, i=0; + unsigned char digit; + unsigned i=0; if (root == NULL) return -1; if (number == NULL) return -1; @@ -233,7 +234,8 @@ void **dtrie_longest_match(struct dtrie_node_t *root, const char *number, const unsigned int branches) { struct dtrie_node_t *node = root; - unsigned char digit, i = 0; + unsigned char digit; + unsigned int i = 0; void **ret = NULL; if (root == NULL) return NULL;

1 0

git:master:a59bc67c: pv: transformation number parmeter kept long value to match pv field type
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: a59bc67cd4bd1df3e81bdb494896b5a076f9d40d URL: https://github.com/kamailio/kamailio/commit/a59bc67cd4bd1df3e81bdb494896b5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T09:43:15+01:00 pv: transformation number parmeter kept long value to match pv field type --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/a59bc67cd4bd1df3e81bdb494896b5a… Patch: https://github.com/kamailio/kamailio/commit/a59bc67cd4bd1df3e81bdb494896b5a… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 48557ca977d..2c60cc7e656 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -2563,7 +2563,7 @@ int tr_eval_val( && (*_p == ' ' || *_p == '\t' || *_p == '\n')) \ _p++; \ while(is_in_str(_p, _in) && *_p >= '0' && *_p <= '9') { \ - if(_n > ((INT_MAX / 10) - 10)) { \ + if(_n > ((LONG_MAX / 10) - 10)) { \ LM_ERR("number value is too large\n"); \ goto error; \ } \ @@ -2577,7 +2577,7 @@ int tr_eval_val( } \ memset(_tp, 0, sizeof(tr_param_t)); \ _tp->type = TR_PARAM_NUMBER; \ - _tp->v.n = sign * n; \ + _tp->v.n = n * sign; \ } else { \ LM_ERR("tinvalid param in transformation: %.*s!!\n", _in->len, \ _in->s); \ @@ -2660,7 +2660,7 @@ char *tr_parse_string(str *in, trans_t *t) str name; str s; pv_spec_t *spec = NULL; - int n; + long n; int sign; tr_param_t *tp = NULL; @@ -3323,7 +3323,7 @@ char *tr_parse_paramlist(str *in, trans_t *t) char *start_pos; str s; str name; - int n; + long n; int sign; pv_spec_t *spec = NULL; tr_param_t *tp = NULL; @@ -3560,7 +3560,7 @@ char *tr_parse_line(str *in, trans_t *t) char *ps; str s; str name; - int n; + long n; int sign; pv_spec_t *spec = NULL; tr_param_t *tp = NULL;

1 0

git:master:6cc8f126: app_jsdt: length checks for resolving js module path
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: 6cc8f126391476a05f8d90a35d6d57eec7c4e8d8 URL: https://github.com/kamailio/kamailio/commit/6cc8f126391476a05f8d90a35d6d57e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T09:43:15+01:00 app_jsdt: length checks for resolving js module path --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/6cc8f126391476a05f8d90a35d6d57e… Patch: https://github.com/kamailio/kamailio/commit/6cc8f126391476a05f8d90a35d6d57e… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index 8ad015c89d9..68dc38f1b23 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -1072,23 +1072,42 @@ duk_ret_t cb_resolve_module(duk_context *JJ) const char *parent_id = duk_get_string(JJ, 1); char requested_path[PATH_MAX]; + char resolved_id[PATH_MAX]; + char *ptr = NULL; + + if(requested_id == NULL) { + return duk_generic_error(JJ, "Invalid parameter"); + } + if(strlen(requested_id) >= PATH_MAX) { + return duk_generic_error(JJ, "Parameter too long"); + } + requested_path[0] = '\0'; if(requested_id[0] == '/') { // absolute strcpy(requested_path, requested_id); } else if(strncmp(requested_id, "./", 2) || strncmp(requested_id, "../", 3)) { - if(strlen(parent_id)) { + if(parent_id != NULL && strlen(parent_id) > 0) { + if(strlen(parent_id) >= PATH_MAX) { + return duk_generic_error(JJ, "Second parameter too long"); + } // relative to parent strcpy(requested_path, parent_id); } else { + if(strlen(_sr_jsdt_load_file.s) >= PATH_MAX) { + return duk_generic_error(JJ, "Load file path too long"); + } // no parent so relative to jsdt_load_file strcpy(requested_path, _sr_jsdt_load_file.s); } - char *ptr = strrchr(requested_path, '/'); + ptr = strrchr(requested_path, '/'); if(ptr) { ptr++; *ptr = '\0'; } + if(strlen(requested_path) + strlen(requested_id) >= PATH_MAX) { + return duk_generic_error(JJ, "Path too long"); + } strcat(requested_path, requested_id); } else { LM_INFO("cb_resolve_module - TODO resolve pathless module names"); @@ -1096,9 +1115,11 @@ duk_ret_t cb_resolve_module(duk_context *JJ) } // if missing add .js ext if(strcmp(strrchr(requested_path, '\0') - 3, ".js")) { + if(strlen(requested_path) + 3 >= PATH_MAX) { + return duk_generic_error(JJ, "Path too long"); + } strcat(requested_path, ".js"); } - char resolved_id[PATH_MAX]; if(realpath(requested_path, resolved_id)) { duk_push_string(JJ, resolved_id); return 1; /*nrets*/

1 0

git:master:e54a4187: tls_wolfssl: enable building with external package
by SPChan 18 Nov '23

18 Nov '23

Module: kamailio Branch: master Commit: e54a41874de6393d71b50368ffb8a4982aed2d2d URL: https://github.com/kamailio/kamailio/commit/e54a41874de6393d71b50368ffb8a49… Author: SPChan <shihping.chan(a)gmail.com> Committer: SPChan <shihping.chan(a)gmail.com> Date: 2023-11-18T21:14:06+08:00 tls_wolfssl: enable building with external package - build with git submodule: make ...WOLFSSL_INTERNAL=yes... - the default - build with external package: make ...WOLFSSL_INTERNAL=no... Debian recommended environment is libwolfssl41 5.6.4, libwolfssl-dev 5.6.4 --- Modified: src/modules/tls_wolfssl/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/e54a41874de6393d71b50368ffb8a49… Patch: https://github.com/kamailio/kamailio/commit/e54a41874de6393d71b50368ffb8a49… --- diff --git a/src/modules/tls_wolfssl/Makefile b/src/modules/tls_wolfssl/Makefile index fe2e7d8d4ed..1a6254ea7b2 100644 --- a/src/modules/tls_wolfssl/Makefile +++ b/src/modules/tls_wolfssl/Makefile @@ -8,6 +8,13 @@ include ../../Makefile.defs auto_gen= NAME=tls_wolfssl.so +# make WOLFSSL_INTERNAL=yes... for internal submodule +# make WOLFSSL_INTERNAL=no... for system package +# default: yes + +WOLFSSL_INTERNAL ?= yes + +ifeq ($(WOLFSSL_INTERNAL),yes) WOLFSSL_PREFIX = ../../../misc/external/wolfssl/build WOLFSSL_SRC = ../../../misc/external/wolfssl/wolfssl @@ -34,6 +41,15 @@ $(WOLFSSL_PREFIX)/include/wolfssl/options.h $(WOLFSSL_PREFIX)/lib/libwolfssl.a: $(NAME): $(WOLFSSL_PREFIX)/lib/libwolfssl.a +else +WOLFSSL_LIBS ?= $(shell pkg-config wolfssl --libs) +WOLFSSL_INCLUDES ?= $(shell pkg-config wolfssl --cflags) + +LIBS += $(WOLFSSL_LIBS) +INCLUDES += $(WOLFSSL_INCLUDES) +include ../../Makefile.modules +endif + clean-wolfssl: @rm -rf $(WOLFSSL_PREFIX)/{bin,include,share,lib}; \ (cd $(WOLFSSL_SRC); make distclean) || /bin/true

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
40
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2023