sr-dev September 2014

sr-dev@lists.kamailio.org

33 participants
375 discussions

git:master: benchmark: declare inline functions static to work with clang linker

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 452f32235034916468cab577de3ca0d0f56fd5ea URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=452f322… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 30 18:07:53 2014 +0200 benchmark: declare inline functions static to work with clang linker - otherwise it results in no symbol found at module loading time --- modules/benchmark/benchmark.c | 2 +- modules/benchmark/benchmark.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/benchmark/benchmark.c b/modules/benchmark/benchmark.c index 7dea208..cf45a5c 100644 --- a/modules/benchmark/benchmark.c +++ b/modules/benchmark/benchmark.c @@ -254,7 +254,7 @@ void reset_timers(void) * 1 - Timing enabled for all timers */ -inline int timer_active(unsigned int id) +static inline int timer_active(unsigned int id) { if (bm_mycfg->enable_global > 0 || bm_mycfg->timers[id].enabled > 0) return 1; diff --git a/modules/benchmark/benchmark.h b/modules/benchmark/benchmark.h index 6a275be..fea0649 100644 --- a/modules/benchmark/benchmark.h +++ b/modules/benchmark/benchmark.h @@ -69,7 +69,7 @@ typedef struct benchmark_timer struct benchmark_timer *next; } benchmark_timer_t; -inline int bm_get_time(bm_timeval_t *t) +static inline int bm_get_time(bm_timeval_t *t) { #ifdef BM_CLOCK_REALTIME if(clock_gettime(CLOCK_REALTIME, t)!=0) @@ -84,7 +84,7 @@ inline int bm_get_time(bm_timeval_t *t) return 0; } -inline unsigned long long bm_diff_time(bm_timeval_t *t1, bm_timeval_t *t2) +static inline unsigned long long bm_diff_time(bm_timeval_t *t1, bm_timeval_t *t2) { unsigned long long tdiff;

9 years, 6 months

git:master: core: exit with -1 if there is a mismatch in version of module and core

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: c4f7356f2d8c057f59cb61948aa04664cecd35f7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c4f7356… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 30 17:53:44 2014 +0200 core: exit with -1 if there is a mismatch in version of module and core - return code to shell 0 is like succesful run, some scripts not being able to say it was a failure to start --- sr_module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sr_module.c b/sr_module.c index b581635..e1c1797 100644 --- a/sr_module.c +++ b/sr_module.c @@ -610,7 +610,7 @@ reload: } /* version control */ if (!version_control(handle, path)) { - exit(0); + exit(-1); } mod_if_ver = (unsigned *)dlsym(handle, DLSYM_PREFIX "module_interface_ver");

9 years, 6 months

