sr-dev December 2020

sr-dev@lists.kamailio.org

18 participants
206 discussions

git:master:bdf92b1e: pv: removed implementation of $env(name)
by Daniel-Constantin Mierla 22 Dec '20

22 Dec '20

Module: kamailio Branch: master Commit: bdf92b1eee120d4dce22079faf4d4cf73133c3d7 URL: https://github.com/kamailio/kamailio/commit/bdf92b1eee120d4dce22079faf4d4cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-22T19:44:47+01:00 pv: removed implementation of $env(name) --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/bdf92b1eee120d4dce22079faf4d4cf… Patch: https://github.com/kamailio/kamailio/commit/bdf92b1eee120d4dce22079faf4d4cf… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 67f42c227d..c21298d752 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -227,8 +227,6 @@ static pv_export_t mod_pvs[] = { {{"duri", (sizeof("duri")-1)}, /* */ PVT_DSTURI, pv_get_dsturi, pv_set_dsturi, 0, 0, 0, 0}, - {{"env", (sizeof("env")-1)}, PVT_OTHER, pv_get_env, 0, - pv_parse_env_name, 0, 0, 0}, {{"err.class", (sizeof("err.class")-1)}, /* */ PVT_OTHER, pv_get_errinfo_attr, 0, 0, 0, 0, 0}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 681e6beab1..ed9abe7cce 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3737,43 +3737,6 @@ int pv_get_ksr_attrs(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) } } -int pv_parse_env_name(pv_spec_p sp, str *in) -{ - char *csname; - - if(in->s==NULL || in->len<=0) - return -1; - - csname = pkg_malloc(in->len + 1); - - if (csname == NULL) { - LM_ERR("no more pkg memory"); - return -1; - } - - memcpy(csname, in->s, in->len); - csname[in->len] = '\0'; - - sp->pvp.pvn.u.dname = (void*)csname; - sp->pvp.pvn.type = PV_NAME_OTHER; - return 0; -} - -int pv_get_env(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) -{ - char *val; - char *csname = (char *) param->pvn.u.dname; - - if (csname) { - val = getenv(csname); - - if (val) { - return pv_get_strzval(msg, param, res, val); - } - } - return pv_get_null(msg, param, res); -} - int pv_parse_def_name(pv_spec_p sp, str *in) { if (in == NULL || in->s == NULL || sp == NULL) { diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index afcaa1f84a..02f1141fdf 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -385,10 +385,6 @@ int pv_parse_msg_attrs_name(pv_spec_p sp, str *in); int pv_get_msg_attrs(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); -int pv_parse_env_name(pv_spec_p sp, str *in); - -int pv_get_env(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); - int pv_parse_ksr_attrs_name(pv_spec_p sp, str *in); int pv_get_ksr_attrs(sip_msg_t *msg, pv_param_t *param,

1 0

git:master:62a08366: core: pv api - relocated implementation of $env(name)
by Daniel-Constantin Mierla 22 Dec '20

22 Dec '20

Module: kamailio Branch: master Commit: 62a08366b4424578ffd9a9f42855ce5f4c710668 URL: https://github.com/kamailio/kamailio/commit/62a08366b4424578ffd9a9f42855ce5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-22T19:44:16+01:00 core: pv api - relocated implementation of $env(name) --- Modified: src/core/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/62a08366b4424578ffd9a9f42855ce5… Patch: https://github.com/kamailio/kamailio/commit/62a08366b4424578ffd9a9f42855ce5… --- diff --git a/src/core/pv_core.c b/src/core/pv_core.c index 3279a0a22a..0998aa18a8 100644 --- a/src/core/pv_core.c +++ b/src/core/pv_core.c @@ -24,17 +24,25 @@ * Module: \ref core */ +#include <stdlib.h> + #include "pv_core.h" #include "pvar.h" #include "str.h" +#include "mem/pkg.h" static int pv_get_retcode(struct sip_msg*, pv_param_t*, pv_value_t*); +static int pv_parse_env_name(pv_spec_p sp, str *in); +static int pv_get_env(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); + static pv_export_t core_pvs[] = { /* return code, various synonims */ { STR_STATIC_INIT("?"), PVT_OTHER, pv_get_retcode, 0, 0, 0, 0, 0 }, { STR_STATIC_INIT("rc"), PVT_OTHER, pv_get_retcode, 0, 0, 0, 0, 0 }, { STR_STATIC_INIT("retcode"), PVT_OTHER, pv_get_retcode, 0, 0, 0, 0, 0 }, + { STR_STATIC_INIT("env"), PVT_OTHER, pv_get_env, 0, + pv_parse_env_name, 0, 0, 0}, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; @@ -52,6 +60,43 @@ static int pv_get_retcode(struct sip_msg* msg, pv_param_t* p, pv_value_t* res) } +static int pv_parse_env_name(pv_spec_p sp, str *in) +{ + char *csname; + + if(in->s==NULL || in->len<=0) + return -1; + + csname = pkg_malloc(in->len + 1); + + if (csname == NULL) { + LM_ERR("no more pkg memory"); + return -1; + } + + memcpy(csname, in->s, in->len); + csname[in->len] = '\0'; + + sp->pvp.pvn.u.dname = (void*)csname; + sp->pvp.pvn.type = PV_NAME_OTHER; + return 0; +} + +static int pv_get_env(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + char *val; + char *csname = (char *) param->pvn.u.dname; + + if (csname) { + val = getenv(csname); + + if (val) { + return pv_get_strzval(msg, param, res, val); + } + } + return pv_get_null(msg, param, res); +} + /** * register built-in core pvars.

