sr-dev June 2021

sr-dev@lists.kamailio.org

15 participants
311 discussions

git:5.5:3bfb1773: mtree: Fix some typos, adjust some formatting

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 3bfb1773c01731177824b907180a7eeb7e43d3af URL: https://github.com/kamailio/kamailio/commit/3bfb1773c01731177824b907180a7ee… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T10:57:45+02:00 mtree: Fix some typos, adjust some formatting (cherry picked from commit 316c80607243387015e35ac423238c5a32401a44) --- Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3bfb1773c01731177824b907180a7ee… Patch: https://github.com/kamailio/kamailio/commit/3bfb1773c01731177824b907180a7ee… --- diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index badbd09dc8..c04f031cfd 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -175,37 +175,37 @@ static int mod_init(void) return -1; } - if(pv_parse_spec(&value_param, &pv_value)<00 + if(pv_parse_spec(&value_param, &pv_value) < 0 || !(pv_is_w(&pv_value))) { - LM_ERR("cannot parse value pv or is read only\n"); + LM_ERR("cannot parse value pv or pv is read-only\n"); return -1; } - if (pv_parse_spec(&values_param, &pv_values) <0 + if (pv_parse_spec(&values_param, &pv_values) < 0 || pv_values.type != PVT_AVP) { LM_ERR("cannot parse values avp\n"); return -1; } - if(pv_parse_spec(&dstid_param, &pv_dstid)<0 + if(pv_parse_spec(&dstid_param, &pv_dstid) < 0 || pv_dstid.type!=PVT_AVP) { LM_ERR("cannot parse dstid avp\n"); return -1; } - if(pv_parse_spec(&weight_param, &pv_weight)<0 + if(pv_parse_spec(&weight_param, &pv_weight) < 0 || pv_weight.type!=PVT_AVP) { - LM_ERR("cannot parse dstid avp\n"); + LM_ERR("cannot parse weight avp\n"); return -1; } - if(pv_parse_spec(&count_param, &pv_count)<0 + if(pv_parse_spec(&count_param, &pv_count) < 0 || !(pv_is_w(&pv_weight))) { - LM_ERR("cannot parse count pv or is read-only\n"); + LM_ERR("cannot parse count pv or pv is read-only\n"); return -1; } @@ -220,7 +220,7 @@ static int mod_init(void) LM_DBG("mt_char_list=%s \n", mt_char_list.s); mt_char_table_init(); - /* binding to mysql module */ + /* binding to database module */ if(db_bind_mod(&db_url, &mt_dbf)) { LM_ERR("database module not found\n"); @@ -614,7 +614,7 @@ static int mt_load_db(m_tree_t *pt) if(RES_ROWS(db_res)[0].values[0].type != DB1_STRING || RES_ROWS(db_res)[0].values[1].type != DB1_STRING) { - LM_ERR("wrond column types in db table (%d / %d)\n", + LM_ERR("wrong column types in db table (%d / %d)\n", RES_ROWS(db_res)[0].values[0].type, RES_ROWS(db_res)[0].values[1].type); goto error; @@ -1029,7 +1029,7 @@ void rpc_mtree_match(rpc_t* rpc, void* ctx) if(tr==NULL) { /* no tree with such name*/ - rpc->fault(ctx, 404, "Not found tree"); + rpc->fault(ctx, 404, "Tree not found"); goto error; } @@ -1038,7 +1038,7 @@ void rpc_mtree_match(rpc_t* rpc, void* ctx) LM_DBG("no prefix found in [%.*s] for [%.*s]\n", tname.len, tname.s, tomatch.len, tomatch.s); - rpc->fault(ctx, 404, "Not found"); + rpc->fault(ctx, 404, "Prefix not found"); } error:

2 years, 11 months

git:master:fa7328ae: pv: added {param.in,name[,sep]}

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: fa7328ae48e9596ec30c48f17f353ba10369fb87 URL: https://github.com/kamailio/kamailio/commit/fa7328ae48e9596ec30c48f17f353ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T10:37:38+02:00 pv: added {param.in,name[,sep]} - return 1 if param name is found in the list, 0 if not found --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/fa7328ae48e9596ec30c48f17f353ba… Patch: https://github.com/kamailio/kamailio/commit/fa7328ae48e9596ec30c48f17f353ba…

2 years, 11 months

git:5.5:f481071a: sipdump: fixed typo

by Henning Westerholt

