sr-dev November 2017

sr-dev@lists.kamailio.org

26 participants
481 discussions

Kamailio KEMI Framework Tutorial
by Daniel-Constantin Mierla 20 Nov '17

20 Nov '17

Hello, I started a tutorial for Kamailio KEMI Framework written in markdown format targeting use of mkdocs. It is published on github as part of kamailio-docs repository: * https://github.com/kamailio/kamailio-docs/tree/master/kamailio-kemi-framewo… The mkdocs build (to browse and read) is online at: * http://kamailio.org/docs/tutorials/devel/kamailio-kemi-framework/ It is work in progress and contributions from the community are more than welcome -- doing push requests on github project is the recommended way for contributions: * https://github.com/kamailio/kamailio-docs/ The main goal is document the role of KEMI, its benefits and how it can be used. It addition it should cover the list of functions exported to KEMI by core as well as special KEMI functions. Regarding the functions exported by kamailio modules to KEMI I added as an skeleton the ones exported by acc module. However, I am not sure if we should do it there or add them to the existing docs of the modules. Opinions on this?!? Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - www.asipto.com Kamailio World Conference - May 14-16, 2018 - www.kamailioworld.com

1 0

git:master:aec6c31b: core: kemi - more core functions exported to kemi framework
by Daniel-Constantin Mierla 20 Nov '17

20 Nov '17

Module: kamailio Branch: master Commit: aec6c31b5acb43a5123fe29cccba623ffebe0b2b URL: https://github.com/kamailio/kamailio/commit/aec6c31b5acb43a5123fe29cccba623… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-20T09:54:43+01:00 core: kemi - more core functions exported to kemi framework --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/aec6c31b5acb43a5123fe29cccba623… Patch: https://github.com/kamailio/kamailio/commit/aec6c31b5acb43a5123fe29cccba623…

1 0

git:master:97f975fa: core: kemi - support for short header name in hdr remove and search
by Daniel-Constantin Mierla 20 Nov '17

20 Nov '17

Module: kamailio Branch: master Commit: 97f975fa5c2d2186f860e0deada4b5412c529ee5 URL: https://github.com/kamailio/kamailio/commit/97f975fa5c2d2186f860e0deada4b54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-19T22:14:40+01:00 core: kemi - support for short header name in hdr remove and search - KSR.hdr.is_present("hname") - function to search if a header is present --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/97f975fa5c2d2186f860e0deada4b54… Patch: https://github.com/kamailio/kamailio/commit/97f975fa5c2d2186f860e0deada4b54…

1 0

git:master:e4b7cd2a: core: kemi - function for branch flags with index have two int params
by Daniel-Constantin Mierla 20 Nov '17

20 Nov '17

Module: kamailio Branch: master Commit: e4b7cd2a3e362917ff28f2f532d8d39ef9e53a4f URL: https://github.com/kamailio/kamailio/commit/e4b7cd2a3e362917ff28f2f532d8d39… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-19T21:50:25+01:00 core: kemi - function for branch flags with index have two int params --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/e4b7cd2a3e362917ff28f2f532d8d39… Patch: https://github.com/kamailio/kamailio/commit/e4b7cd2a3e362917ff28f2f532d8d39… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 0462c5dd8a..093fd4441f 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -561,17 +561,17 @@ static sr_kemi_t _sr_kemi_core[] = { }, { str_init(""), str_init("setbiflag"), SR_KEMIP_BOOL, sr_kemi_core_setbiflag, - { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + { SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init(""), str_init("resetbiflag"), SR_KEMIP_BOOL, sr_kemi_core_resetbiflag, - { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + { SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init(""), str_init("isbiflagset"), SR_KEMIP_BOOL, sr_kemi_core_isbiflagset, - { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + { SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init(""), str_init("setsflag"), @@ -1309,4 +1309,4 @@ str *sr_kemi_param_map_get_params(int *ptypes) sret.s = pbuf; sret.len = strlen(sret.s); return &sret; -} \ No newline at end of file +}

1 0

git:master:a1508e63: textops: several functions exported to kemi framework
by Daniel-Constantin Mierla 20 Nov '17

20 Nov '17

Module: kamailio Branch: master Commit: a1508e63ff59665701b8901a79b14a3aa88eab9c URL: https://github.com/kamailio/kamailio/commit/a1508e63ff59665701b8901a79b14a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-19T12:07:16+01:00 textops: several functions exported to kemi framework --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/a1508e63ff59665701b8901a79b14a3… Patch: https://github.com/kamailio/kamailio/commit/a1508e63ff59665701b8901a79b14a3…

1 0

git:master:7ab180c8: core: kemi - simplified anchor location for hdr append and insert functions
by Daniel-Constantin Mierla 20 Nov '17

20 Nov '17

