- sr-dev - kamailio.org

git:master:34edbfa0: core: tcp_main - remove old comments
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: 34edbfa0194ba29e0e671551d44df3710beb93b6 URL: https://github.com/kamailio/kamailio/commit/34edbfa0194ba29e0e671551d44df37… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T10:18:58+01:00 core: tcp_main - remove old comments --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/34edbfa0194ba29e0e671551d44df37… Patch: https://github.com/kamailio/kamailio/commit/34edbfa0194ba29e0e671551d44df37… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 00a1796ec5a..855b2d80617 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -4373,7 +4373,6 @@ inline static int send2child(struct tcp_connection *tcpconn) tcpconn->s) <= 0)) { if((errno == EAGAIN) || (errno == EWOULDBLOCK)) { - /* FIXME: remove after debugging */ LM_CRIT("tcp child %d, socket %d: queue full, %d requests queued " "(total handled %d)\n", idx, tcp_children[idx].unix_sock, min_busy, @@ -4556,23 +4555,7 @@ inline static int handle_tcpconn_ev( int empty_q; int bytes; #endif /* TCP_ASYNC */ - /* is refcnt!=0 really necessary? - * No, in fact it's a bug: I can have the following situation: a send only - * tcp connection used by n processes simultaneously => refcnt = n. In - * the same time I can have a read event and this situation is perfectly - * valid. -- andrei - */ -#if 0 - if ((tcpconn->refcnt!=0)){ - /* FIXME: might be valid for sigio_rt iff fd flags are not cleared - * (there is a short window in which it could generate a sig - * that would be caught by tcp_main) */ - LM_CRIT("handle_tcpconn_ev: io event on referenced" - " tcpconn (%p), refcnt=%d, fd=%d\n", - tcpconn, tcpconn->refcnt, tcpconn->s); - return -1; - } -#endif + /* pass it to child, so remove it from the io watch list and the local * timer */ #ifdef TCP_ASYNC @@ -4627,7 +4610,7 @@ inline static int handle_tcpconn_ev( (void)dst_blocklist_su(BLST_ERR_SEND, tcpconn->rcv.proto, &tcpconn->rcv.src_su, &tcpconn->send_flags, 0); #endif /* USE_DST_BLOCKLIST */ - TCP_STATS_CON_RESET(); /* FIXME: it could != RST */ + TCP_STATS_CON_RESET(); /* note: it could != RST */ } } if(unlikely(!tcpconn_try_unhash(tcpconn))) {

1 0

git:master:e51ccd11: core: set proto on fixing forward actions
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: e51ccd11fe51f2d53dd7719b8fdec561a6ba7494 URL: https://github.com/kamailio/kamailio/commit/e51ccd11fe51f2d53dd7719b8fdec56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T10:07:50+01:00 core: set proto on fixing forward actions --- Modified: src/core/route.c --- Diff: https://github.com/kamailio/kamailio/commit/e51ccd11fe51f2d53dd7719b8fdec56… Patch: https://github.com/kamailio/kamailio/commit/e51ccd11fe51f2d53dd7719b8fdec56… --- diff --git a/src/core/route.c b/src/core/route.c index f6c8c681d29..a03330b6c04 100644 --- a/src/core/route.c +++ b/src/core/route.c @@ -619,6 +619,7 @@ int fix_actions(struct action *a) enum rval_type rve_type, err_type, expected_type; struct rvalue *rv; int rve_param_no; + int proto; if(a == 0) { LM_CRIT("null pointer\n"); @@ -646,8 +647,23 @@ int fix_actions(struct action *a) case STRING_ST: s.s = t->val[0].u.string; s.len = strlen(s.s); - p = add_proxy( - &s, t->val[1].u.number, 0); /* FIXME proto*/ + switch(t->type) { + case FORWARD_TCP_T: + proto = PROTO_TCP; + break; + case FORWARD_TLS_T: + proto = PROTO_TCP; + break; + case FORWARD_SCTP_T: + proto = PROTO_TCP; + break; + case FORWARD_UDP_T: + proto = PROTO_TCP; + break; + default: + proto = 0; + } + p = add_proxy(&s, t->val[1].u.number, proto); if(p == 0) { ret = E_BAD_ADDRESS; goto error;

1 0