Module: kamailio Branch: 5.5 Commit: f481071a671009f1dcc9fe5d36870e06edc2ec4b URL: https://github.com/kamailio/kamailio/commit/f481071a671009f1dcc9fe5d36870e0… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-06-01T06:32:25Z sipdump: fixed typo (cherry picked from commit 7f226f5b08c93ed0a43113d7947730329ff7db38) --- Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f481071a671009f1dcc9fe5d36870e0… Patch: https://github.com/kamailio/kamailio/commit/f481071a671009f1dcc9fe5d36870e0… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index 54b5c47484..0384458639 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -575,7 +575,7 @@ int pv_parse_sipdump_name(pv_spec_t *sp, str *in) case 8: if(strncmp(in->s, "src_port", 8)==0) sp->pvp.pvn.u.isname.name.n = 8; - if(strncmp(in->s, "dst_port", 8)==0) + else if(strncmp(in->s, "dst_port", 8)==0) sp->pvp.pvn.u.isname.name.n = 9; else goto error; break;

2 years, 11 months

git:master:758c85a0: modules: readme files regenerated - secsipid ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 758c85a09ebb2848d0fd2ee82c48784b8544501a URL: https://github.com/kamailio/kamailio/commit/758c85a09ebb2848d0fd2ee82c48784… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-01T10:01:13+02:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/758c85a09ebb2848d0fd2ee82c48784… Patch: https://github.com/kamailio/kamailio/commit/758c85a09ebb2848d0fd2ee82c48784… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index b42915943b..f4a43fca91 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -100,6 +100,14 @@ Chapter 1. Admin Guide module loads "secsipid_proc.so" in child init callback in order to initialize the "libsecsipid" per child process. + The libsecsipid is provided by secsipidx project: + https://github.com/asipto/secsipidx. + + In case of failure, the functions in this module return error codes + (the negative values) listed in the code of libsecsipid, pretty much at + the top of: + https://github.com/asipto/secsipidx/blob/main/secsipid/secsipid.go. + 2. Dependencies 2.1. Kamailio Modules

2 years, 11 months

git:master:59719a1a: secsipid: note about libsecsipid location and failure return codes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 59719a1ac97337ca7f8b83b0e8a9d63bf6ec0c7e URL: https://github.com/kamailio/kamailio/commit/59719a1ac97337ca7f8b83b0e8a9d63… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T09:51:04+02:00 secsipid: note about libsecsipid location and failure return codes --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/59719a1ac97337ca7f8b83b0e8a9d63… Patch: https://github.com/kamailio/kamailio/commit/59719a1ac97337ca7f8b83b0e8a9d63… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 1e22e371fb..0d7147c35f 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -30,6 +30,17 @@ loads "secsipid_proc.so" in child init callback in order to initialize the "libsecsipid" per child process. </para> + <para> + The libsecsipid is provided by secsipidx project: + <ulink url="https://github.com/asipto/secsipidx">https://github.com/asipto/secsipidx</ulink>. + </para> + <para> + In case of failure, the functions in this module return error codes + (the negative values) listed in the code of libsecsipid, pretty much + at the top of: + <ulink url="https://github.com/asipto/secsipidx/blob/main/secsipid/secsipid.go" + >https://github.com/asipto/secsipidx/blob/main/secsipid/secsipid.go</ulink>. + </para> </section> <section> <title>Dependencies</title>

2 years, 11 months

git:master:bf4ae4b5: modules: readme files regenerated - nathelper ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: bf4ae4b5f4f4b75c534681c520fa1060f234a18e URL: https://github.com/kamailio/kamailio/commit/bf4ae4b5f4f4b75c534681c520fa106… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-01T09:31:20+02:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/bf4ae4b5f4f4b75c534681c520fa106… Patch: https://github.com/kamailio/kamailio/commit/bf4ae4b5f4f4b75c534681c520fa106… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index 0fa395da20..8e5c790d58 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -66,7 +66,7 @@ Ovidiu Sas 5.5. nat_uac_test(flags) 5.6. is_rfc1918(ip_address) 5.7. add_contact_alias([ip_addr, port, proto]) - 5.8. handle_ruri_alias() + 5.8. handle_ruri_alias([mode]) 5.9. set_contact_alias([trim]) 5.10. set_alias_to_pv(target_avp) @@ -157,7 +157,7 @@ Chapter 1. Admin Guide 5.5. nat_uac_test(flags) 5.6. is_rfc1918(ip_address) 5.7. add_contact_alias([ip_addr, port, proto]) - 5.8. handle_ruri_alias() + 5.8. handle_ruri_alias([mode]) 5.9. set_contact_alias([trim]) 5.10. set_alias_to_pv(target_avp) @@ -497,7 +497,7 @@ modparam("nathelper", "nat_addr_mode", 0) 5.5. nat_uac_test(flags) 5.6. is_rfc1918(ip_address) 5.7. add_contact_alias([ip_addr, port, proto]) - 5.8. handle_ruri_alias() + 5.8. handle_ruri_alias([mode]) 5.9. set_contact_alias([trim]) 5.10. set_alias_to_pv(target_avp) @@ -668,7 +668,7 @@ if(is_rfc1918("$rd")) { }; ... -5.8. handle_ruri_alias() +5.8. handle_ruri_alias([mode]) Checks if the Request URI has an “alias” parameter and if so, removes it and sets the “$du” based on its value. Note that this means that @@ -677,6 +677,10 @@ if(is_rfc1918("$rd")) { on a request, make sure that you screen the alias parameter value of Request URI the same way as you would screen the Request URI itself. + The optional parameter mode can be 0 to consume first alias parameter, + otherwise it consumes the last alias parameter. If the parameter mode + is not provided, it consumes the first parameter. + Returns 1 if “;alias” parameter was found and “$du” was set and the “$ru” rewritten, 2 if the alias parameter was not found and nothing was done, or -1 in case of error.