Module: kamailio Branch: master Commit: 7ab180c8ed3976148a23a0d0a727d1dcab1d9e72 URL: https://github.com/kamailio/kamailio/commit/7ab180c8ed3976148a23a0d0a727d1d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-19T11:15:41+01:00 core: kemi - simplified anchor location for hdr append and insert functions --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/7ab180c8ed3976148a23a0d0a727d1d… Patch: https://github.com/kamailio/kamailio/commit/7ab180c8ed3976148a23a0d0a727d1d… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 603ae1ea35..0462c5dd8a 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -634,7 +634,6 @@ static sr_kemi_t _sr_kemi_core[] = { static int sr_kemi_hdr_append(sip_msg_t *msg, str *txt) { struct lump* anchor; - struct hdr_field *hf; char *hdr; if(txt==NULL || txt->s==NULL || msg==NULL) @@ -646,14 +645,14 @@ static int sr_kemi_hdr_append(sip_msg_t *msg, str *txt) return -1; } - hf = msg->last_header; hdr = (char*)pkg_malloc(txt->len); if(hdr==NULL) { LM_ERR("no pkg memory left\n"); return -1; } memcpy(hdr, txt->s, txt->len); - anchor = anchor_lump(msg, hf->name.s + hf->len - msg->buf, 0, 0); + /* anchor after last header */ + anchor = anchor_lump(msg, msg->unparsed - msg->buf, 0, 0); if(insert_new_lump_before(anchor, hdr, txt->len, 0) == 0) { LM_ERR("can't insert lump\n"); pkg_free(hdr); @@ -766,21 +765,20 @@ static int sr_kemi_hdr_remove(sip_msg_t *msg, str *txt) static int sr_kemi_hdr_insert(sip_msg_t *msg, str *txt) { struct lump* anchor; - struct hdr_field *hf; char *hdr; if(txt==NULL || txt->s==NULL || msg==NULL) return -1; LM_DBG("insert hf: %.*s\n", txt->len, txt->s); - hf = msg->headers; hdr = (char*)pkg_malloc(txt->len); if(hdr==NULL) { LM_ERR("no pkg memory left\n"); return -1; } memcpy(hdr, txt->s, txt->len); - anchor = anchor_lump(msg, hf->name.s + hf->len - msg->buf, 0, 0); + /* anchor before first header */ + anchor = anchor_lump(msg, msg->headers->name.s - msg->buf, 0, 0); if(insert_new_lump_before(anchor, hdr, txt->len, 0) == 0) { LM_ERR("can't insert lump\n"); pkg_free(hdr);

1 0

git:master:0df40557: core: kemi - exported hdr.append_after() and hdr.insert_before()
by Daniel-Constantin Mierla 20 Nov '17

20 Nov '17

Module: kamailio Branch: master Commit: 0df40557879bc8c64c917d54b61fd106147be7b1 URL: https://github.com/kamailio/kamailio/commit/0df40557879bc8c64c917d54b61fd10… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-19T11:10:04+01:00 core: kemi - exported hdr.append_after() and hdr.insert_before() - kemi functions to add a header after another one and insert a header before another one --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/0df40557879bc8c64c917d54b61fd10… Patch: https://github.com/kamailio/kamailio/commit/0df40557879bc8c64c917d54b61fd10…

1 0

git:master:d848d133: test/unit: 19.sh - remove usrloc record by ruid
by Daniel-Constantin Mierla 19 Nov '17

19 Nov '17

Module: kamailio Branch: master Commit: d848d133301bead7a6e3d9b3e6f3ffa2329fd825 URL: https://github.com/kamailio/kamailio/commit/d848d133301bead7a6e3d9b3e6f3ffa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-19T08:55:43+01:00 test/unit: 19.sh - remove usrloc record by ruid --- Modified: test/unit/19.sh --- Diff: https://github.com/kamailio/kamailio/commit/d848d133301bead7a6e3d9b3e6f3ffa… Patch: https://github.com/kamailio/kamailio/commit/d848d133301bead7a6e3d9b3e6f3ffa… --- diff --git a/test/unit/19.sh b/test/unit/19.sh index 8815aa07f5..f9bd07b09b 100755 --- a/test/unit/19.sh +++ b/test/unit/19.sh @@ -34,6 +34,7 @@ UAC=5080 # add an registrar entry to the db; +$MYSQL "DELETE FROM location WHERE ruid=\"kamailio-unit-uid\"" $MYSQL "INSERT INTO location (ruid,username,contact,socket,user_agent,cseq,q) VALUES (\"kamailio-unit-uid\", \"foo\",\"sip:foo@localhost:$UAS\",\"udp:127.0.0.1:$UAS\",\"kamailio_test\",1,-1);" $BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG -a no > /dev/null @@ -46,5 +47,5 @@ ret=$? killall -9 sipp > /dev/null 2>&1 kill_kamailio -$MYSQL "DELETE FROM location WHERE ((contact = \"sip:foo@localhost:$UAS\") and (user_agent = \"kamailio_test\"));" +$MYSQL "DELETE FROM location WHERE ruid=\"kamailio-unit-uid\"" exit $ret;

1 0

git:master:52c766bf: test/unit: print same messages when running all or individual unit tests
by Daniel-Constantin Mierla 19 Nov '17

19 Nov '17

