sr-dev February 2020

sr-dev@lists.kamailio.org

17 participants
324 discussions

git:master:c9e69326: app_lua: utils - increment mapping table size in the tool

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c9e693261fce381a76e12311a9971f6bc413f182 URL: https://github.com/kamailio/kamailio/commit/c9e693261fce381a76e12311a9971f6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-05T09:50:16+01:00 app_lua: utils - increment mapping table size in the tool --- Modified: src/modules/app_lua/utils/app_lua_ctl --- Diff: https://github.com/kamailio/kamailio/commit/c9e693261fce381a76e12311a9971f6… Patch: https://github.com/kamailio/kamailio/commit/c9e693261fce381a76e12311a9971f6… --- diff --git a/src/modules/app_lua/utils/app_lua_ctl b/src/modules/app_lua/utils/app_lua_ctl index 8b9f01514b..53d9fd305c 100755 --- a/src/modules/app_lua/utils/app_lua_ctl +++ b/src/modules/app_lua/utils/app_lua_ctl @@ -2,11 +2,11 @@ # generate the .h file -KEMI_MAX_SIZE=1024 +KEMI_MAX_SIZE=1536 cat > ../app_lua_kemi_export.h <<EOF /** - * Copyright (C) 2016 Daniel-Constantin Mierla (asipto.com) + * Copyright (C) 2016-2020 Daniel-Constantin Mierla (asipto.com) * * This file is part of Kamailio, a free SIP server. * @@ -55,7 +55,7 @@ EOF cat > ../app_lua_kemi_export.c <<EOF /** - * Copyright (C) 2016 Daniel-Constantin Mierla (asipto.com) + * Copyright (C) 2016-2020 Daniel-Constantin Mierla (asipto.com) * * This file is part of Kamailio, a free SIP server. *

4 years, 10 months

git:master:71fe612c: kemix: exported function to get call-id

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 71fe612c7d9a48890095fc2ec3c2496c79d0df83 URL: https://github.com/kamailio/kamailio/commit/71fe612c7d9a48890095fc2ec3c2496… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-05T09:38:43+01:00 kemix: exported function to get call-id --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/71fe612c7d9a48890095fc2ec3c2496… Patch: https://github.com/kamailio/kamailio/commit/71fe612c7d9a48890095fc2ec3c2496… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index 8ec834d365..b5b1047e0b 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -35,6 +35,7 @@ MODULE_VERSION +/* clang-format off */ struct module_exports exports = { "kemix", /* module name */ DEFAULT_DLFLAGS, /* dlopen flags */ @@ -47,6 +48,7 @@ struct module_exports exports = { 0, /* per-child init function */ 0 /* module destroy function */ }; +/* clang-format on */ /** @@ -719,6 +721,28 @@ static int ki_kx_get_timestamp(sip_msg_t *msg) return (int)time(NULL); } +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_callid(sip_msg_t *msg) +{ + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + if(msg==NULL) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_sr_kemi_kx_xval; + } + if(msg->callid==NULL && ((parse_headers(msg, HDR_CALLID_F, 0)==-1) + || (msg->callid==NULL))) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_sr_kemi_kx_xval; + } + + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + _sr_kemi_kx_xval.v.s = msg->callid->body; + return &_sr_kemi_kx_xval; +} + + /** * */ @@ -915,6 +939,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_callid"), + SR_KEMIP_XVAL, ki_kx_get_callid, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

4 years, 10 months

git:master:21904268: modules: readme files regenerated - registrar ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 21904268cfe1b7d485578b4b8b63e64df36ae3be URL: https://github.com/kamailio/kamailio/commit/21904268cfe1b7d485578b4b8b63e64… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-02-04T16:31:15+01:00 modules: readme files regenerated - registrar ... [skip ci] --- Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/21904268cfe1b7d485578b4b8b63e64… Patch: https://github.com/kamailio/kamailio/commit/21904268cfe1b7d485578b4b8b63e64…

