sr-dev April 2020

sr-dev@lists.kamailio.org

33 participants
421 discussions

git:master:046bba65: app_python3: for now return none for array and map kemi results
by Daniel-Constantin Mierla 15 Apr '20

15 Apr '20

Module: kamailio Branch: master Commit: 046bba65da26a4b30cb5965d6d6ae28320cc8a54 URL: https://github.com/kamailio/kamailio/commit/046bba65da26a4b30cb5965d6d6ae28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-15T11:45:50+02:00 app_python3: for now return none for array and map kemi results - free result structure --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/046bba65da26a4b30cb5965d6d6ae28… Patch: https://github.com/kamailio/kamailio/commit/046bba65da26a4b30cb5965d6d6ae28… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 7769046d2d..2c4d73eb72 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -184,6 +184,14 @@ PyObject *sr_kemi_apy_return_xval(sr_kemi_t *ket, sr_kemi_xval_t *rx) } else { return sr_kemi_apy_return_false(); } + case SR_KEMIP_ARRAY: + LM_ERR("unsupported return type: array\n"); + sr_kemi_xval_free(rx); + return sr_apy_kemi_return_none(); + case SR_KEMIP_DICT: + LM_ERR("unsupported return type: map\n"); + sr_kemi_xval_free(rx); + return sr_apy_kemi_return_none(); case SR_KEMIP_XVAL: /* unknown content - return false */ return sr_kemi_apy_return_false();

1 0

git:master:82279ebd: app_python: for now return none for array and map kemi results
by Daniel-Constantin Mierla 15 Apr '20

15 Apr '20

Module: kamailio Branch: master Commit: 82279ebd3a634911277e48523a56f93473baca2c URL: https://github.com/kamailio/kamailio/commit/82279ebd3a634911277e48523a56f93… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-15T11:44:44+02:00 app_python: for now return none for array and map kemi results - free result structure --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/82279ebd3a634911277e48523a56f93… Patch: https://github.com/kamailio/kamailio/commit/82279ebd3a634911277e48523a56f93… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index 96fa2cf024..5d1489e201 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -181,6 +181,12 @@ PyObject *sr_kemi_apy_return_xval(sr_kemi_t *ket, sr_kemi_xval_t *rx) } else { return sr_kemi_apy_return_false(); } + case SR_KEMIP_ARRAY: + LM_ERR("unsupported return type: array\n"); + sr_kemi_xval_free(rx); + return sr_apy_kemi_return_none(); + case SR_KEMIP_DICT: + LM_ERR("unsupported return type: map\n"); case SR_KEMIP_XVAL: /* unknown content - return false */ return sr_kemi_apy_return_false();

1 0

git:master:7f51bc70: pv: add KEMI functions pvx.xavp_get_keys and pvx.xavp_getd
by Victor Seva 15 Apr '20

15 Apr '20

Module: kamailio Branch: master Commit: 7f51bc7080bc5c46fbc21148818b3cc30c05d59f URL: https://github.com/kamailio/kamailio/commit/7f51bc7080bc5c46fbc21148818b3cc… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-04-15T11:12:30+02:00 pv: add KEMI functions pvx.xavp_get_keys and pvx.xavp_getd --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/7f51bc7080bc5c46fbc21148818b3cc… Patch: https://github.com/kamailio/kamailio/commit/7f51bc7080bc5c46fbc21148818b3cc…

1 0

[kamailio/kamailio] pv: add xavp KEMI functions (#2285)
by Victor Seva 15 Apr '20

15 Apr '20

## 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] 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 - [x] Related to https://lists.kamailio.org/pipermail/sr-dev/2020-April/056481.html #### Description Add functions: __pvx.xavp_get_keys__(_rname_): get an array with the keys used in `$xavp(rname)` __pvx.xavp_getd__(_rname_): get a dictionary with `$xavp(rname)` content __pvx.xavp_getd__(_rname_, _idx_): get a dictionary with the `$xavp(rname[idx])` content You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2285 -- Commit Summary -- * pv: add KEMI functions pvx.xavp_get_keys and pvx.xavp_getd -- File Changes -- M src/modules/pv/pv.c (281) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2285.patch https://github.com/kamailio/kamailio/pull/2285.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/2285

2 3

[kamailio/kamailio] KEMI: add support for array and dict datatypes (#2284)
by Victor Seva 15 Apr '20

15 Apr '20

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] 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 - [x] Related to https://lists.kamailio.org/pipermail/sr-dev/2020-April/056481.html #### Description Added ARRAY and DICT data types and implement support in app_lua You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2284 -- Commit Summary -- * core: KEMI suport for ARRAY and DICT * app_lua: add support for ARRAY and DICT types -- File Changes -- M src/core/kemi.c (28) M src/core/kemi.h (17) M src/modules/app_lua/app_lua_api.c (88) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2284.patch https://github.com/kamailio/kamailio/pull/2284.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/2284

2 3

git:master:a1ef564b: app_lua: add support for ARRAY and DICT types
by Victor Seva 15 Apr '20

15 Apr '20

Module: kamailio Branch: master Commit: a1ef564b50877be7c5eed2b8a0ef3a8b00d3d1cd URL: https://github.com/kamailio/kamailio/commit/a1ef564b50877be7c5eed2b8a0ef3a8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-04-15T11:09:40+02:00 app_lua: add support for ARRAY and DICT types --- Modified: src/modules/app_lua/app_lua_api.c --- Diff: https://github.com/kamailio/kamailio/commit/a1ef564b50877be7c5eed2b8a0ef3a8… Patch: https://github.com/kamailio/kamailio/commit/a1ef564b50877be7c5eed2b8a0ef3a8… --- diff --git a/src/modules/app_lua/app_lua_api.c b/src/modules/app_lua/app_lua_api.c index f80de0909e..da3b4eeb17 100644 --- a/src/modules/app_lua/app_lua_api.c +++ b/src/modules/app_lua/app_lua_api.c @@ -806,6 +806,85 @@ int sr_kemi_lua_return_int(lua_State* L, sr_kemi_t *ket, int rc) return app_lua_return_false(L); } +void sr_kemi_lua_push_dict_item(lua_State *L, sr_kemi_dict_item_t *item); + +/** + * creates and push a table to the lua stack with + * the elements of the list + */ +void sr_kemi_lua_push_array(lua_State *L, sr_kemi_dict_item_t *item) { + int i = 1; + sr_kemi_dict_item_t *k; + if(!item) { + LM_CRIT("BUG: dict field empty\n"); + return; + } + if (item->vtype == SR_KEMIP_ARRAY) { + k = item->v.dict; + } else { + k = item; + } + if(k) { + lua_newtable(L); + } + while(k){ + lua_pushnumber(L, i++); + sr_kemi_lua_push_dict_item(L, k); + lua_settable(L, -3); + k = k->next; + } +} + +void sr_kemi_lua_push_dict(lua_State *L, sr_kemi_dict_item_t *item) { + sr_kemi_dict_item_t *k = item; + if(!item) { + LM_CRIT("BUG: dict field empty\n"); + return; + } + lua_newtable(L); + while(k){ + sr_kemi_lua_push_dict_item(L, k->v.dict); + lua_setfield(L, -2, k->name.s); + k = k->next; + } +} + +void +sr_kemi_lua_push_dict_item(lua_State *L, sr_kemi_dict_item_t *item) +{ + switch(item->vtype) { + case SR_KEMIP_NONE: + LM_CRIT("BUG: vtype is NONE\n"); + lua_pushnil(L); + break; + case SR_KEMIP_INT: + lua_pushinteger(L, item->v.n); + break; + case SR_KEMIP_STR: + lua_pushlstring(L, item->v.s.s, item->v.s.len); + break; + case SR_KEMIP_BOOL: + if(item->v.n!=SR_KEMI_FALSE) { + lua_pushboolean(L, SRLUA_TRUE); + } else { + lua_pushboolean(L, SRLUA_FALSE); + } + break; + case SR_KEMIP_NULL: + lua_pushnil(L); + break; + case SR_KEMIP_ARRAY: + sr_kemi_lua_push_array(L, item); + break; + case SR_KEMIP_DICT: + sr_kemi_lua_push_dict(L, item); + break; + default: + LM_DBG("unknown type:%d\n", item->vtype); + /* unknown type - return false */ + lua_pushboolean(L, SRLUA_FALSE); + } +} /** * @@ -835,6 +914,14 @@ int sr_kemi_lua_return_xval(lua_State* L, sr_kemi_t *ket, sr_kemi_xval_t *rx) case SR_KEMIP_NULL: lua_pushnil(L); return 1; + case SR_KEMIP_ARRAY: + sr_kemi_lua_push_array(L, rx->v.dict); + sr_kemi_xval_free(rx); + return 1; + case SR_KEMIP_DICT: + sr_kemi_lua_push_dict_item(L, rx->v.dict); + sr_kemi_xval_free(rx); + return 1; default: /* unknown type - return false */ lua_pushboolean(L, SRLUA_FALSE);

1 0

git:master:8f753d10: core: KEMI suport for ARRAY and DICT
by Victor Seva 15 Apr '20

15 Apr '20

Module: kamailio Branch: master Commit: 8f753d10b7dd44735d723dd781864ddd0202e769 URL: https://github.com/kamailio/kamailio/commit/8f753d10b7dd44735d723dd781864dd… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-04-15T11:09:40+02:00 core: KEMI suport for ARRAY and DICT --- Modified: src/core/kemi.c Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/8f753d10b7dd44735d723dd781864dd… Patch: https://github.com/kamailio/kamailio/commit/8f753d10b7dd44735d723dd781864dd… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 8b5663a39f..d389c4b4e0 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -2390,6 +2390,34 @@ void sr_kemi_xval_null(sr_kemi_xval_t *xval, int rmode) } } +/** + * + */ +void sr_kemi_dict_item_free(sr_kemi_dict_item_t *item) +{ + sr_kemi_dict_item_t *v; + + while(item) { + if (item->vtype == SR_KEMIP_ARRAY || item->vtype == SR_KEMIP_DICT) { + sr_kemi_dict_item_free(item->v.dict); + } + v = item; + item = item->next; + pkg_free(v); + } +} + +/** + * + */ +void sr_kemi_xval_free(sr_kemi_xval_t *xval) +{ + if(xval && (xval->vtype == SR_KEMIP_ARRAY || xval->vtype == SR_KEMIP_DICT)) + { + sr_kemi_dict_item_free(xval->v.dict); + } +} + /** * */ diff --git a/src/core/kemi.h b/src/core/kemi.h index 7824ce2f60..85cd521512 100644 --- a/src/core/kemi.h +++ b/src/core/kemi.h @@ -32,6 +32,8 @@ #define SR_KEMIP_BOOL (1<<2) /* type boolean (0/1) */ #define SR_KEMIP_XVAL (1<<3) /* type extended value (integer, str*, ...) */ #define SR_KEMIP_NULL (1<<4) /* type NULL */ +#define SR_KEMIP_DICT (1<<5) /* type dictionary */ +#define SR_KEMIP_ARRAY (1<<6) /* type array */ #define SR_KEMI_FALSE 0 #define SR_KEMI_TRUE 1 @@ -66,11 +68,24 @@ typedef union { str s; } sr_kemi_val_t; +typedef struct sr_kemi_dict_item +{ + struct sr_kemi_dict_item *next; + str name; + int vtype; + union { + int n; + str s; + struct sr_kemi_dict_item *dict; + } v; +} sr_kemi_dict_item_t; + typedef struct sr_kemi_xval { int vtype; union { int n; str s; + sr_kemi_dict_item_t *dict; } v; } sr_kemi_xval_t; @@ -208,5 +223,5 @@ sr_kemi_t* sr_kemi_exports_get_pv(void); #define SR_KEMI_XVAL_NULL_PRINT 1 #define SR_KEMI_XVAL_NULL_EMPTY 2 void sr_kemi_xval_null(sr_kemi_xval_t *xval, int rmode); - +void sr_kemi_xval_free(sr_kemi_xval_t *xval); #endif

1 0

Re: [sr-dev] Unable to make SIP Calls (403 Forbidden - Domain Not Served)
by Pavel Siderov 15 Apr '20

15 Apr '20

Hello, I think this thread is for Users maillist. Anyway, first of all start scscf in debug mode and test. Then have a look on the logs. There is only one place in the scscf configuration where you can get "Domain not served": if (uri == myself || uri =~ "tel:.*") { if (!term_impu_registered("location")) { xlog("L_DBG", "We need to do an UNREG server SAR assignemnt"); assign_server_unreg("UNREG_SAR_REPLY", "location", "term"); exit; } } else { sl_send_reply("403","Forbidden - Domain not served"); exit(); } I personally got the same error some time ago and I didn't have enough time to debug it. That's why I just commented all the code above so scscf can proceed to : route(term); This is a temporary workaround but it is working fine for me. Most likely this is something important but it stays in the todo to debug it in the near future. Regards, Pavel Siderov На пн, 13.04.2020 г. в 22:38 <sr-dev-request(a)lists.kamailio.org> написа: > > Date: Tue, 14 Apr 2020 01:07:14 +0530 > From: Pavithra M <pavimohan3096(a)gmail.com> > To: "Kamailio (SER) - Development Mailing List" > <sr-dev(a)lists.kamailio.org> > Subject: Re: [sr-dev] Unable to make SIP Calls (403 Forbidden - Domain > Not Served) > Message-ID: > <CAJvDr=+ > UKZ66o1ZQ-EmQ5xc70AEnZ3fJzoNair1ctCanB1DyvA(a)mail.gmail.com> > Content-Type: text/plain; charset="utf-8" > > Hi , > > I have configured kamailio as an IMS server as VM based . > > PCSCF - 10.x.x.179 > ICSCF - 10.x.x.79 > SCSCF - 10.x.x.73 > HSS - 10.x.x.75 > > I am using zoiper client for testing the call flow . The *registration is > happening properly* in my both zoiper clients for hss configured users > (alice and bob). > When i am making an *INVITE , *I am getting *403 Forbidden - Domain not > served *error from SCSCF. > > The Call Flow for invite is as follows . call from alice(a)sip.example.com > > zoiper1 (UE) -> PCSCF ( INVITE sip:bob@sip.example.com;transport=UDP ) > PCSCF -> SCSCF ( INVITE sip:bob@sip.example.com;transport=UDP ) > SCSCF -> PCSCF (100 trying) > SCSCF -> ICSCF ( INVITE sip:bob@sip.example.com;transport=UDP ) > ICSCF -> SCSCF (100 trying) > ICSCF -> SCSCF ( INVITE sip:bob@sip.example.com;transport=UDP ) > SCSCF -> ICSCF (100 trying) > SCSCF -> ICSCF (*403 Forbidden - Domain not served*) > ICSCF -> SCSCF (Request: ACK sip:bob@sip.example.com | ) > ICSCF -> SCSCF ( 403 Forbidden - Domain not served ) > SCSCF -> PCSCF ( 403 Forbidden - Domain not served ) > PCSCF -> UE ( 403 Forbidden - Domain not served ) > > Below are the alias configuration i have done in pcscf,icscf,scscf nodes > *PCSCF.CFG* > # IP-Adress for incoming SIP-Traffic, in the following format: > > # SIP / UDP > listen=udp:10.x.x.179:4060 > # SIP / TCP > listen=tcp:10.x.x.179:4060 > # SIP / TCP/TLS > listen=tls:10.x.x.179:4060 > > # IPSEC / UDP > #!define IPSEC_LISTEN_ADDR "0.0.0.0" > #!define IPSEC_CLIENT_PORT 5062 > #!define IPSEC_SERVER_PORT 5063 > #alias="sip.example.com:4060" > alias=pcscf.sip.example.com:4060 > > #!define MY_WS_PORT 80 > #!define MY_WSS_PORT 443 > > #!define PCSCF_URL "sip:pcscf.sip.example.com:4060" > > #!define TCP_PROCESSES 8 > > #!subst "/NETWORKNAME/sip.example.com/" > #!subst "/HOSTNAME/pcscf.sip.example.com/" > > *ICSCF.CFG* > > # SIP / UDP > listen=udp:10.x.x.79:4070 > # SIP / TCP > listen=tcp:10.x.x.79:4070 > # SIP / TCP/TLS > listen=tls:10.x.x.79:4071 > > alias="icscf.sip.example.com:4070" > > #!define NETWORKNAME "sip.example.com" > #!define HOSTNAME "icscf.sip.example.com" > > *SCSCF.CFG* > > # SIP / UDP > listen=udp:10.x.x.73:4080 > # SIP / TCP > listen=tcp:10.x.x.73:4080 > # SIP / TCP/TLS > listen=tls:10.x.x.73:4081 > > #!define NETWORKNAME "sip.example.com" > #!define HOSTNAME "scscf.sip.example.com" > #!define URI "sip:scscf.sip.example.com:4080" > alias=scscf.sip.example.com:4080 > > # ENUM-Server to query: > #!define ENUM_SUFFIX "scscf.sip.example.com." > > > Kindly let me know where i am missing . Kindly need help in this issue > since the registration is happening successfully and dropping in the INVITE > level. > Kindly help.

2 1

git:master:125be8e4: presence_xml: use common prefix for global variables
by Daniel-Constantin Mierla 15 Apr '20

15 Apr '20

Module: kamailio Branch: master Commit: 125be8e423cd968933690c682cb0a45ab7136ad3 URL: https://github.com/kamailio/kamailio/commit/125be8e423cd968933690c682cb0a45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-15T09:21:11+02:00 presence_xml: use common prefix for global variables --- Modified: src/modules/presence_xml/add_events.c Modified: src/modules/presence_xml/notify_body.c Modified: src/modules/presence_xml/presence_xml.c Modified: src/modules/presence_xml/presence_xml.h Modified: src/modules/presence_xml/xcap_auth.c --- Diff: https://github.com/kamailio/kamailio/commit/125be8e423cd968933690c682cb0a45… Patch: https://github.com/kamailio/kamailio/commit/125be8e423cd968933690c682cb0a45…

1 0

git:master:3b2a84e9: presence_xml: use presence api via structure instead of declaring local function variables
by Daniel-Constantin Mierla 15 Apr '20

15 Apr '20

Module: kamailio Branch: master Commit: 3b2a84e94da6e17c61620760fee0288d8af936b9 URL: https://github.com/kamailio/kamailio/commit/3b2a84e94da6e17c61620760fee0288… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-15T09:21:11+02:00 presence_xml: use presence api via structure instead of declaring local function variables - simpler overall and clearer when function is local in module or imported via api, given that same prefix was used --- Modified: src/modules/presence_xml/add_events.c Modified: src/modules/presence_xml/notify_body.c Modified: src/modules/presence_xml/pidf.c Modified: src/modules/presence_xml/pres_check.c Modified: src/modules/presence_xml/pres_check.h Modified: src/modules/presence_xml/presence_xml.c Modified: src/modules/presence_xml/presence_xml.h Modified: src/modules/presence_xml/xcap_auth.c Modified: src/modules/presence_xml/xcap_auth.h --- Diff: https://github.com/kamailio/kamailio/commit/3b2a84e94da6e17c61620760fee0288… Patch: https://github.com/kamailio/kamailio/commit/3b2a84e94da6e17c61620760fee0288…

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
43
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2020