git:master:c9fbf264: xcap: clang format
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: c9fbf2640ad74e9f42b43bded80877f8c4ce3f5d URL: https://github.com/kamailio/kamailio/commit/c9fbf2640ad74e9f42b43bded80877f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T09:43:15+01:00 xcap: clang format --- Modified: src/lib/xcap/common_policy.c Modified: src/lib/xcap/common_policy.h Modified: src/lib/xcap/msg_rules.c Modified: src/lib/xcap/msg_rules.h Modified: src/lib/xcap/parse_common_rules.c Modified: src/lib/xcap/parse_common_rules.h Modified: src/lib/xcap/parse_msg_rules.c Modified: src/lib/xcap/parse_pres_rules.c Modified: src/lib/xcap/pres_rules.c Modified: src/lib/xcap/pres_rules.h Modified: src/lib/xcap/resource_list.c Modified: src/lib/xcap/resource_list.h Modified: src/lib/xcap/resource_lists_parser.c Modified: src/lib/xcap/resource_lists_parser.h Modified: src/lib/xcap/rls_services_parser.c Modified: src/lib/xcap/rls_services_parser.h Modified: src/lib/xcap/xcap_client.c Modified: src/lib/xcap/xcap_client.h Modified: src/lib/xcap/xcap_result_codes.h Modified: src/lib/xcap/xml_utils.c Modified: src/lib/xcap/xml_utils.h --- Diff: https://github.com/kamailio/kamailio/commit/c9fbf2640ad74e9f42b43bded80877f… Patch: https://github.com/kamailio/kamailio/commit/c9fbf2640ad74e9f42b43bded80877f…

1 0

git:master:a84e8bf0: srdb2: clang format
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: a84e8bf031994d1b8d71e7b778204df0cbd7475b URL: https://github.com/kamailio/kamailio/commit/a84e8bf031994d1b8d71e7b778204df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T09:43:15+01:00 srdb2: clang format --- Modified: src/lib/srdb2/db.h Modified: src/lib/srdb2/db_cmd.c Modified: src/lib/srdb2/db_cmd.h Modified: src/lib/srdb2/db_con.c Modified: src/lib/srdb2/db_con.h Modified: src/lib/srdb2/db_ctx.c Modified: src/lib/srdb2/db_ctx.h Modified: src/lib/srdb2/db_drv.c Modified: src/lib/srdb2/db_drv.h Modified: src/lib/srdb2/db_fld.c Modified: src/lib/srdb2/db_fld.h Modified: src/lib/srdb2/db_gen.c Modified: src/lib/srdb2/db_gen.h Modified: src/lib/srdb2/db_pool.c Modified: src/lib/srdb2/db_pool.h Modified: src/lib/srdb2/db_rec.c Modified: src/lib/srdb2/db_rec.h Modified: src/lib/srdb2/db_res.c Modified: src/lib/srdb2/db_res.h Modified: src/lib/srdb2/db_uri.c Modified: src/lib/srdb2/db_uri.h --- Diff: https://github.com/kamailio/kamailio/commit/a84e8bf031994d1b8d71e7b778204df… Patch: https://github.com/kamailio/kamailio/commit/a84e8bf031994d1b8d71e7b778204df…

1 0

git:master:4d4311b3: srdb1: clang format
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: 4d4311b355b111ec4b22c748f8d9dd0960ae4c4f URL: https://github.com/kamailio/kamailio/commit/4d4311b355b111ec4b22c748f8d9dd0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T09:43:15+01:00 srdb1: clang format --- Modified: src/lib/srdb1/db.c Modified: src/lib/srdb1/db.h Modified: src/lib/srdb1/db_cap.h Modified: src/lib/srdb1/db_con.h Modified: src/lib/srdb1/db_id.c Modified: src/lib/srdb1/db_id.h Modified: src/lib/srdb1/db_key.h Modified: src/lib/srdb1/db_locking.h Modified: src/lib/srdb1/db_op.h Modified: src/lib/srdb1/db_pool.c Modified: src/lib/srdb1/db_pool.h Modified: src/lib/srdb1/db_pooling.h Modified: src/lib/srdb1/db_query.c Modified: src/lib/srdb1/db_query.h Modified: src/lib/srdb1/db_res.c Modified: src/lib/srdb1/db_res.h Modified: src/lib/srdb1/db_row.c Modified: src/lib/srdb1/db_row.h Modified: src/lib/srdb1/db_ut.c Modified: src/lib/srdb1/db_ut.h Modified: src/lib/srdb1/db_val.c Modified: src/lib/srdb1/db_val.h --- Diff: https://github.com/kamailio/kamailio/commit/4d4311b355b111ec4b22c748f8d9dd0… Patch: https://github.com/kamailio/kamailio/commit/4d4311b355b111ec4b22c748f8d9dd0…

1 0

git:master:3893cea9: shm_regex: clang format
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

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