1 0

git:master:924125d8: nathelper: refine log statement, remove redundant info
by Henning Westerholt 22 Dec '20

22 Dec '20

Module: kamailio Branch: master Commit: 924125d833998e09c9d73a382225430b9ac0ef16 URL: https://github.com/kamailio/kamailio/commit/924125d833998e09c9d73a382225430… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-12-22T13:47:15Z nathelper: refine log statement, remove redundant info --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/924125d833998e09c9d73a382225430… Patch: https://github.com/kamailio/kamailio/commit/924125d833998e09c9d73a382225430… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 12206ba152..b883b52472 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -2154,8 +2154,7 @@ static void nh_timer(unsigned int ticks, void *timer_idx) } else if(path.len && udpping_from_path) { path_ip_str = extract_last_path_ip(path); if(path_ip_str == NULL) { - LM_ERR("ERROR:nathelper:nh_timer: unable to parse path from " - "location\n"); + LM_ERR("unable to parse path from location\n"); continue; } if(get_natping_socket(path_ip_str, &path_ip, &path_port)) {

1 0

Python 2 EoL and app_python in > 5.4?
by Anthony Alba 22 Dec '20

22 Dec '20

Hi devs, Background: I am the porter of app_python.so to Python 3 (app_python3.so) nearly 3 years ago. As we all know Python 2 reached EoL almost one year ago, it may be timely to discuss the issue of when(if) to remove the Python 2 module app_python.so in kamailio. 1. Debian: just over a year ago: https://lists.debian.org/debian-devel-announce/2019/11/msg00000.html 2. Python 2 EOL: https://www.infoworld.com/article/3365221/python-2-end-of-life-how-to-survi… 3. Debian Bullseye (not yet released): https://wiki.debian.org/Python/2Removal "; "port upstream package to python3 (or file upstream bug): make sure package doesn't call python at build- or compile time (as there won't be a python package and no python command in bullseye, only python3.) " 4. Debian Buster/Stretch - used in CI by the (Sipwise I think) builders. EoL LTS ~2022 for Stretch, ~2024 for Buster. https://wiki.debian.org/DebianReleases Discussion: should app_python be dropped for Kamailio 5.5.x or 5.6.x? What are your thoughts? Cheers Anthony

2 1

Kamailio not under GPL2
by tom Gross 22 Dec '20

22 Dec '20

Hallo I hope I am writing to the right mailing address. We are interested in Kamailio source code but We would like to purchase Kamailio (for a fee) that is not under the GPL2 category . Do you offer that? Thank you Tom <https://docs.google.com/uc?export=download&id=1zTACqAqtPFWXnR_r-T8kaF4TaJpg AJ7l&revid=0Bx0wng2lOd16cCtVL1kyWWZmdHpGdktTbXFpNHJmQTRzWm9JPQ> Tom Gross Director of Operations and Corporate +972-52-3922304 <http://www.flolive.net/> www.flolive.net The information contained in this e-mail message is intended for the use of individual or entity named above and may include information that is confidential and proprietary. Please keep the content of this email in strict confidence. If you are not the intended recipient, please immediately notify us by return e-mail, delete this e-mail and destroy any copies. -- *The information contained in this e-mail message is intended for the use of individual or entity named above and may include information that is confidential and proprietary. Please keep the content of this email in strict confidence. If you are not the intended recipient, please immediately notify us by return e-mail, delete this e-mail and destroy any copies.*

2 1

Kamailio v5.3.8 released
by Henning Westerholt 21 Dec '20

21 Dec '20

