sr-dev March 2024

sr-dev@lists.kamailio.org

14 participants
242 discussions

git:5.7:e8150f78: pdb: Return negative carrierid for failures

by Stefan-Cristian Mititelu

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; }

8 months, 1 week

git:5.6:16f053f5: pdb server: Return negative carrierid for failures. Clang format

by Stefan-Cristian Mititelu

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);

8 months, 1 week

git:5.6:831b8329: pdb: Return negative carrierid for failures

by Stefan-Cristian Mititelu

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; }

8 months, 1 week

git:master:04a73ace: acc: more log messages of failure arsing extra acc string

by Daniel-Constantin Mierla

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 */

8 months, 1 week

[kamailio/kamailio] pdb: Return negative carrierid for failures (PR #3775)

by Stefan Mititelu

#### 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>

8 months, 1 week

git:master:8cf5892c: pdb server: Return negative carrierid for failures. Clang format

by Stefan Mititelu

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…

8 months, 1 week

git:master:0fd1516b: pdb: Return negative carrierid for failures

by Stefan Mititelu

Module: kamailio Branch: master Commit: 0fd1516b9519f84a0f24b3c9a2c643e74f1dc527 URL: https://github.com/kamailio/kamailio/commit/0fd1516b9519f84a0f24b3c9a2c643e… 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: Return negative carrierid for failures --- Modified: src/modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/0fd1516b9519f84a0f24b3c9a2c643e… Patch: https://github.com/kamailio/kamailio/commit/0fd1516b9519f84a0f24b3c9a2c643e… --- 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; }

8 months, 1 week

git:master:1380a4a0: ctl: handle int input for double storage

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1380a4a0d18159c7130b70c0216134a253ad83f7 URL: https://github.com/kamailio/kamailio/commit/1380a4a0d18159c7130b70c0216134a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-18T08:16:44+01:00 ctl: handle int input for double storage --- Modified: src/modules/ctl/binrpc.h --- Diff: https://github.com/kamailio/kamailio/commit/1380a4a0d18159c7130b70c0216134a… Patch: https://github.com/kamailio/kamailio/commit/1380a4a0d18159c7130b70c0216134a… --- diff --git a/src/modules/ctl/binrpc.h b/src/modules/ctl/binrpc.h index fd247bc603a..7909bc930d4 100644 --- a/src/modules/ctl/binrpc.h +++ b/src/modules/ctl/binrpc.h @@ -719,10 +719,12 @@ inline static unsigned char *binrpc_read_record(struct binrpc_parse_ctx *ctx, *err = E_BINRPC_MORE_DATA; goto error; } - if((v->type != type) && (v->type != BINRPC_T_ALL)) { - goto error_type; + if(!(v->type == BINRPC_T_DOUBLE && type == BINRPC_T_INT)) { + if((v->type != type) && (v->type != BINRPC_T_ALL)) { + goto error_type; + } + v->type = type; } - v->type = type; switch(type) { case BINRPC_T_STRUCT: if(ctx->in_struct) { @@ -779,7 +781,12 @@ inline static unsigned char *binrpc_read_record(struct binrpc_parse_ctx *ctx, case BINRPC_T_INT: if(ctx->in_struct && smode == 0) goto error_record; - p = binrpc_read_int(&v->u.intval, len, p, end, err); + if(v->type == BINRPC_T_DOUBLE) { + p = binrpc_read_int(&tmp, len, p, end, err); + v->u.fval = tmp; + } else { + p = binrpc_read_int(&v->u.intval, len, p, end, err); + } break; case BINRPC_T_STR: if(ctx->in_struct && smode == 0)

8 months, 1 week

[kamailio/kamailio] ims_ipsec_pcscf: TLS support in ipsec_forward() improved (PR #3780)

by Axel Sommerfeldt

#### 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 - [ ] Tested changes locally - [x] Related to issue #3772 #### Description  This patch was initially done by Herle Supreeth in his fork but isn't present upstream yet: https://github.com/kamailio/kamailio/commit/8b9a2977e111d9adb8595d98ab59f8c… You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3780 -- Commit Summary -- * ims_ipsec_pcscf: TLS support in ipsec_forward() improved -- File Changes -- M src/modules/ims_ipsec_pcscf/cmd.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3780.patch https://github.com/kamailio/kamailio/pull/3780.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3780 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3780(a)github.com>

8 months, 1 week

git:master:3154a0ab: ims_ipsec_pcscf: TLS support in ipsec_forward() improved

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3154a0aba5543cab75153429bc8ec617c3484f71 URL: https://github.com/kamailio/kamailio/commit/3154a0aba5543cab75153429bc8ec61… Author: Axel Sommerfeldt <axel.sommerfeldt(a)fastmail.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-18T08:03:56+01:00 ims_ipsec_pcscf: TLS support in ipsec_forward() improved This patch was initially done by Herle Supreeth in his fork but isn't present upstream yet: https://github.com/kamailio/kamailio/commit/8b9a2977e111d9adb8595d98ab59f8c… See also: https://github.com/kamailio/kamailio/issues/3772 --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/3154a0aba5543cab75153429bc8ec61… Patch: https://github.com/kamailio/kamailio/commit/3154a0aba5543cab75153429bc8ec61… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 47f9e401702..4f7301b56c1 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -1126,6 +1126,10 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) buf_len = snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d;transport=tcp", ci.via_host.len, ci.via_host.s, dst_port); + } else if((_cflags & IPSEC_SETDSTURI_FULL) && (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);

8 months, 1 week

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2024