1 0

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

git:master:38aa7e5f: tls_wolfssl: update internal submodule to v5.6.4, and target 5.6.x for distro package
by SPChan 18 Nov '23

18 Nov '23

Module: kamailio Branch: master Commit: 38aa7e5fffcb68979a9bb5771aaa6ef9e14b517d URL: https://github.com/kamailio/kamailio/commit/38aa7e5fffcb68979a9bb5771aaa6ef… Author: SPChan <shihping.chan(a)gmail.com> Committer: SPChan <shihping.chan(a)gmail.com> Date: 2023-11-18T19:07:59+08:00 tls_wolfssl: update internal submodule to v5.6.4, and target 5.6.x for distro package --- Modified: misc/external/wolfssl/wolfssl --- Diff: https://github.com/kamailio/kamailio/commit/38aa7e5fffcb68979a9bb5771aaa6ef… Patch: https://github.com/kamailio/kamailio/commit/38aa7e5fffcb68979a9bb5771aaa6ef… --- diff --git a/misc/external/wolfssl/wolfssl b/misc/external/wolfssl/wolfssl index 3b3c175af0e..37884f864d6 160000 --- a/misc/external/wolfssl/wolfssl +++ b/misc/external/wolfssl/wolfssl @@ -1 +1 @@ -Subproject commit 3b3c175af0e993ffaae251871421e206cc41963f +Subproject commit 37884f864d6fd9b04f44677cb04da15d0c9d6526

1 0

git:master:dea9b252: tls_wolfssl: re-enable optimizations as qm/fm default to 16-byte alignment
by SPChan 18 Nov '23

18 Nov '23

Module: kamailio Branch: master Commit: dea9b25299ee273e45b0e08acacff8de87b7ceb9 URL: https://github.com/kamailio/kamailio/commit/dea9b25299ee273e45b0e08acacff8d… Author: SPChan <shihping.chan(a)gmail.com> Committer: SPChan <shihping.chan(a)gmail.com> Date: 2023-11-18T12:21:03+08:00 tls_wolfssl: re-enable optimizations as qm/fm default to 16-byte alignment --- Modified: src/modules/tls_wolfssl/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/dea9b25299ee273e45b0e08acacff8d… Patch: https://github.com/kamailio/kamailio/commit/dea9b25299ee273e45b0e08acacff8d… --- diff --git a/src/modules/tls_wolfssl/Makefile b/src/modules/tls_wolfssl/Makefile index 730076023a9..fe2e7d8d4ed 100644 --- a/src/modules/tls_wolfssl/Makefile +++ b/src/modules/tls_wolfssl/Makefile @@ -25,7 +25,7 @@ $(WOLFSSL_PREFIX)/include/wolfssl/options.h $(WOLFSSL_PREFIX)/lib/libwolfssl.a: if [ ! -f "Makefile" ]; then \ env -u DEFS -u CFLAGS -u LDFLAGS -u LIBS EXTRA_CFLAGS="-g -O2 -fPIC" ./configure \ --enable-all --enable-pkcs11 --enable-static --enable-writedup \ - --disable-aligndata --disable-shared --disable-examples \ + --disable-shared --disable-examples \ --disable-jni --disable-crl-monitor \ --prefix=$(CURDIR)/$(WOLFSSL_PREFIX) \ --exec-prefix=$(CURDIR)/$(WOLFSSL_PREFIX); \

1 0