4 years, 10 months

git:master:65141b06: registration: docs for min_expires_mode param

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 65141b0603a1a053058da166eba2b6b2a869ed81 URL: https://github.com/kamailio/kamailio/commit/65141b0603a1a053058da166eba2b6b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-04T16:23:03+01:00 registration: docs for min_expires_mode param --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/65141b0603a1a053058da166eba2b6b… Patch: https://github.com/kamailio/kamailio/commit/65141b0603a1a053058da166eba2b6b… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index eb87035f02..4575bbaf9b 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -201,9 +201,10 @@ modparam("registrar", "expires_range", 30) # expires within [0.7*expires .. expi <section id="registrar.p.min_expires"> <title><varname>min_expires</varname> (integer)</title> <para> - The minimum expires value of a <quote>Contact</quote>. Values lower than this - minimum will be automatically set to the minimum. Value 0 disables - the checking. This parameter can be modified via the &kamailio; config framework. + The minimum expires value of a <quote>Contact</quote>. Values lower than this + minimum will be either set to the minimum or 423 response is sent back. + Value 0 disables the checking. This parameter can be modified via the + &kamailio; config framework. </para> <para> <emphasis> @@ -219,6 +220,29 @@ modparam("registrar", "min_expires", 60) </programlisting> </example> </section> + + <section id="registrar.p.min_expires_mode"> + <title><varname>min_expires_mode</varname> (integer)</title> + <para> + Control what to do when expires value in REGISTER request is lower than + min_expires parameter. If set to 0, expires is set to min_expires. If + set to 1, then 423 Interval Too Brief is sent back. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>min_expires_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("registrar", "min_expires_mode", 1) +... +</programlisting> + </example> + </section> + <section id="registrar.p.max_expires"> <title><varname>max_expires</varname> (integer)</title> <para>

4 years, 10 months

git:master:7418625d: registrar: option to send 423 when expires less than min_expires

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7418625d482f924dd19d96c7a7c5f238e67062d6 URL: https://github.com/kamailio/kamailio/commit/7418625d482f924dd19d96c7a7c5f23… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-04T16:23:03+01:00 registrar: option to send 423 when expires less than min_expires - control behaviour via min_expires_mode parameter - default is 0, same behaviour like so far (update expires to min_expires) --- Modified: src/modules/registrar/registrar.c Modified: src/modules/registrar/registrar.h Modified: src/modules/registrar/reply.c Modified: src/modules/registrar/rerrno.h Modified: src/modules/registrar/save.c Modified: src/modules/registrar/sip_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/7418625d482f924dd19d96c7a7c5f23… Patch: https://github.com/kamailio/kamailio/commit/7418625d482f924dd19d96c7a7c5f23…

4 years, 10 months

