sr-dev December 2021

sr-dev@lists.kamailio.org

11 participants
270 discussions

git:master:bd42130e: misc/examples: kemi - sanity checks for response in python script

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bd42130e3cfb87856b4b0431de50eccdd4324f9f URL: https://github.com/kamailio/kamailio/commit/bd42130e3cfb87856b4b0431de50ecc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-20T08:55:51+01:00 misc/examples: kemi - sanity checks for response in python script --- Modified: misc/examples/kemi/kamailio-basic-kemi-python.py --- Diff: https://github.com/kamailio/kamailio/commit/bd42130e3cfb87856b4b0431de50ecc… Patch: https://github.com/kamailio/kamailio/commit/bd42130e3cfb87856b4b0431de50ecc… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-python.py b/misc/examples/kemi/kamailio-basic-kemi-python.py index 601daa3687..f62f392594 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-python.py +++ b/misc/examples/kemi/kamailio-basic-kemi-python.py @@ -172,7 +172,7 @@ def ksr_route_reqinit(self, msg): KSR.sl.sl_send_reply(200,"Keepalive") return -255 - if KSR.sanity.sanity_check(1511, 7)<0 : + if KSR.sanity.sanity_check(17895, 7)<0 : KSR.err("Malformed SIP message from " + KSR.pv.get("$si") + ":" + str(KSR.pv.get("$sp")) +"\n") return -255 @@ -372,7 +372,14 @@ def ksr_failure_manage(self, msg): # SIP response handling # -- equivalent of reply_route{} def ksr_reply_route(self, msg): - KSR.info("===== response - from kamailio python script\n") + KSR.dbg("response handling - python script\n") + + if KSR.sanity.sanity_check(17604, 6)<0 : + KSR.err("Malformed SIP response from " + + KSR.pv.get("$si") + ":" + str(KSR.pv.get("$sp")) +"\n") + KSR.set_drop() + return -255 + return 1

2 years, 11 months