Module: kamailio Branch: master Commit: 52c766bf3c54402cf403a58188952968a8520b68 URL: https://github.com/kamailio/kamailio/commit/52c766bf3c54402cf403a5818895296… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-19T08:54:25+01:00 test/unit: print same messages when running all or individual unit tests - some explanatory comments in Makefile --- Modified: test/unit/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/52c766bf3c54402cf403a5818895296… Patch: https://github.com/kamailio/kamailio/commit/52c766bf3c54402cf403a5818895296… --- diff --git a/test/unit/Makefile b/test/unit/Makefile index 83b3dba999..00c2a47c2e 100644 --- a/test/unit/Makefile +++ b/test/unit/Makefile @@ -4,32 +4,37 @@ TESTS_FILES ?= $(wildcard *.sh) TESTS_EXCLUDE ?= TESTS ?= $(filter-out $(patsubst %,%.sh,$(TESTS_EXCLUDE)), $(TESTS_FILES)) +# run all tests all: @for FILE in $(TESTS) ; do \ if [ -f $$FILE ] ; then \ if [ -x $$FILE ] ; then \ - echo "run test `basename $$FILE .sh`:" `head -n 2 "$$FILE" | tail -n 1 | cut -c 3-` ; \ + echo "Run test `basename $$FILE .sh`:" `head -n 2 "$$FILE" | tail -n 1 | cut -c 3-` ; \ ./$$FILE ; \ ret=$$? ; \ - if [ ! "$$ret" -eq 0 ] ; then \ - echo "failed" ; RES=1;\ - fi ; \ + if [ ! "$$ret" -eq 0 ] ; then \ + echo "Test unit file $$FILE: failed" ; \ + else \ + echo "Test unit file $$FILE: ok" ; \ + fi ; \ fi ; \ fi ; \ done ; \ exit $$RES; +# run one test specified in variable UNIT +# example: make UNIT=1.sh run run: -@if [ -f $(UNIT) ] ; then \ if [ -x $(UNIT) ] ; then \ echo "Run test `basename $(UNIT) .sh`:" `head -n 2 "$(UNIT)" | tail -n 1 | cut -c 3-` ; \ ./$(UNIT) ; \ ret=$$? ; \ - if [ ! "$$ret" -eq 0 ] ; then \ - echo "Test unit file $(UNIT): failed" ; \ - else \ - echo "Test unit file $(UNIT): ok" ; \ - fi ; \ + if [ ! "$$ret" -eq 0 ] ; then \ + echo "Test unit file $(UNIT): failed" ; \ + else \ + echo "Test unit file $(UNIT): ok" ; \ + fi ; \ fi ; \ else \ echo "Test unit file $(UNIT): not found" ; \

1 0

git:master:6b65ff70: nathelper: export add_rcv_param(flags) to kemi interface
by Daniel-Constantin Mierla 18 Nov '17

18 Nov '17

Module: kamailio Branch: master Commit: 6b65ff70d505680fa3904f659c47d466e77b38c6 URL: https://github.com/kamailio/kamailio/commit/6b65ff70d505680fa3904f659c47d46… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-18T16:26:29+01:00 nathelper: export add_rcv_param(flags) to kemi interface --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/6b65ff70d505680fa3904f659c47d46… Patch: https://github.com/kamailio/kamailio/commit/6b65ff70d505680fa3904f659c47d46… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index d6878e3176..a34d0a19dd 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -2097,20 +2097,12 @@ static int create_rcv_uri(str *uri, struct sip_msg *m) * Add received parameter to Contacts for further * forwarding of the REGISTER requuest */ -static int add_rcv_param_f(struct sip_msg *msg, char *str1, char *str2) +static int ki_add_rcv_param(sip_msg_t *msg, int hdr_param) { contact_t *c; struct lump *anchor; char *param; str uri; - int hdr_param = 0; - - if(str1) { - if(fixup_get_ivalue(msg, (gparam_t*)str1, &hdr_param)<0) { - LM_ERR("failed to get falgs parameter\n"); - return -1; - } - } if(create_rcv_uri(&uri, msg) < 0) { return -1; @@ -2160,6 +2152,22 @@ static int add_rcv_param_f(struct sip_msg *msg, char *str1, char *str2) return 1; } +/* + * Add received parameter to Contacts for further + * forwarding of the REGISTER requuest + */ +static int add_rcv_param_f(struct sip_msg *msg, char *str1, char *str2) +{ + int hdr_param = 0; + + if(str1) { + if(fixup_get_ivalue(msg, (gparam_t*)str1, &hdr_param)<0) { + LM_ERR("failed to get falgs parameter\n"); + return -1; + } + } + return ki_add_rcv_param(msg, hdr_param); +} /* * Create an AVP to be used by registrar with the source IP and port @@ -2399,6 +2407,11 @@ static sr_kemi_t sr_kemi_nathelper_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("nathelper"), str_init("add_rcv_param"), + SR_KEMIP_INT, ki_add_rcv_param, + { SR_KEMIP_INT, 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 } } };

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
49
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2017