[kamailio/kamailio] tm: t_continue() - do not print error and return error code (#2212)

by Emmanuel Schmidbauer

- t_continue() - do not print error and return error code. - change func to log INFO so errors are not printed twice (once by tm and once by func call) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2212 -- Commit Summary -- * tm: t_continue - do not print error and return error code -- File Changes -- M src/modules/tm/t_suspend.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2212.patch https://github.com/kamailio/kamailio/pull/2212.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/2212

4 years, 10 months

git:master:a62d4f45: tm: t_continue - do not print error and return error code

by Henning Westerholt

Module: kamailio Branch: master Commit: a62d4f45282b4d216def7de908548ade40a6369e URL: https://github.com/kamailio/kamailio/commit/a62d4f45282b4d216def7de908548ad… Author: Emmanuel Schmidbauer <emmanuel.schmidbauer(a)textnow.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-04T15:49:35+01:00 tm: t_continue - do not print error and return error code --- Modified: src/modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/a62d4f45282b4d216def7de908548ad… Patch: https://github.com/kamailio/kamailio/commit/a62d4f45282b4d216def7de908548ad… --- diff --git a/src/modules/tm/t_suspend.c b/src/modules/tm/t_suspend.c index d2275a6151..3ebef32e2a 100644 --- a/src/modules/tm/t_suspend.c +++ b/src/modules/tm/t_suspend.c @@ -189,7 +189,7 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, if (t_lookup_ident_filter(&t, hash_index, label, 1) < 0) { set_t(backup_T, backup_T_branch); - LM_ERR("active transaction not found\n"); + LM_WARN("active transaction not found\n"); return -1; }

4 years, 10 months

[kamailio/kamailio] ims_reqistrar_scscf: Fix bug with multi-notifications (#2202)

by alexyosifov

- Added more accurate contact comparison when sending NOTIFY to a subscriber.   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2202 -- Commit Summary -- * ims_reqistrar_scscf: Fix bug with multi-notifications -- File Changes -- M src/modules/ims_registrar_scscf/registrar_notify.c (17) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2202.patch https://github.com/kamailio/kamailio/pull/2202.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/2202

4 years, 10 months

git:master:c275110a: ims_reqistrar_scscf: Fix bug with multi-notifications

by Henning Westerholt

Module: kamailio Branch: master Commit: c275110a07fdad8963a08f5ca210f0d5fb717986 URL: https://github.com/kamailio/kamailio/commit/c275110a07fdad8963a08f5ca210f0d… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-03T16:33:16+01:00 ims_reqistrar_scscf: Fix bug with multi-notifications - Added more accurate contact comparison when sending NOTIFY to a subscriber. --- Modified: src/modules/ims_registrar_scscf/registrar_notify.c --- Diff: https://github.com/kamailio/kamailio/commit/c275110a07fdad8963a08f5ca210f0d… Patch: https://github.com/kamailio/kamailio/commit/c275110a07fdad8963a08f5ca210f0d… --- diff --git a/src/modules/ims_registrar_scscf/registrar_notify.c b/src/modules/ims_registrar_scscf/registrar_notify.c index 5f15cf60d7..a40aa1d71f 100644 --- a/src/modules/ims_registrar_scscf/registrar_notify.c +++ b/src/modules/ims_registrar_scscf/registrar_notify.c @@ -1351,6 +1351,21 @@ int aor_to_contact(str* aor, str* contact) { return ret; } +/*! + * \brief Match two contacts with full string - ips, ports and aliases + * \param c1 contact string 1 + * \param c2 contact string 2 + * \return 1 when they match, 0 when they not match + */ +static int contact_match(str* c1, str* c2) { + LM_DBG("Matching full contact string - comparing [%.*s] and [%.*s]\n", c1->len, c1->s, c2->len, c2->s); + if ((c1->len == c2->len) && !memcmp(c1->s, c2->s, c1->len)) { + return 1; + } + + return 0; +} + /*! * \brief Match a contact record to a contact string but only compare the ip port portion * \param ptr contact record @@ -1438,7 +1453,7 @@ void create_notifications(udomain_t* _t, impurecord_t* r_passed, str *presentity //This is a fix to ensure that when a user subscribes a full reg info is only sent to that UE if (event_type == IMS_REGISTRAR_SUBSCRIBE) { - if (contact_port_ip_match(watcher_contact, &s->watcher_contact) && + if (contact_match(watcher_contact, &s->watcher_contact) && (presentity_uri->len == s->presentity_uri.len) && (memcmp(s->presentity_uri.s, presentity_uri->s, presentity_uri->len) == 0)) { LM_DBG("This is a fix to ensure that we only send full reg info XML to the UE that just subscribed.\n"); LM_DBG("About to make new notification! We always increment the local cseq and version before we send a new notification\n");

4 years, 10 months

Kamailio build errors on RHEL7

by CUMHUR KARAHAN

Hi all, I hope this is the right group for my question. It's related to a Kamailio build. I tried to build Kamailio in RHEL7 and I encountered some problems I could fix it locally. I tried to find any email in the user and the developer Kamailio groups by skimming the mails, however there is no clue about it. I need to know your opinion about it. The build error is: ******************************************************************* CC (gcc) [M app_sqlang.so] app_sqlang_api.o CC (gcc) [M app_sqlang.so] app_sqlang_kemi_export.o CC (gcc) [M app_sqlang.so] app_sqlang_mod.o make --no-print-directory -C ./squirrel/squirrel SQMARCH64="-m64" CC_EXTRA_FLAGS="-fPIC" \ OUT="../../libsquirrel.a" sq64 gcc -O2 -m64 -D_SQ64 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c sqapi.cpp sqbaselib.cpp sqfuncstate.cpp sqdebug.cpp sqlexer.cpp sqobject.cpp sqcompiler.cpp sqstate.cpp sqtable.cpp sqmem.cpp sqvm.cpp sqclass.cpp -I../include -I. -Iinclude -fPIC In file included from sqpcheader.h:14:0, from sqapi.cpp:4: /usr/include/c++/4.8.2/new:39:28: fatal error: bits/c++config.h: No such file or directory #include <bits/c++config.h> ^ compilation terminated. ... ****************************************************************** As you can see above, the make command stopped in app_sqlang.so stage due to an including error. These problems are classic for builds on RHEL7 for a lot of tools we need to compile. So, I'm familiar with it and fixed it easily: I just appended "-I/usr/include/c++/4.8.2/i686-redhat-linux/" in "INCZ?= -I$(SQUIRREL)/include -I." row for both ./src/modules/app_sqlang/squirrel/sqstdlib/Makefile and ./src/modules/app_sqlang/squirrel/squirrel/Makefile Then Kamailio build is finished properly. Uname output is here: Linux gearbox07 3.10.0-862.6.3.el7.x86_64 #1 SMP Fri Jun 15 17:57:37 EDT 2018 x86_64 x86_64 x86_64 GNU/Linux My question is that if it's normal or not. Is there anybody who built Kamailio on RHEL7 environment here? Would you help me to understand the situation, please? Thanks... S. Cumhur Karahan [http://s.turkcell.com.tr/SiteAssets/Genel/mail-imza.jpg] <https://tvplus.com.tr/> Bu elektronik posta ve onunla iletilen butun dosyalar sadece gondericisi tarafindan almasi amaclanan yetkili gercek ya da tuzel kisinin kullanimi icindir. Eger soz konusu yetkili alici degilseniz bu elektronik postanin icerigini aciklamaniz, kopyalamaniz, yonlendirmeniz ve kullanmaniz kesinlikle yasaktir ve bu elektronik postayi derhal silmeniz gerekmektedir. TURKCELL bu mesajin icerdigi bilgilerin do?rulu?u veya eksiksiz oldugu konusunda herhangi bir garanti vermemektedir. Bu nedenle bu bilgilerin ne sekilde olursa olsun iceriginden, iletilmesinden, alinmasindan ve saklanmasindan sorumlu degildir. Bu mesajdaki gorusler yalnizca gonderen kisiye aittir ve TURKCELLin goruslerini yansitmayabilir Bu e-posta bilinen butun bilgisayar viruslerine karsi taranmistir. ________________________________ This e-mail and any files transmitted with it are confidential and intended solely for the use of the individual or entity to whom they are addressed. If you are not the intended recipient you are hereby notified that any dissemination, forwarding, copying or use of any of the information is strictly prohibited, and the e-mail should immediately be deleted. TURKCELL makes no warranty as to the accuracy or completeness of any information contained in this message and hereby excludes any liability of any kind for the information contained therein or for the information transmission, reception, storage or use of such in any way whatsoever. The opinions expressed in this message belong to sender alone and may not necessarily reflect the opinions of TURKCELL. This e-mail has been scanned for all known computer viruses.

4 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2020