[kamailio/kamailio] How to change language in siremis web interface? (Issue #2979)

by Mohammadb06

Hello everyone I’m new in siremis as web interface of kamailio and I immediately need your help,I installed kamailio and siremis and login in siremis web interface,I can work with it but now I have a problem. I want to change menu language there is an option in(setting->translate->manage languages) add my desired language and click save and i see this error: Error message: #2, count(): Parameter must be an array or an object that implements Countable Script name and line number of error: /var/www/siremis-5.3.x/siremis/modules/translation/lib/LangPackCreator.php ![Screenshot from 2021-12-19 12-46-52](https://user-images.githubusercontent.com/84019067/146672269-4734… what’s wrong and what should I do to resolve it? thank you for your help and I am pleased to receive your response -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2979 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/2979(a)github.com>

2 years, 11 months

git:master:99a9f27c: misc/examples: kemi - update lua sample config

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 99a9f27c8d24a06f201b4713f7a2bfeb37092482 URL: https://github.com/kamailio/kamailio/commit/99a9f27c8d24a06f201b4713f7a2bfe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-19T17:55:55+01:00 misc/examples: kemi - update lua sample config --- Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua --- Diff: https://github.com/kamailio/kamailio/commit/99a9f27c8d24a06f201b4713f7a2bfe… Patch: https://github.com/kamailio/kamailio/commit/99a9f27c8d24a06f201b4713f7a2bfe… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-lua.lua b/misc/examples/kemi/kamailio-basic-kemi-lua.lua index a406b6429c..7b1476efb1 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-lua.lua +++ b/misc/examples/kemi/kamailio-basic-kemi-lua.lua @@ -80,18 +80,20 @@ function ksr_request_route() return 1; end + -- handle retransmissions + if not KSR.is_ACK() then + if KSR.tmx.t_precheck_trans()>0 then + KSR.tm.t_check_trans(); + return 1; + end + if KSR.tm.t_check_trans()==0 then return 1 end + end + -- handle requests within SIP dialogs ksr_route_withindlg(); -- -- only initial requests (no To tag) - -- handle retransmissions - if KSR.tmx.t_precheck_trans()>0 then - KSR.tm.t_check_trans(); - return 1; - end - if KSR.tm.t_check_trans()==0 then return 1 end - -- authentication ksr_route_auth(); @@ -158,6 +160,11 @@ end -- Per SIP request initial checks function ksr_route_reqinit() + -- no connect for sending replies + KSR.set_reply_no_connect(); + -- enforce symmetric signaling + -- send back replies to the source address of request + KSR.force_rport(); if not KSR.is_myself_srcip() then local srcip = KSR.kx.get_srcip(); if KSR.htable.sht_match_name("ipban", "eq", srcip) > 0 then @@ -194,7 +201,7 @@ function ksr_route_reqinit() KSR.x.exit(); end - if KSR.sanity.sanity_check(1511, 7)<0 then + if KSR.sanity.sanity_check(17895, 7)<0 then KSR.err("malformed SIP message from " .. KSR.kx.get_srcip() .. ":" .. KSR.kx.get_srcport() .."\n"); KSR.x.exit(); @@ -319,7 +326,6 @@ function ksr_route_natdetect() if not KSR.nathelper then return 1; end - KSR.force_rport(); if KSR.nathelper.nat_uac_test(19)>0 then if KSR.is_REGISTER() then KSR.nathelper.fix_nated_register();

2 years, 11 months

git:master:8e7f2e6a: dlgs: optimize dlgs_init, if/else path are identical

by Henning Westerholt

Module: kamailio Branch: master Commit: 8e7f2e6a158bb2c59600b03be3c7e6eefc416180 URL: https://github.com/kamailio/kamailio/commit/8e7f2e6a158bb2c59600b03be3c7e6e… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-12-17T12:53:37Z dlgs: optimize dlgs_init, if/else path are identical --- Modified: src/modules/dlgs/dlgs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8e7f2e6a158bb2c59600b03be3c7e6e… Patch: https://github.com/kamailio/kamailio/commit/8e7f2e6a158bb2c59600b03be3c7e6e… --- diff --git a/src/modules/dlgs/dlgs_mod.c b/src/modules/dlgs/dlgs_mod.c index 46de9d5c44..a0c7af791e 100644 --- a/src/modules/dlgs/dlgs_mod.c +++ b/src/modules/dlgs/dlgs_mod.c @@ -174,11 +174,7 @@ static int ki_dlgs_init(sip_msg_t *msg, str *src, str *dst, str *data) if(msg->first_line.type == SIP_REQUEST) { rtype = SIP_REQUEST; - if(msg->first_line.u.request.method_value == METHOD_INVITE) { - rmethod = METHOD_INVITE; - } else { - rmethod = msg->first_line.u.request.method_value; - } + rmethod = msg->first_line.u.request.method_value; } else { rtype = SIP_REPLY; if(msg->cseq==NULL && ((parse_headers(msg, HDR_CSEQ_F, 0)==-1) ||

2 years, 11 months

git:master:a993f153: kemix: added KSR.kx.get_rcvaddr_sock() - return local received address in socket format

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a993f1538918c6c31c5da031e1d903250c4a9048 URL: https://github.com/kamailio/kamailio/commit/a993f1538918c6c31c5da031e1d9032… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-17T08:45:11+01:00 kemix: added KSR.kx.get_rcvaddr_sock() - return local received address in socket format --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a993f1538918c6c31c5da031e1d9032… Patch: https://github.com/kamailio/kamailio/commit/a993f1538918c6c31c5da031e1d9032… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index 3fb079349a..80d7807740 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -585,6 +585,38 @@ static sr_kemi_xval_t* ki_kx_get_rcv_sock_name(sip_msg_t *msg) return &_sr_kemi_kx_xval; } +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_rcvaddr_sock(sip_msg_t *msg) +{ + if(msg==NULL) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_sr_kemi_kx_xval; + + } + + if(msg->rcv.bind_address==NULL || msg->rcv.bind_address->sock_str.s==NULL) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_sr_kemi_kx_xval; + } + + if (msg->rcv.bind_address->sock_str.len + 1 >= pv_get_buffer_size()) { + LM_ERR("local buffer size exceeded\n"); + sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_sr_kemi_kx_xval; + } + + _sr_kemi_kx_xval.v.s.s = pv_get_buffer(); + strncpy(_sr_kemi_kx_xval.v.s.s, msg->rcv.bind_address->sock_str.s, + msg->rcv.bind_address->sock_str.len); + _sr_kemi_kx_xval.v.s.len = msg->rcv.bind_address->sock_str.len; + _sr_kemi_kx_xval.v.s.s[_sr_kemi_kx_xval.v.s.len] = '\0'; + + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + return &_sr_kemi_kx_xval; +} + /** * */ @@ -1473,6 +1505,11 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_rcvaddr_sock"), + SR_KEMIP_XVAL, ki_kx_get_rcvaddr_sock, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("kx"), str_init("get_proto"), SR_KEMIP_XVAL, ki_kx_get_proto, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

2 years, 11 months

git:master:d132d595: kemix: rename get_sas() to get_srcaddr_sock()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d132d595c7a75e1206f4d42973966767e305f4fb URL: https://github.com/kamailio/kamailio/commit/d132d595c7a75e1206f4d4297396676… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-17T08:38:25+01:00 kemix: rename get_sas() to get_srcaddr_sock() --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d132d595c7a75e1206f4d4297396676… Patch: https://github.com/kamailio/kamailio/commit/d132d595c7a75e1206f4d4297396676… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index 089ad5e326..3fb079349a 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -1103,7 +1103,7 @@ static sr_kemi_xval_t* ki_kx_get_srcuri(sip_msg_t *msg) /** * */ -static sr_kemi_xval_t* ki_kx_get_sas(sip_msg_t *msg) +static sr_kemi_xval_t* ki_kx_get_srcaddr_sock(sip_msg_t *msg) { str ssock; @@ -1403,8 +1403,8 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("kx"), str_init("get_sas"), - SR_KEMIP_XVAL, ki_kx_get_sas, + { str_init("kx"), str_init("get_srcaddr_sock"), + SR_KEMIP_XVAL, ki_kx_get_srcaddr_sock, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },

2 years, 11 months

git:master:2aae3ee3: pv: added $Ras - return local received address in socket format

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2aae3ee39ea56e349879e25234a75aa79ff4284d URL: https://github.com/kamailio/kamailio/commit/2aae3ee39ea56e349879e25234a75aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-17T08:34:46+01:00 pv: added $Ras - return local received address in socket format --- 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/2aae3ee39ea56e349879e25234a75aa… Patch: https://github.com/kamailio/kamailio/commit/2aae3ee39ea56e349879e25234a75aa… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 9de6bc49af..c34ce5dd31 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -406,6 +406,9 @@ static pv_export_t mod_pvs[] = { {{"rz", (sizeof("rz")-1)}, /* */ PVT_OTHER, pv_get_ruri_attr, 0, 0, 0, pv_init_iname, 5}, + {{"Ras", (sizeof("Ras")-1)}, /* */ + PVT_OTHER, pv_get_rcvaddr_socket, 0, + 0, 0, 0, 0}, {{"Ri", (sizeof("Ri")-1)}, /* */ PVT_OTHER, pv_get_rcvip, 0, 0, 0, 0, 0}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index de5d5b41c8..afccbd4c7f 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -932,6 +932,18 @@ int pv_get_rcvaddr_uri_full(struct sip_msg *msg, pv_param_t *param, return pv_get_rcvaddr_uri_helper(msg, param, 1, res); } +int pv_get_rcvaddr_socket(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + if(msg==NULL) + return -1; + + if(msg->rcv.bind_address==NULL || msg->rcv.bind_address->sock_str.s==NULL) { + return pv_get_null(msg, param, res); + } + return pv_get_strval(msg, param, res, &msg->rcv.bind_address->sock_str); +} + int pv_get_rcv_advertised_ip(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 5e0f6860b5..ffb7d734ba 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -166,6 +166,9 @@ int pv_get_rcvaddr_uri(struct sip_msg *msg, pv_param_t *param, int pv_get_rcvaddr_uri_full(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_rcvaddr_socket(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + int pv_get_rcvsname(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

2 years, 11 months

git:master:bd528072: core: parser sdp - check if delimiter exceeds body limit

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bd5280726a9842b257afabae548853d000ecd249 URL: https://github.com/kamailio/kamailio/commit/bd5280726a9842b257afabae548853d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T10:01:34+01:00 core: parser sdp - check if delimiter exceeds body limit --- Modified: src/core/parser/sdp/sdp.c --- Diff: https://github.com/kamailio/kamailio/commit/bd5280726a9842b257afabae548853d… Patch: https://github.com/kamailio/kamailio/commit/bd5280726a9842b257afabae548853d… --- diff --git a/src/core/parser/sdp/sdp.c b/src/core/parser/sdp/sdp.c index 14779e4d12..c3c94c37da 100644 --- a/src/core/parser/sdp/sdp.c +++ b/src/core/parser/sdp/sdp.c @@ -645,12 +645,16 @@ static int parse_mixed_content(str *mixed_body, str delimiter, sdp_info_t* _sdp) d1p = d2p; if (d1p == NULL || d1p >= bodylimit) break; /* No applications left */ + if(d1p + delimiter.len + 2 > bodylimit) { + LM_ERR("failed parsing [%.*s]\n", mixed_body->len, mixed_body->s); + return -1; + } d2p = find_next_sdp_line_delimiter(d1p, bodylimit, delimiter, bodylimit); /* d2p is text limit for application parsing */ - memset(&hf,0, sizeof(struct hdr_field)); + memset(&hf, 0, sizeof(struct hdr_field)); rest = eat_line(d1p + delimiter.len + 2, d2p - d1p - delimiter.len - 2); if ( rest > d2p ) { - LM_ERR("Unparsable <%.*s>\n", (int)(d2p-d1p), d1p); + LM_ERR("unparsable [%.*s]\n", (int)(d2p-d1p), d1p); return -1; } no_eoh_found = 1;

2 years, 11 months

git:master:03acf834: core: parser - clang format parser_f.c

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 03acf834a19689d6c3efcea93e48985d3e7ffc37 URL: https://github.com/kamailio/kamailio/commit/03acf834a19689d6c3efcea93e48985… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T09:44:54+01:00 core: parser - clang format parser_f.c --- Modified: src/core/parser/parser_f.c --- Diff: https://github.com/kamailio/kamailio/commit/03acf834a19689d6c3efcea93e48985… Patch: https://github.com/kamailio/kamailio/commit/03acf834a19689d6c3efcea93e48985… --- diff --git a/src/core/parser/parser_f.c b/src/core/parser/parser_f.c index f1a532fd6f..c124f68cc5 100644 --- a/src/core/parser/parser_f.c +++ b/src/core/parser/parser_f.c @@ -15,8 +15,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ @@ -28,22 +28,27 @@ */ -#include "parser_f.h" +#include "parser_f.h" #include "../ut.h" /** @brief returns pointer to next line or after the end of buffer */ -char* eat_line(char* buffer, unsigned int len) +char *eat_line(char *buffer, unsigned int len) { - char* nl; + char *nl; /* jku .. replace for search with a library function; not conforming as I do not care about CR */ - nl=(char *)q_memchr( buffer, '\n', len ); - if ( nl ) { - if ( nl + 1 < buffer+len) nl++; - if (( nl+1<buffer+len) && * nl=='\r') nl++; - } else nl=buffer+len; + nl = (char *)q_memchr(buffer, '\n', len); + if(nl) { + if(nl + 1 < buffer + len) { + nl++; + } + if((nl + 1 < buffer + len) && *nl == '\r') { + nl++; + } + } else { + nl = buffer + len; + } return nl; } -

2 years, 11 months

git:5.5:3cd4676c: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.5 Commit: 3cd4676ce5071f83fccc0e16946c9e0376b018f6 URL: https://github.com/kamailio/kamailio/commit/3cd4676ce5071f83fccc0e16946c9e0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-12-16T09:32:07+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/3cd4676ce5071f83fccc0e16946c9e0… Patch: https://github.com/kamailio/kamailio/commit/3cd4676ce5071f83fccc0e16946c9e0… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index 86dde8f336..2bba8c8115 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -238,6 +238,14 @@ Chapter 1. Admin Guide module that uses libssl (OpenSSL library). A safe option is to have the tls module loaded first (be in the first "loadmodule" in Kamailio.cfg). + IMPORTANT: using this module compiled with newer versions of libssl + (e.g., v1.1+) may require Kamailio to be started with --atexit=no + command line parameters to avoid calling C atexit callbacks inside the + process ending during daemonize procedure as well as during shut down, + which can lead to crashes because it destroys and then accesses shared + memory. For example, such case has been reported for Ubuntu 20.04 or + RedHat 8. + 2. Quick Start The default kamailio.cfg file has basic tls support included, it has to

2 years, 11 months

← Newer
1
...
11
12
13
14
15
16
17
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2021