sr-dev July 2024

sr-dev@lists.kamailio.org

16 participants
208 discussions

[kamailio/kamailio] extented haproxy protocol support (PR #3731)

by sergey-safarov

#### 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 - [x] Related to issue #3667 #### Description Allow creating Record-Route and Via header using destination address and port in the haproxy protocol header. PR created behalf @ivanuschak You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3731 -- Commit Summary -- * core: extented haproxy protocol parser * rr: extented haproxy protocol suppport * path: extented haproxy protocol suppport * websocket: extented haproxy protocol suppport * siptrace: extented haproxy protocol suppport -- File Changes -- M src/core/forward.h (4) M src/core/msg_translator.c (137) M src/core/parser/msg_parser.h (1) M src/core/receive.c (6) M src/core/receive.h (3) M src/core/tcp_conn.h (1) M src/core/tcp_main.c (22) M src/core/tcp_read.c (20) M src/modules/path/path.c (2) M src/modules/rr/loose.c (4) M src/modules/rr/record.c (6) M src/modules/siptrace/siptrace.c (89) M src/modules/websocket/ws_frame.c (9) M src/modules/websocket/ws_handshake.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3731.patch https://github.com/kamailio/kamailio/pull/3731.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3731 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3731(a)github.com>

2 months, 3 weeks

git:master:1c2b3361: tmx: t_precheck_trans() - explicit catch of internal return 0

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1c2b33615888dede0ea8abc098f6f910f810366b URL: https://github.com/kamailio/kamailio/commit/1c2b33615888dede0ea8abc098f6f91… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-11T21:30:33+02:00 tmx: t_precheck_trans() - explicit catch of internal return 0 --- Modified: src/modules/tmx/tmx_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1c2b33615888dede0ea8abc098f6f91… Patch: https://github.com/kamailio/kamailio/commit/1c2b33615888dede0ea8abc098f6f91… --- diff --git a/src/modules/tmx/tmx_mod.c b/src/modules/tmx/tmx_mod.c index 68b1e418c66..2e46c82a99a 100644 --- a/src/modules/tmx/tmx_mod.c +++ b/src/modules/tmx/tmx_mod.c @@ -921,7 +921,7 @@ static int t_precheck_trans(sip_msg_t *msg) ret = tmx_check_pretran(msg); if(ret > 0) return 1; - return (ret - 1); + return (ret == 0) ? -1 : ret; } /**

2 months, 3 weeks

git:master:e2193b9c: htable: do not print item name before is computed

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e2193b9cd7f59377c54e0424c0d4a1628a5a60de URL: https://github.com/kamailio/kamailio/commit/e2193b9cd7f59377c54e0424c0d4a16… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-11T19:38:24+02:00 htable: do not print item name before is computed --- Modified: src/modules/htable/ht_var.c --- Diff: https://github.com/kamailio/kamailio/commit/e2193b9cd7f59377c54e0424c0d4a16… Patch: https://github.com/kamailio/kamailio/commit/e2193b9cd7f59377c54e0424c0d4a16… --- diff --git a/src/modules/htable/ht_var.c b/src/modules/htable/ht_var.c index e79c7869ee5..4d7707f958b 100644 --- a/src/modules/htable/ht_var.c +++ b/src/modules/htable/ht_var.c @@ -38,8 +38,8 @@ int pv_get_ht_cell(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) if(hpv->ht == NULL) { hpv->ht = ht_get_table(&hpv->htname); if(hpv->ht == NULL) { - LM_ERR("htable not found for getting $sht(%.*s=>%.*s)\n", - hpv->htname.len, hpv->htname.s, htname.len, htname.s); + LM_ERR("htable not found for getting $sht(%.*s=>...)\n", + hpv->htname.len, hpv->htname.s); return pv_get_null(msg, param, res); } } @@ -77,8 +77,8 @@ int pv_set_ht_cell( if(hpv->ht == NULL) hpv->ht = ht_get_table(&hpv->htname); if(hpv->ht == NULL) { - LM_ERR("htable not found for setting $sht(%.*s=>%.*s)\n", - hpv->htname.len, hpv->htname.s, htname.len, htname.s); + LM_ERR("htable not found for setting $sht(%.*s=>...)\n", + hpv->htname.len, hpv->htname.s); return -1; }

2 months, 3 weeks

git:master:0a9cb4bf: htable: updated duplicated rm op id

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0a9cb4bf74bf11af88e93c1512053008d94aff13 URL: https://github.com/kamailio/kamailio/commit/0a9cb4bf74bf11af88e93c151205300… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-11T19:31:23+02:00 htable: updated duplicated rm op id --- Modified: src/modules/htable/ht_api.h --- Diff: https://github.com/kamailio/kamailio/commit/0a9cb4bf74bf11af88e93c151205300… Patch: https://github.com/kamailio/kamailio/commit/0a9cb4bf74bf11af88e93c151205300… --- diff --git a/src/modules/htable/ht_api.h b/src/modules/htable/ht_api.h index f7bd8ed42c0..5ac11b9bb00 100644 --- a/src/modules/htable/ht_api.h +++ b/src/modules/htable/ht_api.h @@ -124,9 +124,9 @@ int ht_reset_content(ht_t *ht); #define HT_RM_OP_EQ 1 #define HT_RM_OP_NE 2 #define HT_RM_OP_SW 3 -#define HT_RM_OP_EW 3 -#define HT_RM_OP_RE 4 -#define HT_RM_OP_IN 5 +#define HT_RM_OP_EW 4 +#define HT_RM_OP_RE 5 +#define HT_RM_OP_IN 6 int ht_rm_cell_op(str *sre, ht_t *ht, int mode, int op); int ht_match_cell_op_str(str *sre, ht_t *ht, int mode, int op);

2 months, 3 weeks

git:master:fffe7aae: core: counters - declare global cnts_no as unsigned short

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: fffe7aaecc41b8986eae342ce693bde87cdc20bc URL: https://github.com/kamailio/kamailio/commit/fffe7aaecc41b8986eae342ce693bde… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-11T15:50:48+02:00 core: counters - declare global cnts_no as unsigned short - it is used for counters h.id which is unsigned short --- Modified: src/core/counters.c --- Diff: https://github.com/kamailio/kamailio/commit/fffe7aaecc41b8986eae342ce693bde… Patch: https://github.com/kamailio/kamailio/commit/fffe7aaecc41b8986eae342ce693bde… --- diff --git a/src/core/counters.c b/src/core/counters.c index 5d9f26e5bce..dcf7ab7895e 100644 --- a/src/core/counters.c +++ b/src/core/counters.c @@ -83,9 +83,9 @@ static int grp_no = 0; /* number of groups */ /** counters array. a[proc_no][counter_id] => _cnst_vals[proc_no*cnts_no+counter_id] */ counter_array_t *_cnts_vals = 0; -int _cnts_row_len = 0; /* number of elements per row */ -static int cnts_no = 0; /* number of registered counters */ -static int cnts_max_rows = 0; /* set to 0 if not yet fully init */ +int _cnts_row_len = 0; /* number of elements per row */ +static unsigned short cnts_no = 0; /* number of registered counters */ +static int cnts_max_rows = 0; /* set to 0 if not yet fully init */ char *ksr_stats_namesep = KSR_STATS_NAMESEP;

2 months, 3 weeks

git:master:d7466474: core: counters - init local global variables

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d7466474bdc86b2b0d0872c5fd41d743ec1c7d66 URL: https://github.com/kamailio/kamailio/commit/d7466474bdc86b2b0d0872c5fd41d74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-11T15:44:07+02:00 core: counters - init local global variables --- Modified: src/core/counters.c --- Diff: https://github.com/kamailio/kamailio/commit/d7466474bdc86b2b0d0872c5fd41d74… Patch: https://github.com/kamailio/kamailio/commit/d7466474bdc86b2b0d0872c5fd41d74… --- diff --git a/src/core/counters.c b/src/core/counters.c index 1a7d6637c17..5d9f26e5bce 100644 --- a/src/core/counters.c +++ b/src/core/counters.c @@ -70,22 +70,22 @@ struct grp_record /** hash table mapping a counter name to an id */ static struct str_hash_table cnts_hash_table; /** array mapping id 2 record */ -struct counter_record **cnt_id2record; -static int cnt_id2record_size; +struct counter_record **cnt_id2record = NULL; +static int cnt_id2record_size = 0; /** hash table for groups (maps a group name to a counter list) */ static struct str_hash_table grp_hash_table; /** array of groups, sorted */ -static struct grp_record **grp_sorted; -static int grp_sorted_max_size; -static int grp_sorted_crt_size; -static int grp_no; /* number of groups */ +static struct grp_record **grp_sorted = NULL; +static int grp_sorted_max_size = 0; +static int grp_sorted_crt_size = 0; +static int grp_no = 0; /* number of groups */ /** counters array. a[proc_no][counter_id] => _cnst_vals[proc_no*cnts_no+counter_id] */ counter_array_t *_cnts_vals = 0; -int _cnts_row_len; /* number of elements per row */ -static int cnts_no; /* number of registered counters */ -static int cnts_max_rows; /* set to 0 if not yet fully init */ +int _cnts_row_len = 0; /* number of elements per row */ +static int cnts_no = 0; /* number of registered counters */ +static int cnts_max_rows = 0; /* set to 0 if not yet fully init */ char *ksr_stats_namesep = KSR_STATS_NAMESEP;

2 months, 3 weeks

git:master:48730820: core: action - logical OR for log() parameter types check

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 487308204d2674368a16ea913137a368761dd0b2 URL: https://github.com/kamailio/kamailio/commit/487308204d2674368a16ea913137a36… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-11T15:27:37+02:00 core: action - logical OR for log() parameter types check --- Modified: src/core/action.c --- Diff: https://github.com/kamailio/kamailio/commit/487308204d2674368a16ea913137a36… Patch: https://github.com/kamailio/kamailio/commit/487308204d2674368a16ea913137a36… --- diff --git a/src/core/action.c b/src/core/action.c index bd75eacec33..62f2910d09b 100644 --- a/src/core/action.c +++ b/src/core/action.c @@ -511,8 +511,8 @@ int do_action(struct run_act_ctx *h, struct action *a, struct sip_msg *msg) } break; case LOG_T: - if((a->val[0].type != NUMBER_ST) | (a->val[1].type != STRING_ST)) { - LM_CRIT("bad log() types %d, %d\n", a->val[0].type, + if((a->val[0].type != NUMBER_ST) || (a->val[1].type != STRING_ST)) { + LM_CRIT("bad log() parameter types %d, %d\n", a->val[0].type, a->val[1].type); ret = E_BUG; goto error;

2 months, 3 weeks

[kamailio/kamailio] core: Improved URN parsing according to RFC8141 (PR #3909)

by Nirv.Ana

#### 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  Improved URN parsing according to [RFC8141](https://datatracker.ietf.org/doc/html/rfc8141#section-2) that allows an arbitrary number of colons to be present in the URN value. Entire URN NID and NSS parts (except for `urn:` scheme) are stored in the `uri.host` struct field. `rq-components` are not supported. Example of the parse error when parsing "urn:emergency:service:sos" ``` parse_uri(): bad char ':' in state 3 parsed: urn:emergency:service (21) / urn:emergency:service:sos (25) ``` URN values that have been tested to work: - `urn:emergency:service:sos` - `urn:emergency:responder.fire` - `urn:emergency:media-feature` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3909 -- Commit Summary -- * core: Improved URN parsing according to RFC8141 -- File Changes -- M src/core/parser/parse_uri.c (48) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3909.patch https://github.com/kamailio/kamailio/pull/3909.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3909 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3909(a)github.com>

2 months, 3 weeks

git:master:6cdd56bb: core: Improved URN parsing according to RFC8141

by Henning Westerholt

Module: kamailio Branch: master Commit: 6cdd56bb85e1a10ebbb29c2633fb47bf7b56585e URL: https://github.com/kamailio/kamailio/commit/6cdd56bb85e1a10ebbb29c2633fb47b… Author: anmartan <a.martin(a)zaleos.net> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-07-11T10:23:21+02:00 core: Improved URN parsing according to RFC8141 - Improved URN parsing to allow consuming URNs that contain 3 or more colons. Previosly URI parser treated some of the colons as separator between host and port causing the URN parsing to fail. --- Modified: src/core/parser/parse_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/6cdd56bb85e1a10ebbb29c2633fb47b… Patch: https://github.com/kamailio/kamailio/commit/6cdd56bb85e1a10ebbb29c2633fb47b… --- diff --git a/src/core/parser/parse_uri.c b/src/core/parser/parse_uri.c index 9ccb62ee51e..4150c1598d6 100644 --- a/src/core/parser/parse_uri.c +++ b/src/core/parser/parse_uri.c @@ -237,28 +237,30 @@ int parse_uri(char *buf, int len, struct sip_uri *uri) } else \ goto error_bad_char -#define check_host_end \ - case ':': \ - /* found the host */ \ - uri->host.s = s; \ - uri->host.len = p - s; \ - state = URI_PORT; \ - s = p + 1; \ - break; \ - case ';': \ - uri->host.s = s; \ - uri->host.len = p - s; \ - state = URI_PARAM; \ - s = p + 1; \ - break; \ - case '?': \ - uri->host.s = s; \ - uri->host.len = p - s; \ - state = URI_HEADERS; \ - s = p + 1; \ - break; \ - case '&': \ - case '@': \ +#define check_host_end \ + case ':': \ + /* found the host */ \ + if(scheme != URN_SCH) { \ + uri->host.s = s; \ + uri->host.len = p - s; \ + state = URI_PORT; \ + s = p + 1; \ + } \ + break; \ + case ';': \ + uri->host.s = s; \ + uri->host.len = p - s; \ + state = URI_PARAM; \ + s = p + 1; \ + break; \ + case '?': \ + uri->host.s = s; \ + uri->host.len = p - s; \ + state = URI_HEADERS; \ + s = p + 1; \ + break; \ + case '&': \ + case '@': \ goto error_bad_char @@ -493,7 +495,7 @@ int parse_uri(char *buf, int len, struct sip_uri *uri) case '@': /* error no user part, or * be forgiving and accept it ? */ default: - state = URI_USER; + state = (scheme == URN_SCH) ? URI_HOST : URI_USER; } break; case URI_USER:

2 months, 3 weeks

git:master:22880dbb: core: log message that #!endif requires EoL after it

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 22880dbb2171c2763b4df2731be49f208fde7e8c URL: https://github.com/kamailio/kamailio/commit/22880dbb2171c2763b4df2731be49f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-10T14:18:30+02:00 core: log message that #!endif requires EoL after it --- Modified: src/core/ppcfg.c --- Diff: https://github.com/kamailio/kamailio/commit/22880dbb2171c2763b4df2731be49f2… Patch: https://github.com/kamailio/kamailio/commit/22880dbb2171c2763b4df2731be49f2… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index d77a237882b..407918aca72 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -281,6 +281,7 @@ void pp_ifdef_level_error(void) " %d more #!endif as #!if[n]def\n", (_pp_ifdef_level) * -1); } + LM_ERR("note: #!endif requires EoL after it, even before EoF\n"); } }

2 months, 3 weeks

← Newer
1
...
11
12
13
14
15
16
17
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2024