[kamailio/kamailio] topos: BYE sent by caller before call was connected was badly managed (PR #3644)
by Frédéric Gaisnon 17 Nov '23

17 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  When caller sent a BYE instead a CANCEL into a non connected call, route are badly reappend by topos. regression introduced by patch 091dc9a76bcec5c8a4bc73e863ed10b1b9d76c92 topos: fix early-dialog b-side UPDATE requests routing (GH #3437) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3644 -- Commit Summary -- * topos: BYE sent by caller before call was connected was badly managed -- File Changes -- M src/modules/topos/tps_msg.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3644.patch https://github.com/kamailio/kamailio/pull/3644.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3644 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3644(a)github.com>

3 8

git:master:9898c586: topos: BYE sent by caller before call was connected was badly managed
by Henning Westerholt 17 Nov '23

17 Nov '23

Module: kamailio Branch: master Commit: 9898c586095bd75cd31f0ca383ba0a347bfc4891 URL: https://github.com/kamailio/kamailio/commit/9898c586095bd75cd31f0ca383ba0a3… Author: frederic <frederic.gaisnon(a)mmtt.fr> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-11-17T14:48:35+01:00 topos: BYE sent by caller before call was connected was badly managed regression introduced by patch 091dc9a76bcec5c8a4bc73e863ed10b1b9d76c92 topos: fix early-dialog b-side UPDATE requests routing (GH #3437) --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/9898c586095bd75cd31f0ca383ba0a3… Patch: https://github.com/kamailio/kamailio/commit/9898c586095bd75cd31f0ca383ba0a3… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 942629568b9..4d680e53f45 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -962,7 +962,7 @@ int tps_request_received(sip_msg_t *msg, int dialog) LM_DBG("use branch for routing information, request from direction " "%d\n", direction); - if(tps_reappend_route(msg, &stsd, &stsd.s_rr, 1) < 0) { + if(tps_reappend_route(msg, &stsd, &stsd.s_rr, (direction == TPS_DIR_UPSTREAM) ? 0 : 1) < 0) { LM_ERR("failed to reappend s-route\n"); return -1; }

1 0

Problems with fsn
by aaron.soto＠dialapplet.com 17 Nov '23

17 Nov '23

Hello to all, I am having a problem that when I send an invite from kamailio, when I change the variable $fsn by an alias it takes the ip well, but the port sends it by a random port, when observing the capture with the sngrep it is shown as the source port is completely random. If someone can help me, let me know what kind of information you can help. Thanks

1 0

Kamailio v5.7.3 Released
by Daniel-Constantin Mierla 17 Nov '23

17 Nov '23

Hello, Kamailio SIP Server v5.7.3 stable release is out. This is a maintenance release of the latest stable branch, 5.7, that includes fixes since the release of v5.7.2. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.7.x. Deployments running previous v5.7.x versions are strongly recommended to be upgraded to v5.7.3. For more details about version 5.7.3 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2023/11/kamailio-v5-7-3-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - www.kamailioworld.com

1 0

[kamailio/kamailio] Allow function set_advertised_address to receive variable as parameter (#2137)
by pwakano 17 Nov '23

17 Nov '23

### Description Currently the functions set_advertised_address and set_advertised_port only accept strings as parameters. Trying to use it with variable causes an error. Having the function using a hard coded value is not a good practice and in order to add flexibility to the script in different installations it would be nice to have this function accepting variables. Also, the 'advertise' option on the 'listen' parameter is not always desired because it apply for all messages sent via the socket, and there are situations where different advertised IP for the same interface are necessary. ### Expected behavior set_advertised_address should receive a variable as parameter and use its value to change the SIP headers. ### Actual observed behavior Kamailio won't start if set_advertised_address is used with a variable due to script parse error or it will set the SIP message with the literal string "$var(test)" for example, instead of using the value of $var(test). ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` # kamailio -v version: kamailio 5.2.2 (x86_64/linux) 67f967 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 67f967 compiled on 11:40:41 Mar 11 2019 with gcc 4.8.5 ``` * **Operating System**:  ``` # uname -a Linux voice-conn-kamailio-1 3.10.0-514.21.2.el7.x86_64 #1 SMP Tue Jun 20 12:24:47 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2137

7 9

git:5.7:e4d96bd4: ChangeLog: content updated for v5.7.3
by Daniel-Constantin Mierla 17 Nov '23

17 Nov '23

Module: kamailio Branch: 5.7 Commit: e4d96bd4f7cdf6482ac5c08400ccd09f241541bf URL: https://github.com/kamailio/kamailio/commit/e4d96bd4f7cdf6482ac5c08400ccd09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-17T10:24:45+01:00 ChangeLog: content updated for v5.7.3 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/e4d96bd4f7cdf6482ac5c08400ccd09… Patch: https://github.com/kamailio/kamailio/commit/e4d96bd4f7cdf6482ac5c08400ccd09…

1 0

git:5.7:1ec50936: Makefile.defs: version set to 5.7.3
by Daniel-Constantin Mierla 17 Nov '23

17 Nov '23

Module: kamailio Branch: 5.7 Commit: 1ec5093657959b4af1c9d4e0ea48879ed1105f4d URL: https://github.com/kamailio/kamailio/commit/1ec5093657959b4af1c9d4e0ea48879… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-17T09:56:00+01:00 Makefile.defs: version set to 5.7.3 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/1ec5093657959b4af1c9d4e0ea48879… Patch: https://github.com/kamailio/kamailio/commit/1ec5093657959b4af1c9d4e0ea48879… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 287efecafa3..5d485bb2c74 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 7 -SUBLEVEL = 2 +SUBLEVEL = 3 EXTRAVERSION = # memory manager switcher

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev