sr-dev April 2021

sr-dev@lists.kamailio.org

14 participants
302 discussions

git:master:b7f753dd: core: parse uri - check for invalid port values

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b7f753ddc727e1d7ab42e7abe607059e03976f8d URL: https://github.com/kamailio/kamailio/commit/b7f753ddc727e1d7ab42e7abe607059… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-03T07:55:11+02:00 core: parse uri - check for invalid port values --- Modified: src/core/config.h Modified: src/core/parser/parse_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/b7f753ddc727e1d7ab42e7abe607059… Patch: https://github.com/kamailio/kamailio/commit/b7f753ddc727e1d7ab42e7abe607059… --- diff --git a/src/core/config.h b/src/core/config.h index e54413b5bc..e012e98edf 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -96,6 +96,7 @@ #define MY_BRANCH ";branch=" #define MY_BRANCH_LEN (sizeof(MY_BRANCH) - 1) +#define MAX_PORT_VAL 65535 #define MAX_PORT_LEN 7 /* ':' + max 5 letters + \0 */ #define CRLF "\r\n" diff --git a/src/core/parser/parse_uri.c b/src/core/parser/parse_uri.c index 2c24054d2c..19f6f2e02a 100644 --- a/src/core/parser/parse_uri.c +++ b/src/core/parser/parse_uri.c @@ -143,6 +143,9 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) #define case_port( ch, var) \ case ch: \ (var)=(var)*10+ch-'0'; \ + if((var) > MAX_PORT_VAL) { \ + goto error_bad_port; \ + }\ break #define still_at_user \

3 years, 1 month

[kamailio/kamailio] siptrace: duplicate_uri with multiple values (#2693)

by sergey-safarov

### Description As admin, I want check TLS encrypted call signaling on local Kamailio. To do this I can use [this instruction](https://voipembedded.wordpress.com/2021/03/22/troubleshooting-…. Here used `siptrace` module. But at the same time, I need to send the same call signaling to the company `Homer` server. So I need to send a copy of the call signaling in two directions. Could you add the ability to allow specify multiple values in `duplicate_uri` param like. ``` modparam("siptrace", "duplicate_uri", "<sip:127.0.0.1:9060>,<sip:homer.example.com:9060>") ``` -- 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/2693

3 years, 1 month

git:master:9413fc63: modules: readme files regenerated - topos ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 9413fc6399d7e9b791ed0cb53172ab5fd887f0f6 URL: https://github.com/kamailio/kamailio/commit/9413fc6399d7e9b791ed0cb53172ab5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-02T10:16:13+02:00 modules: readme files regenerated - topos ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/9413fc6399d7e9b791ed0cb53172ab5… Patch: https://github.com/kamailio/kamailio/commit/9413fc6399d7e9b791ed0cb53172ab5… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index 656a9315f2..783b57ba57 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -46,8 +46,8 @@ Frederic Gaisnon 3.13. xavu_cfg (str) 3.14. xavu_filed_a_contact (str) 3.15. xavu_filed_b_contact (str) - 3.16. rr_update (int) - 3.17. xavu_field_contact_host (str) + 3.16. xavu_field_contact_host (str) + 3.17. rr_update (int) 3.18. context (str) 4. Functions @@ -75,11 +75,11 @@ Frederic Gaisnon 1.10. Set contact_host parameter 1.11. Set contact_mode parameter 1.12. Set cparam_name parameter - 1.13. Set xavu_filed_a_contact parameter + 1.13. Set xavu_cfg parameter 1.14. Set xavu_filed_a_contact parameter 1.15. Set xavu_filed_b_contact parameter - 1.16. Set rr_update parameter - 1.17. Set xavu_field_contact_host parameter + 1.16. Set xavu_field_contact_host parameter + 1.17. Set rr_update parameter 1.18. Set context parameter 1.19. tps_set_context usage 1.20. Usage of event_route[topos:msg-outgoing] @@ -114,8 +114,8 @@ Chapter 1. Admin Guide 3.13. xavu_cfg (str) 3.14. xavu_filed_a_contact (str) 3.15. xavu_filed_b_contact (str) - 3.16. rr_update (int) - 3.17. xavu_field_contact_host (str) + 3.16. xavu_field_contact_host (str) + 3.17. rr_update (int) 3.18. context (str) 4. Functions @@ -184,8 +184,8 @@ Chapter 1. Admin Guide 3.13. xavu_cfg (str) 3.14. xavu_filed_a_contact (str) 3.15. xavu_filed_b_contact (str) - 3.16. rr_update (int) - 3.17. xavu_field_contact_host (str) + 3.16. xavu_field_contact_host (str) + 3.17. rr_update (int) 3.18. context (str) 3.1. storage (str) @@ -385,7 +385,7 @@ modparam("topos", "cparam_name", "xyz") Default value is “NULL” (disabled). - Example 1.13. Set xavu_filed_a_contact parameter + Example 1.13. Set xavu_cfg parameter ... modparam("topos", "xavu_cfg", "_tps_") modparam("topos", "xavu_filed_a_contact", "a_contact") @@ -426,19 +426,7 @@ modparam("topos", "xavu_filed_b_contact", "b_contact") ... -3.16. rr_update (int) - - If set to 1, topos module will track and update record route changes on - re-invite. - - Default value is 0 (do not update record route changes within dialog). - - Example 1.16. Set rr_update parameter -... -modparam("topos", "rr_update", 1) -... - -3.17. xavu_field_contact_host (str) +3.16. xavu_field_contact_host (str) Control from where to take the host part of the Contact header added by topos. This parameter allows to take the value from an XAVU during @@ -450,7 +438,7 @@ modparam("topos", "rr_update", 1) Default value is empty, not set. - Example 1.17. Set xavu_field_contact_host parameter + Example 1.16. Set xavu_field_contact_host parameter ... modparam("topos", "xavu_cfg", "_tps_") modparam("topos", "xavu_contact_host", "contact_host") @@ -458,6 +446,18 @@ modparam("topos", "xavu_contact_host", "contact_host") $xavu(_tps_=>contact_host) = "kamailio.org"; ... +3.17. rr_update (int) + + If set to 1, topos module will track and update record route changes on + re-invite. + + Default value is 0 (do not update record route changes within dialog). + + Example 1.17. Set rr_update parameter +... +modparam("topos", "rr_update", 1) +... + 3.18. context (str) Set the global context for topos instance.

3 years, 1 month

git:master:a877e707: topos: docs - fixed title for xavu_cfg example [skip ci]

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a877e707c7768307886c67a8c64a5c524eac06f4 URL: https://github.com/kamailio/kamailio/commit/a877e707c7768307886c67a8c64a5c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-02T10:11:01+02:00 topos: docs - fixed title for xavu_cfg example [skip ci] - groupped xavu parameters --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a877e707c7768307886c67a8c64a5c5… Patch: https://github.com/kamailio/kamailio/commit/a877e707c7768307886c67a8c64a5c5… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index ba622f13a6..b13902929f 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -393,7 +393,7 @@ modparam("topos", "cparam_name", "xyz") </emphasis> </para> <example> - <title>Set <varname>xavu_filed_a_contact</varname> parameter</title> + <title>Set <varname>xavu_cfg</varname> parameter</title> <programlisting format="linespecific"> ... modparam("topos", "xavu_cfg", "_tps_") @@ -449,26 +449,6 @@ modparam("topos", "xavu_filed_b_contact", "b_contact") ... $xavu(_tps_=>b_contact) = "..."; -... -</programlisting> - </example> - </section> - <section id="topos.p.rr_update"> - <title><varname>rr_update</varname> (int)</title> - <para> - If set to 1, topos module will track and update record - route changes on re-invite. - </para> - <para> - <emphasis> - Default value is 0 (do not update record route changes within dialog). - </emphasis> - </para> - <example> - <title>Set <varname>rr_update</varname> parameter</title> - <programlisting format="linespecific"> -... -modparam("topos", "rr_update", 1) ... </programlisting> </example> @@ -500,6 +480,26 @@ modparam("topos", "xavu_contact_host", "contact_host") ... $xavu(_tps_=>contact_host) = "kamailio.org"; ... +</programlisting> + </example> + </section> + <section id="topos.p.rr_update"> + <title><varname>rr_update</varname> (int)</title> + <para> + If set to 1, topos module will track and update record + route changes on re-invite. + </para> + <para> + <emphasis> + Default value is 0 (do not update record route changes within dialog). + </emphasis> + </para> + <example> + <title>Set <varname>rr_update</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("topos", "rr_update", 1) +... </programlisting> </example> </section>

3 years, 1 month

git:master:f95ede23: dmq: access val after being tested for null

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f95ede239474f8c3b901f83e7eb34cbfa8f0e0fd URL: https://github.com/kamailio/kamailio/commit/f95ede239474f8c3b901f83e7eb34cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-02T10:04:10+02:00 dmq: access val after being tested for null --- Modified: src/modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/f95ede239474f8c3b901f83e7eb34cb… Patch: https://github.com/kamailio/kamailio/commit/f95ede239474f8c3b901f83e7eb34cb… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index 7d343b193b..79cc8ccbc9 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -365,14 +365,14 @@ static void destroy(void) static int dmq_add_notification_address(modparam_t type, void * val) { str tmp_str; - tmp_str.s = ((str*) val)->s; - tmp_str.len = ((str*) val)->len; int total_list = 0; /* not used */ if(val==NULL) { LM_ERR("invalid notification address parameter value\n"); return -1; } + tmp_str.s = ((str*) val)->s; + tmp_str.len = ((str*) val)->len; if(parse_uri(tmp_str.s, tmp_str.len, &dmq_notification_uri) < 0) { LM_ERR("could not parse notification address\n"); return -1;

3 years, 1 month

git:master:d4e31e6a: core: parse uri - cast to unsigned for left shifting

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d4e31e6ae494836c49e50f463517a576b18c5611 URL: https://github.com/kamailio/kamailio/commit/d4e31e6ae494836c49e50f463517a57… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-02T09:38:55+02:00 core: parse uri - cast to unsigned for left shifting --- Modified: src/core/parser/parse_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/d4e31e6ae494836c49e50f463517a57… Patch: https://github.com/kamailio/kamailio/commit/d4e31e6ae494836c49e50f463517a57… --- diff --git a/src/core/parser/parse_uri.c b/src/core/parser/parse_uri.c index ec39ea7cf2..2c24054d2c 100644 --- a/src/core/parser/parse_uri.c +++ b/src/core/parser/parse_uri.c @@ -26,6 +26,8 @@ */ +#include <stdint.h> + #include "../globals.h" #include "parse_uri.h" #include <string.h> @@ -124,7 +126,7 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) char* pass; int found_user; int error_headers; - unsigned int scheme; + uint32_t scheme; uri_type backup_urit; uri_flags backup_urif; @@ -386,9 +388,10 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) port_no=0; state=URI_INIT; memset(uri, 0, sizeof(struct sip_uri)); /* zero it all, just to be sure*/ - /*look for sip:, sips: ,tel: or urn:*/ + /*look for sip:, sips:, tel: or urn:*/ if (len<5) goto error_too_short; - scheme=buf[0]+(buf[1]<<8)+(buf[2]<<16)+(buf[3]<<24); + scheme=((uint32_t)buf[0]) + (((uint32_t)buf[1])<<8) + + (((uint32_t)buf[2])<<16) + (((uint32_t)buf[3])<<24); scheme|=0x20202020; if (scheme==SIP_SCH){ uri->type=SIP_URI_T;

3 years, 1 month

[CRON] Still Failing: dbank888/kamailio#130 (master - 491e19e)

by Travis CI

Build Update for dbank888/kamailio ------------------------------------- Build: #130 Status: Still Failing Duration: 6 mins and 17 secs Commit: 491e19e (master) Author: Daniel-Constantin Mierla Message: tls: update to default session id value to reflect major version View the changeset: https://github.com/dbank888/kamailio/compare/9e13c9512b48ab9522f508465c6031… View the full build log and details: https://travis-ci.org/github/dbank888/kamailio/builds/765550934?utm_medium=… -- You can unsubscribe from build emails from the dbank888/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=21197393&u…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

3 years, 1 month

git:master:f21ad75e: pkg/kamailio/deb: set version 5.5.0~pre0

by Victor Seva

Module: kamailio Branch: master Commit: f21ad75e1f86f353cc9cdf6d21c9ee2b74e9eb6c URL: https://github.com/kamailio/kamailio/commit/f21ad75e1f86f353cc9cdf6d21c9ee2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-04-01T19:07:42+02:00 pkg/kamailio/deb: set version 5.5.0~pre0 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/f21ad75e1f86f353cc9cdf6d21c9ee2… Patch: https://github.com/kamailio/kamailio/commit/f21ad75e1f86f353cc9cdf6d21c9ee2…

3 years, 1 month

git:master:a07de1e2: modules: readme files regenerated - acc_json ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: a07de1e2b892537c46879b4d744bff86af24e5e8 URL: https://github.com/kamailio/kamailio/commit/a07de1e2b892537c46879b4d744bff8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-01T17:01:14+02:00 modules: readme files regenerated - acc_json ... [skip ci] --- Modified: src/modules/acc_json/README --- Diff: https://github.com/kamailio/kamailio/commit/a07de1e2b892537c46879b4d744bff8… Patch: https://github.com/kamailio/kamailio/commit/a07de1e2b892537c46879b4d744bff8…

3 years, 1 month

[kamailio/kamailio] acc_json: param to accept pre-encoded json values (#2699)

by Julien Chavanton

#### 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] New feature (non-breaking change which adds new functionality) #### Description New parameter to add json in an accounting/CDR field and prevent unwanted json escaping. Example: ``` modparam("acc_json", "acc_extra", "json_data=$avp(json_data);") modparam("acc_json", "acc_json_pre_encoded_prefix", "json_") ... $avp(json_data) = '{"b":2, "c":3}'; ... ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2699 -- Commit Summary -- * acc_json: param to accept pre-encoded json values -- File Changes -- M src/modules/acc_json/acc_json_mod.c (55) M src/modules/acc_json/doc/acc_json_admin.xml (43) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2699.patch https://github.com/kamailio/kamailio/pull/2699.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/2699

3 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2021