2 years, 11 months

git:master:9c060a66: nathelper: docs for mode parameter for handle_ruri_alias()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9c060a66f83a42c46767f5b28b6a3640764ebb87 URL: https://github.com/kamailio/kamailio/commit/9c060a66f83a42c46767f5b28b6a364… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T09:29:33+02:00 nathelper: docs for mode parameter for handle_ruri_alias() --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9c060a66f83a42c46767f5b28b6a364… Patch: https://github.com/kamailio/kamailio/commit/9c060a66f83a42c46767f5b28b6a364… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index 5096a676d4..39e61e6856 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -794,17 +794,21 @@ if(is_rfc1918("$rd")) { <section id="nathelper.f.handle_ruri_alias"> <title> - <function moreinfo="none">handle_ruri_alias()</function> + <function moreinfo="none">handle_ruri_alias([mode])</function> </title> <para> Checks if the Request URI has an <quote>alias</quote> parameter and if so, removes it and sets the <quote>$du</quote> based - on its value. Note that this means that routing of request is based on - <quote>;alias</quote> parameter value of the Request URI rather than + on its value. Note that this means that routing of request is based on + <quote>;alias</quote> parameter value of the Request URI rather than the Request URI itself. If you call <function>handle_ruri_alias()</function> on a request, make sure that you screen the alias parameter value of - Request URI the same way as you would screen the - Request URI itself. + Request URI the same way as you would screen the Request URI itself. + </para> + <para> + The optional parameter mode can be 0 to consume first alias parameter, + otherwise it consumes the last alias parameter. If the parameter mode is + not provided, it consumes the first parameter. </para> <para> Returns <emphasis>1</emphasis> if <quote>;alias</quote> parameter was

2 years, 11 months

git:master:48520609: nathelper: optional parameter mode for handle_ruri_alias()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 48520609d25dfee6987b16223ed20da507274fdf URL: https://github.com/kamailio/kamailio/commit/48520609d25dfee6987b16223ed20da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T09:29:33+02:00 nathelper: optional parameter mode for handle_ruri_alias() - if not 0, then consume the last alias parameter instead of the first one --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/48520609d25dfee6987b16223ed20da… Patch: https://github.com/kamailio/kamailio/commit/48520609d25dfee6987b16223ed20da…

2 years, 11 months

git:5.4:affe55c2: sipdump: fixed typo

by Henning Westerholt

Module: kamailio Branch: 5.4 Commit: affe55c269f77e280f8400fc6c2a5dee61a2b877 URL: https://github.com/kamailio/kamailio/commit/affe55c269f77e280f8400fc6c2a5de… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-06-01T06:32:05Z sipdump: fixed typo (cherry picked from commit 7f226f5b08c93ed0a43113d7947730329ff7db38) --- Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/affe55c269f77e280f8400fc6c2a5de… Patch: https://github.com/kamailio/kamailio/commit/affe55c269f77e280f8400fc6c2a5de… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index 41550e78f2..553daa01df 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -629,7 +629,7 @@ int pv_parse_sipdump_name(pv_spec_t *sp, str *in) case 8: if(strncmp(in->s, "src_port", 8)==0) sp->pvp.pvn.u.isname.name.n = 8; - if(strncmp(in->s, "dst_port", 8)==0) + else if(strncmp(in->s, "dst_port", 8)==0) sp->pvp.pvn.u.isname.name.n = 9; else goto error; break;

2 years, 11 months

[kamailio/kamailio] sipdump: fixed typo (#2753)

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 - [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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description fixed `4sipdump(src_port)` handling You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2753 -- Commit Summary -- * sipdump: fixed typo -- File Changes -- M src/modules/sipdump/sipdump_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2753.patch https://github.com/kamailio/kamailio/pull/2753.diff -- 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/pull/2753

2 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2021