Hello, Kamailio SIP Server v5.3.8 stable has been released. This is a maintenance release of the previous stable branch (5.3), that includes fixes since the release of v5.3.7. There are no change to database schema or configuration language structure that you have to do on previous installations of v5.3.x. Deployments running previous v5.3.x versions are recommended to be upgraded to v5.3.8. For more details about version 5.3.8 (including links and guidelines to download the tar file or from GIT repository), visit: https://www.kamailio.org/w/2020/12/kamailio-v5-3-8-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com<https://gilawa.com/>

1 0

git:5.3:a5815595: Changelog: update content for 5.3.8 release
by Henning Westerholt 21 Dec '20

21 Dec '20

Module: kamailio Branch: 5.3 Commit: a5815595511d298a9948027fb0d9410a2fd65e66 URL: https://github.com/kamailio/kamailio/commit/a5815595511d298a9948027fb0d9410… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-12-21T17:06:38Z Changelog: update content for 5.3.8 release --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/a5815595511d298a9948027fb0d9410… Patch: https://github.com/kamailio/kamailio/commit/a5815595511d298a9948027fb0d9410…

1 0

git:5.3:cd35b944: pkg: set version to 5.3.8 for packaging files
by Henning Westerholt 21 Dec '20

21 Dec '20

Module: kamailio Branch: 5.3 Commit: cd35b9440e3bf1f4509cc3d481846addf9236774 URL: https://github.com/kamailio/kamailio/commit/cd35b9440e3bf1f4509cc3d481846ad… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-12-21T17:02:17Z pkg: set version to 5.3.8 for packaging files --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/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 Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/cd35b9440e3bf1f4509cc3d481846ad… Patch: https://github.com/kamailio/kamailio/commit/cd35b9440e3bf1f4509cc3d481846ad…

1 0

git:5.3:05d4d530: Makefile.defs: set version to 5.3.8
by Henning Westerholt 21 Dec '20

21 Dec '20

Module: kamailio Branch: 5.3 Commit: 05d4d530d56ddad05103b222d734e0429ca3457b URL: https://github.com/kamailio/kamailio/commit/05d4d530d56ddad05103b222d734e04… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-12-21T17:02:17Z Makefile.defs: set version to 5.3.8 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/05d4d530d56ddad05103b222d734e04… Patch: https://github.com/kamailio/kamailio/commit/05d4d530d56ddad05103b222d734e04… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index d0d1e46338..83e48e6f0d 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 3 -SUBLEVEL = 7 +SUBLEVEL = 8 EXTRAVERSION = # memory manager switcher

1 0

git:5.3:c6718920: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 21 Dec '20

21 Dec '20

Module: kamailio Branch: 5.3 Commit: c67189205cad464cb8480c9883cfaa6531062fac URL: https://github.com/kamailio/kamailio/commit/c67189205cad464cb8480c9883cfaa6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-12-21T16:46:54+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/http_client/README Modified: src/modules/lost/README --- Diff: https://github.com/kamailio/kamailio/commit/c67189205cad464cb8480c9883cfaa6… Patch: https://github.com/kamailio/kamailio/commit/c67189205cad464cb8480c9883cfaa6… --- diff --git a/src/modules/http_client/README b/src/modules/http_client/README index 465f6055af..0be13f07c5 100644 --- a/src/modules/http_client/README +++ b/src/modules/http_client/README @@ -90,7 +90,7 @@ Hugh Waite 2. Developer Guide - 1. + 1. Introduction 2. Available Functions 2.1. int http_connect(msg, connection, url, result, @@ -855,7 +855,7 @@ Chapter 2. Developer Guide Table of Contents - 1. + 1. Introduction 2. Available Functions 2.1. int http_connect(msg, connection, url, result, content_type, @@ -865,6 +865,8 @@ Chapter 2. Developer Guide 2.3. int http_query(msg, url, dest, post) 2.4. http_get_content_type(str connection) +1. Introduction + This module provides a set of API functions that other modules can use in order to integrate with HTTP services. diff --git a/src/modules/lost/README b/src/modules/lost/README index 357c41d388..ae24ac2676 100644 --- a/src/modules/lost/README +++ b/src/modules/lost/README @@ -156,7 +156,7 @@ $var(err)"); xlog("L_INFO", "HELD locationRequest: Result code $var(res)\nUrl: $var(url)\n$va r(pidf)"); ... -$var(res) = lost_held_query("heldsrv", "$var(pidf)", "$var(url)"", "$var(err)"); +$var(res) = lost_held_query("heldsrv", "$var(pidf)", "$var(url)", "$var(err)"); xlog("L_INFO", "HELD locationRequest: Result code $var(res)\nUrl: $var(url)\n$va r(pidf)\n"); ...

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
21
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2020