sr-dev March 2024

sr-dev@lists.kamailio.org

14 participants
246 discussions

[kamailio/kamailio] Discrepancies in migration of commits from herlesupreeth/kamailio to upstream (Issue #3772)
by Axel Sommerfeldt 18 Mar '24

18 Mar '24

AFAIK the commits from Herle Supreeth from its fork https://github.com/herlesupreeth/kamailio were migrated manually (not via PR) to upstream at the end of last year. While reviewing the migration I have found two discrepancies: 1. https://github.com/kamailio/kamailio/commit/8b9a2977e111d9adb8595d98ab59f8c… vs. https://github.com/kamailio/kamailio/commit/a6a3bd088368fbf65c283ae27e999d3… ``` herlesupreeth/kamailio (fork) commit 8b9a2977e111d9adb8595d98ab59f8c8eb033120 Author: herlesupreeth <herlesupreeth(a)gmail.com> Date: Mon Jun 7 14:01:54 2021 +0200 IPSec fixes diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 8e0cabcb80..9de3cf7331 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -937,7 +939,14 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d) dst_port = s->port_us; } - int buf_len = snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d", ci.via_host.len, ci.via_host.s, dst_port); + int buf_len = 0; + if (dst_proto == PROTO_TCP) { + buf_len = snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d;transport=tcp", ci.via_host.len, ci.via_host.s, dst_port); + } else if (dst_proto == PROTO_TLS) { + buf_len = snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d;transport=tls", ci.via_host.len, ci.via_host.s, dst_port); + } else { + buf_len = snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d", ci.via_host.len, ci.via_host.s, dst_port); + } if((m->dst_uri.s = pkg_malloc(buf_len + 1)) == NULL) { LM_ERR("Error allocating memory for dst_uri\n"); ``` vs. ``` kamailio/kamailio (upstream) commit a6a3bd088368fbf65c283ae27e999d315db0844b Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jun 1 18:11:22 2022 +0200 ims_ipsec_pcscf: new option for ipsec_forward() to set trasport for tcp dst uri diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 5aa208d334..6f6c15e21b 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -947,8 +949,14 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) if(!(_cflags & IPSEC_NODSTURI_RESET)) { char buf[1024]; - int buf_len = snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d", ci.via_host.len, - ci.via_host.s, dst_port); + int buf_len; + if((_cflags & IPSEC_SETDSTURI_FULL) && (dst_proto == PROTO_TCP)) { + buf_len = snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d;transport=tcp", + ci.via_host.len, ci.via_host.s, dst_port); + } else { + buf_len = snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d", ci.via_host.len, + ci.via_host.s, dst_port); + } if((m->dst_uri.s = pkg_malloc(buf_len + 1)) == NULL) { LM_ERR("Error allocating memory for dst_uri\n"); ``` To me it seems the handling of the case `dst_proto == PROTO_TLS` is missing upstream. 2. The commit https://github.com/kamailio/kamailio/commit/bfb0a17f3998d26991b4da7a8e83b8c… seems to be absent in upstream. (From my point of view all the other commits are migrated fine, thanks for the good work!) -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3772 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3772(a)github.com>

4 7

git:5.8:0af55b0e: pdb server: Return negative carrierid for failures. Clang format
by Stefan-Cristian Mititelu 18 Mar '24

18 Mar '24

Module: kamailio Branch: 5.8 Commit: 0af55b0eac8c3457db859a9c37fea211ece91b8a URL: https://github.com/kamailio/kamailio/commit/0af55b0eac8c3457db859a9c37fea21… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2024-03-18T13:36:10+02:00 pdb server: Return negative carrierid for failures. Clang format (cherry-picked from commit 88b698e0f62c39ed60af9f0a4fb3ca2dc6867d8f) --- Modified: utils/pdbt/pdb_server.c Modified: utils/pdbt/pdb_server_backend.c --- Diff: https://github.com/kamailio/kamailio/commit/0af55b0eac8c3457db859a9c37fea21… Patch: https://github.com/kamailio/kamailio/commit/0af55b0eac8c3457db859a9c37fea21…

1 0

git:5.8:6410f375: pdb: Return negative carrierid for failures
by Stefan-Cristian Mititelu 18 Mar '24

18 Mar '24

Module: kamailio Branch: 5.8 Commit: 6410f375cd6d1e357afeb9e100bd3a3c51321280 URL: https://github.com/kamailio/kamailio/commit/6410f375cd6d1e357afeb9e100bd3a3… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2024-03-18T13:35:05+02:00 pdb: Return negative carrierid for failures (cherry-picked from commit bf78b619ae28924361fb2c757a4d09eb1a39f5cd) --- Modified: src/modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/6410f375cd6d1e357afeb9e100bd3a3… Patch: https://github.com/kamailio/kamailio/commit/6410f375cd6d1e357afeb9e100bd3a3… --- diff --git a/src/modules/pdb/pdb.c b/src/modules/pdb/pdb.c index 6889e63b915..1398f7574f8 100644 --- a/src/modules/pdb/pdb.c +++ b/src/modules/pdb/pdb.c @@ -393,20 +393,20 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, goto found; } break; - case PDB_CODE_NOT_NUMBER: - LM_NOTICE("Number %s has letters in it\n", - number.s); - carrierid = 0; - goto found; case PDB_CODE_NOT_FOUND: LM_NOTICE("Number %s pdb_id not found\n", number.s); - carrierid = 0; + carrierid = -1; + goto found; + case PDB_CODE_NOT_NUMBER: + LM_NOTICE("Number %s has letters in it\n", + number.s); + carrierid = -2; goto found; default: LM_NOTICE("Invalid code %d received\n", msg.hdr.code); - carrierid = 0; + carrierid = -3; goto found; }

1 0

git:5.7:c717c016: pdb server: Return negative carrierid for failures. Clang format
by Stefan-Cristian Mititelu 18 Mar '24

18 Mar '24

Module: kamailio Branch: 5.7 Commit: c717c016b70a82566dfc58d8d9dee3d3f51ddb01 URL: https://github.com/kamailio/kamailio/commit/c717c016b70a82566dfc58d8d9dee3d… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2024-03-18T13:25:21+02:00 pdb server: Return negative carrierid for failures. Clang format (cherry-picked from commit 88b698e0f62c39ed60af9f0a4fb3ca2dc6867d8f) --- Modified: utils/pdbt/pdb_server.c Modified: utils/pdbt/pdb_server_backend.c --- Diff: https://github.com/kamailio/kamailio/commit/c717c016b70a82566dfc58d8d9dee3d… Patch: https://github.com/kamailio/kamailio/commit/c717c016b70a82566dfc58d8d9dee3d… --- diff --git a/utils/pdbt/pdb_server.c b/utils/pdbt/pdb_server.c index 6ce32557cc7..2de2ba789d7 100644 --- a/utils/pdbt/pdb_server.c +++ b/utils/pdbt/pdb_server.c @@ -151,7 +151,7 @@ int udp_server(int so) carrierid = lookup_number(msg.bdy.payload); /* check if not found pdb_id */ - if(carrierid == 0) { + if(carrierid == -1) { pdb_msg_format_send(&msg, PDB_VERSION_1, PDB_TYPE_REPLY_ID, PDB_CODE_NOT_FOUND, htons(msg.hdr.id), NULL, 0); goto msg_send; diff --git a/utils/pdbt/pdb_server_backend.c b/utils/pdbt/pdb_server_backend.c index dc4028bee19..931e28d7603 100644 --- a/utils/pdbt/pdb_server_backend.c +++ b/utils/pdbt/pdb_server_backend.c @@ -44,8 +44,8 @@ carrier_t lookup_number(char *number) carrier_t carrierid; int nmatch = dtm_longest_match(mroot, number, strlen(number), &carrierid); if(nmatch <= 0) { - /* nothing found - return id 0 */ - carrierid = 0; + /* nothing found - return id -1 */ + carrierid = -1; } LINFO("request='%s', nmatch=%ld, carrier=%ld\n", number, (long int)nmatch, (long int)carrierid);

1 0

git:5.7:e8150f78: pdb: Return negative carrierid for failures
by Stefan-Cristian Mititelu 18 Mar '24

18 Mar '24

Module: kamailio Branch: 5.7 Commit: e8150f78630f7991ea31a385c899c32c0e330a26 URL: https://github.com/kamailio/kamailio/commit/e8150f78630f7991ea31a385c899c32… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2024-03-18T13:23:29+02:00 pdb: Return negative carrierid for failures (cherry picked from commit bf78b619ae28924361fb2c757a4d09eb1a39f5cd) --- Modified: src/modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/e8150f78630f7991ea31a385c899c32… Patch: https://github.com/kamailio/kamailio/commit/e8150f78630f7991ea31a385c899c32… --- diff --git a/src/modules/pdb/pdb.c b/src/modules/pdb/pdb.c index 75013cccb7a..3c37e5971ea 100644 --- a/src/modules/pdb/pdb.c +++ b/src/modules/pdb/pdb.c @@ -386,20 +386,20 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, goto found; } break; - case PDB_CODE_NOT_NUMBER: - LM_NOTICE("Number %s has letters in it\n", - number.s); - carrierid = 0; - goto found; case PDB_CODE_NOT_FOUND: LM_NOTICE("Number %s pdb_id not found\n", number.s); - carrierid = 0; + carrierid = -1; + goto found; + case PDB_CODE_NOT_NUMBER: + LM_NOTICE("Number %s has letters in it\n", + number.s); + carrierid = -2; goto found; default: LM_NOTICE("Invalid code %d received\n", msg.hdr.code); - carrierid = 0; + carrierid = -3; goto found; }

1 0

git:5.6:16f053f5: pdb server: Return negative carrierid for failures. Clang format
by Stefan-Cristian Mititelu 18 Mar '24

18 Mar '24

Module: kamailio Branch: 5.6 Commit: 16f053f5eb3a36992225c1a72db3575165bb68a8 URL: https://github.com/kamailio/kamailio/commit/16f053f5eb3a36992225c1a72db3575… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2024-03-18T13:21:18+02:00 pdb server: Return negative carrierid for failures. Clang format (cherry picked from commit 88b698e0f62c39ed60af9f0a4fb3ca2dc6867d8f) --- Modified: utils/pdbt/pdb_server.c Modified: utils/pdbt/pdb_server_backend.c --- Diff: https://github.com/kamailio/kamailio/commit/16f053f5eb3a36992225c1a72db3575… Patch: https://github.com/kamailio/kamailio/commit/16f053f5eb3a36992225c1a72db3575… --- diff --git a/utils/pdbt/pdb_server.c b/utils/pdbt/pdb_server.c index 6ce32557cc7..2de2ba789d7 100644 --- a/utils/pdbt/pdb_server.c +++ b/utils/pdbt/pdb_server.c @@ -151,7 +151,7 @@ int udp_server(int so) carrierid = lookup_number(msg.bdy.payload); /* check if not found pdb_id */ - if(carrierid == 0) { + if(carrierid == -1) { pdb_msg_format_send(&msg, PDB_VERSION_1, PDB_TYPE_REPLY_ID, PDB_CODE_NOT_FOUND, htons(msg.hdr.id), NULL, 0); goto msg_send; diff --git a/utils/pdbt/pdb_server_backend.c b/utils/pdbt/pdb_server_backend.c index dc4028bee19..931e28d7603 100644 --- a/utils/pdbt/pdb_server_backend.c +++ b/utils/pdbt/pdb_server_backend.c @@ -44,8 +44,8 @@ carrier_t lookup_number(char *number) carrier_t carrierid; int nmatch = dtm_longest_match(mroot, number, strlen(number), &carrierid); if(nmatch <= 0) { - /* nothing found - return id 0 */ - carrierid = 0; + /* nothing found - return id -1 */ + carrierid = -1; } LINFO("request='%s', nmatch=%ld, carrier=%ld\n", number, (long int)nmatch, (long int)carrierid);

1 0

git:5.6:831b8329: pdb: Return negative carrierid for failures
by Stefan-Cristian Mititelu 18 Mar '24

18 Mar '24

Module: kamailio Branch: 5.6 Commit: 831b832916083900d1426e53518f34ed77aa28ad URL: https://github.com/kamailio/kamailio/commit/831b832916083900d1426e53518f34e… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2024-03-18T13:20:09+02:00 pdb: Return negative carrierid for failures (cherry picked from commit bf78b619ae28924361fb2c757a4d09eb1a39f5cd) --- Modified: src/modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/831b832916083900d1426e53518f34e… Patch: https://github.com/kamailio/kamailio/commit/831b832916083900d1426e53518f34e… --- diff --git a/src/modules/pdb/pdb.c b/src/modules/pdb/pdb.c index bfe31b4e8eb..e310d43acae 100644 --- a/src/modules/pdb/pdb.c +++ b/src/modules/pdb/pdb.c @@ -386,20 +386,20 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, goto found; } break; - case PDB_CODE_NOT_NUMBER: - LM_NOTICE("Number %s has letters in it\n", - number.s); - carrierid = 0; - goto found; case PDB_CODE_NOT_FOUND: LM_NOTICE("Number %s pdb_id not found\n", number.s); - carrierid = 0; + carrierid = -1; + goto found; + case PDB_CODE_NOT_NUMBER: + LM_NOTICE("Number %s has letters in it\n", + number.s); + carrierid = -2; goto found; default: LM_NOTICE("Invalid code %d received\n", msg.hdr.code); - carrierid = 0; + carrierid = -3; goto found; }

1 0

git:master:04a73ace: acc: more log messages of failure arsing extra acc string
by Daniel-Constantin Mierla 18 Mar '24

18 Mar '24

Module: kamailio Branch: master Commit: 04a73ace6572dd5c95a8f50b39b2ce712f7ebe84 URL: https://github.com/kamailio/kamailio/commit/04a73ace6572dd5c95a8f50b39b2ce7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-18T11:02:07+01:00 acc: more log messages of failure arsing extra acc string --- Modified: src/modules/acc/acc_extra.c --- Diff: https://github.com/kamailio/kamailio/commit/04a73ace6572dd5c95a8f50b39b2ce7… Patch: https://github.com/kamailio/kamailio/commit/04a73ace6572dd5c95a8f50b39b2ce7… --- diff --git a/src/modules/acc/acc_extra.c b/src/modules/acc/acc_extra.c index 255057a99c4..a84f02bbe02 100644 --- a/src/modules/acc/acc_extra.c +++ b/src/modules/acc/acc_extra.c @@ -127,8 +127,10 @@ struct acc_extra *parse_acc_extra(char *extra_str) foo = s; while(*s && !isspace((int)*s) && EQUAL != *s) s++; - if(*s == 0) + if(*s == 0) { + LM_ERR("unexpected end of string\n"); goto parse_error; + } if(*s == EQUAL) { extra->name.len = (s++) - foo; } else { @@ -136,8 +138,10 @@ struct acc_extra *parse_acc_extra(char *extra_str) /* skip spaces */ while(*s && isspace((int)*s)) s++; - if(*s != EQUAL) + if(*s != EQUAL) { + LM_ERR("unexpected char '%c' instead of '='\n", *s); goto parse_error; + } s++; } extra->name.s = foo; @@ -149,15 +153,19 @@ struct acc_extra *parse_acc_extra(char *extra_str) /* get value type */ stmp.s = s; stmp.len = strlen(s); - if((foo = pv_parse_spec(&stmp, &extra->spec)) == 0) + if((foo = pv_parse_spec(&stmp, &extra->spec)) == 0) { + LM_ERR("failed to parse variable name\n"); goto parse_error; + } s = foo; /* skip spaces */ while(*s && isspace((int)*s)) s++; - if(*s && (*(s++) != SEPARATOR || *s == 0)) + if(*s && (*(s++) != SEPARATOR || *s == 0)) { + LM_ERR("unexpected char at end of name=var group\n"); goto parse_error; + } } /* go throught all extras and make the names null terminated */

1 0

[kamailio/kamailio] pdb: Return negative carrierid for failures (PR #3775)
by Stefan Mititelu 18 Mar '24

18 Mar '24

#### 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  Carrier id 0 might be a valid carrier number(e.g. for Germany D000-D999 are valid). Return negative carrier id in case of failures. If all ok, I'd like to backport this to 5.8, 5.7 and 5.6 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3775 -- Commit Summary -- * pdb: Return negative carrierid for failures -- File Changes -- M src/modules/pdb/pdb.c (14) M utils/pdbt/pdb_server.c (2) M utils/pdbt/pdb_server_backend.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3775.patch https://github.com/kamailio/kamailio/pull/3775.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3775 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3775(a)github.com>

2 6

git:master:8cf5892c: pdb server: Return negative carrierid for failures. Clang format
by Stefan Mititelu 18 Mar '24

18 Mar '24

Module: kamailio Branch: master Commit: 8cf5892cb34248cea2deea606a0f7d46d574404b URL: https://github.com/kamailio/kamailio/commit/8cf5892cb34248cea2deea606a0f7d4… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)govoip.ro> Date: 2024-03-18T10:55:24+02:00 pdb server: Return negative carrierid for failures. Clang format --- Modified: utils/pdbt/pdb_server.c Modified: utils/pdbt/pdb_server_backend.c --- Diff: https://github.com/kamailio/kamailio/commit/8cf5892cb34248cea2deea606a0f7d4… Patch: https://github.com/kamailio/kamailio/commit/8cf5892cb34248cea2deea606a0f7d4…

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
25
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2024