git:master: sms: declare inline functions static to work with clang linker

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 8a51aa250c4e22e5933d0ff39a7a4b300007bb72 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8a51aa2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 30 18:06:36 2014 +0200 sms: declare inline functions static to work with clang linker - otherwise it results in no symbol found at module loading time --- modules/sms/libsms_putsms.c | 2 +- modules/sms/sms_funcs.c | 4 ++-- modules/sms/sms_report.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/sms/libsms_putsms.c b/modules/sms/libsms_putsms.c index 8223f0d..965e833 100644 --- a/modules/sms/libsms_putsms.c +++ b/modules/sms/libsms_putsms.c @@ -155,7 +155,7 @@ int make_pdu(struct sms_msg *msg, struct modem *mdm, char* pdu) /* search into modem reply for the sms id */ -inline int fetch_sms_id(char *answer) +static inline int fetch_sms_id(char *answer) { char *p; int id; diff --git a/modules/sms/sms_funcs.c b/modules/sms/sms_funcs.c index b99388f..5a2548b 100644 --- a/modules/sms/sms_funcs.c +++ b/modules/sms/sms_funcs.c @@ -370,7 +370,7 @@ error: -inline int send_error(struct sms_msg *sms_messg, char *msg1_s, int msg1_len, +static inline int send_error(struct sms_msg *sms_messg, char *msg1_s, int msg1_len, char *msg2_s, int msg2_len) { str body; @@ -398,7 +398,7 @@ error: -inline unsigned int split_text(str *text, unsigned char *lens,int nice) +static inline unsigned int split_text(str *text, unsigned char *lens,int nice) { int nr_chunks; int k,k1,len; diff --git a/modules/sms/sms_report.c b/modules/sms/sms_report.c index 820fd61..4cf9ca3 100644 --- a/modules/sms/sms_report.c +++ b/modules/sms/sms_report.c @@ -112,7 +112,7 @@ void set_gettime_function(void) -inline void free_report_cell(struct report_cell *cell) +static inline void free_report_cell(struct report_cell *cell) { if (!cell) return;

9 years, 6 months

git:master: test/unit: README updated with more details about running unit tests

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: fad3b2482f98888351f4133f47a433b5bb36c3b7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fad3b24… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 30 17:37:50 2014 +0200 test/unit: README updated with more details about running unit tests --- test/unit/README | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/test/unit/README b/test/unit/README index d6735f4..85c5776 100644 --- a/test/unit/README +++ b/test/unit/README @@ -1,7 +1,11 @@ +Kamailio Test Unit +================== + This directory contains some small "smoke tests", that should assure that basic functionality of the server work as required. This tests should consists of one shell script and a config file if needed. They should not need much time for execution, to allow the run of the complete test suite in a few seconds. + All test scripts must be self-contained, should not have external dependencies and must clean up after they are run. The second line in each scripts should contain a small comment that describe the task of the test, it should not @@ -10,3 +14,18 @@ output any messages on successful runs. This tests should (in the current state) only run by developers who know what they do. They could delete your database, produce core dumps that fill your harddisk or do other nasty things.. + +Usage +----- + +To execute all unit tests, run: + + make all + +To run a specific unit test, run: + + make run UNIT=scripname + +Scriptname is the name of shell file to execute, for example: + + make run UNIT=1.sh

9 years, 6 months

git:master: test/unit: removed search on modules_k folder

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 8cf3dd993eba3a7ba29b3a5996d1fc4ea7d27b3a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8cf3dd9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 30 17:32:37 2014 +0200 test/unit: removed search on modules_k folder --- test/unit/include/require | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/test/unit/include/require b/test/unit/include/require index d08b64b..b6163b9 100644 --- a/test/unit/include/require +++ b/test/unit/include/require @@ -32,11 +32,6 @@ function check_module() { return 1 fi - if ! (test -e $SR_DIR/modules_k/$1/$1.so) ; then - echo "$SR_DIR/modules_k/$1/$1.so not found, try $SR_DIR/modules" - else - return 0 - fi; if ! (test -e $SR_DIR/modules/$1/$1.so) ; then echo "$SR_DIR/modules/$1/$1.so not found, not run" return 1

9 years, 6 months

git:master: test/unit: 1.sh updated to work with latest kamailio

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: cfc6d928c5c7c80fcbbc24db48e64b389ce1afdb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cfc6d92… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 30 17:37:23 2014 +0200 test/unit: 1.sh updated to work with latest kamailio --- test/unit/1.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unit/1.sh b/test/unit/1.sh index f44fd4e..3556392 100755 --- a/test/unit/1.sh +++ b/test/unit/1.sh @@ -24,7 +24,7 @@ source include/common CFG=1.cfg # setup config -echo -e "debug=2" > $CFG +echo -e "debug=2\nrequest_route {\n ; \n}" > $CFG $BIN -w . -f $CFG > /dev/null ret=$? @@ -34,4 +34,4 @@ $KILL rm -f $CFG -exit $ret \ No newline at end of file +exit $ret

9 years, 6 months

git:master: test/unit: Makefile option to run individual test unit

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 84d00119fa1bc4bcd06d3189fa5ca67564338aa2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=84d0011… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 30 17:34:16 2014 +0200 test/unit: Makefile option to run individual test unit - head parameter swapped to work on bsd/darwin --- test/unit/Makefile | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/test/unit/Makefile b/test/unit/Makefile index 6425b30..e914031 100644 --- a/test/unit/Makefile +++ b/test/unit/Makefile @@ -1,8 +1,11 @@ +# Makefile for running test unit +# + all: -@for FILE in $(wildcard *.sh) ; do \ if [ -f $$FILE ] ; then \ if [ -x $$FILE ] ; then \ - echo "run test `basename $$FILE .sh`:" `head "$$FILE" -n 2 | 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 \ @@ -11,3 +14,20 @@ all: fi ; \ fi ; \ done ; + +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 ; \ + fi ; \ + else \ + echo "Test unit file $(UNIT): not found" ; \ + fi ; +

9 years, 6 months

git:master: test/unit: kill using application name

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 4e24dac93e905cd055b9fabc3cce49071f911b9b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4e24dac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 30 17:32:58 2014 +0200 test/unit: kill using application name - on some OS, killall with full path doesn't work - kamailio is searched first, being default flavour now --- test/unit/include/common | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/test/unit/include/common b/test/unit/include/common index d918496..cab5637 100644 --- a/test/unit/include/common +++ b/test/unit/include/common @@ -7,15 +7,17 @@ CTLRC="$CTL_DIR/kamctlrc" CTL="$CTL_DIR/kamctl" DBCTL="$CTL_DIR/kamdbctl" BIN="$SR_DIR/ser" -if [ -f $SR_DIR/ser ] ; then - BIN="$SR_DIR/ser" +if [ -f $SR_DIR/kamailio ] ; then + BIN="$SR_DIR/kamailio" + BNAME="kamailio" else - if [ -f $SR_DIR/kamailio ] ; then - BIN="$SR_DIR/kamailio" + if [ -f $SR_DIR/ser ] ; then + BIN="$SR_DIR/ser" + BNAME="ser" else - echo "WARNING Binary not found!" + echo "WARNING Binary not found!" fi fi -KILL="killall -15 $BIN" +KILL="killall -15 $BNAME" # test directory relative to root TEST_DIR="test/unit"

9 years, 6 months

rtpengine error when activating in branch route

by Carlos Ruiz Díaz

Hi, rtpengine is crashing when it is activated in the branch route. In normal cases I would do it before relaying the request, but in my scenario, I am trying to call to two UAs behind NAT, the first one registered through WS transport, and the other one via TCP. The caller is a normal softphone, and I am determining what operations rtpengine needs to do depending on the transport reported by the location records. Is there any other (better) way of achieving the same? Thanks, Carlos ----------------------------------------------------------------------------------------------------- *(gdb) bt full* *#0 str_hash (ss=<optimized out>) at str.c:12* * x = <optimized out>* * s = <optimized out>* * ret = <optimized out>* * it = {s = <optimized out>, len = 36}* *#1 0x00007f0bd6b5cd29 in ?? ()* *No symbol table info available.* *#2 0x00000000004130aa in call_get (m=0xfc2000, callid=0x7f0bceeef480) at call.c:2523* * ret = <optimized out>* *#3 call_get_opmode (callid=callid@entry=0x7f0bceeef480, m=m@entry=0xfc2000, opmode=opmode@entry=OP_ANSWER) at call.c:2541* *No locals.* *#4 0x0000000000421067 in call_offer_answer_ng (input=input@entry=0x7f0bc8001f38, m=0xfc2000, output=output@entry=0x7f0bc8001ed8,* * opmode=opmode@entry=OP_ANSWER) at call_interfaces.c:591* * sdp = {* * s = 0x7f0bceeef772 "v=0\r\no=- 3621027548 3621027549 IN IP4 192.168.3.107\r\ns=pjmedia\r\nc=IN IP4 192.168.3.107\r\nt=0 0\r\nm=audio 4022 RTP/AVP 8 101\r\nc=IN IP4 192.168.3.107\r\na=rtcp:4023 IN IP4 192.168.3.107\r\na=sendrecv\r\na=rtpma"..., len = 267}* * fromtag = {s = 0x7f0bceeef94e "35mvKg7Uy1UHQ6:to-tag32:vyDHxZfSgHUXcPVHtWMQcbbwmzenpHTL7:command6:answere", len = 13}* * totag = {s = 0x7f0bceeef966 "vyDHxZfSgHUXcPVHtWMQcbbwmzenpHTL7:command6:answere", len = 32}* * callid = {* * s = 0x7f0bceeef8f5 "d27f350d-c2df-1232-e19b-04011404230113:received-froml3:IP414:189.217.95.230e8:from-tag13:35mvKg7Uy1UHQ6:to-tag32:vyDHxZfSgHUXcPVHtWMQcbbwmzenpHTL7:command6:answere", len = 36}* * errstr = 0x429c48 "Incomplete SDP specification"* * parsed = {head = 0x7f0bc8001a00, tail = 0x7f0bc8001a00, length = 1}* * streams = {head = 0x7f0bc8001c20, tail = 0x7f0bc8001c20, length = 1}* * call = <optimized out>* * monologue = <optimized out>* * ret = <optimized out>* * flags = {opmode = OP_ANSWER, received_from_family = {* * s = 0x7f0bceeef92c "IP414:189.217.95.230e8:from-tag13:35mvKg7Uy1UHQ6:to-tag32:vyDHxZfSgHUXcPVHtWMQcbbwmzenpHTL7:command6:answere", len = 3},* * received_from_address = {* * s = 0x7f0bceeef932 "189.217.95.230e8:from-tag13:35mvKg7Uy1UHQ6:to-tag32:vyDHxZfSgHUXcPVHtWMQcbbwmzenpHTL7:command6:answere", len = 14},* * media_address = {s = 0x0, len = 0}, transport_protocol_str = {* * s = 0x7f0bceeef8e2 "RTP/AVP7:call-id36:d27f350d-c2df-1232-e19b-04011404230113:received-froml3:IP414:189.217.95.230e8:from-tag13:35mvKg7Uy1UHQ6:to-tag32:vyDHxZfSgHUXcPVHtWMQcbbwmzenpHTL7:command6:answere", len = 7}, address_family_str = {s = 0x0, len = 0},* * transport_protocol = 0x427880 <transport_protocols>, parsed_received_from = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {* * 0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, parsed_media_address = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>,* * __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, direction = {{s = 0x0, len = 0}, {s = 0x0, len = 0}},* * address_family = 0, tos = 256, asymmetric = 0, trust_address = -1, replace_origin = -1, replace_sess_conn = -1, ice_remove = -1, ice_force = 0,* * ice_force_relay = 0, rtcp_mux_offer = 0, rtcp_mux_demux = 0, rtcp_mux_accept = 0, rtcp_mux_reject = 0, strict_source = 0, media_handover = 0}* * chopper = <optimized out>* -- Carlos http://caruizdiaz.com

9 years, 6 months

Is there a sense in calling run_onsend() after the msg_send() function?

by Lucian Balaceanu

Hi, I am currently trying to understand some kamailio code and came across this construct inside do_forward_reply() function (code in italics is not part of upstream kamailio): *do_forward_reply(struct sip_msg* msg, int mode){* ... ... apply_force_send_socket(&dst, msg); if (msg_send(&dst, new_buf, new_len)<0) { STATS_RPL_FWD_DROP(); goto error; } /* ... dst.send_sock=get_send_socket(msg, &dst.to, dst.proto); ... run_onsend(msg, &dst, new_buf, new_len);*/ *}* Is there really a sense in calling run_onsend() after the msg_send() function? In my understanding (based on onsend_route uasge) run_onsend() is used to make some last minute changes before a message is sent to a destination. Thank you, Lucian Balaceanu

9 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2014