sr-dev January 2017

sr-dev@lists.kamailio.org

33 participants
539 discussions

git:master:a63d88da: IMS-Dialog: Fix Ref-Counter
by Carsten Bock 12 Jan '17

12 Jan '17

Module: kamailio Branch: master Commit: a63d88da87c70567a7e5303607d0a336ded9d74f URL: https://github.com/kamailio/kamailio/commit/a63d88da87c70567a7e5303607d0a33… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2017-01-12T14:44:03+01:00 IMS-Dialog: Fix Ref-Counter --- Modified: src/modules/ims_dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/a63d88da87c70567a7e5303607d0a33… Patch: https://github.com/kamailio/kamailio/commit/a63d88da87c70567a7e5303607d0a33… --- diff --git a/src/modules/ims_dialog/dlg_handlers.c b/src/modules/ims_dialog/dlg_handlers.c index 6262131..ea356aa 100644 --- a/src/modules/ims_dialog/dlg_handlers.c +++ b/src/modules/ims_dialog/dlg_handlers.c @@ -1601,6 +1601,10 @@ int dlg_new_dialog(struct sip_msg *req, struct cell *t, const int run_initial_cb // get_dlg has incremented the ref count by 1 dlg_release(dlg); } + } else { + // get_dlg has incremented the ref count by 1 + if (dlg) + dlg_release(dlg); } spiral_detected = 0;

1 0

[kamailio/kamailio] CSeq missmatch with UAC module (#919)
by vinzens 12 Jan '17

12 Jan '17

While placing a call though kamailio with uac Module the Cseq is not updated if the call gets rejected for any reason. Call setup is as follow: Asterisk -> Kamailio with UAC Module -> Starface PBX The asterisk calls a number which is not valid on Starface. in this case the Starface rejects the call. The ACK from Kamailio to the starface has wrong CSeq and the 403 gets retransmitted. The call sequence between Asterisk and Kamailio is not the same than on the Call from Kamailio to Starface since the Proxy Auth was handled by UAC Module. Branch module should take care of the different CSeq but it does not work for rejected calls. Wth a normal Call setup (200 OK, Bye...) everything works fine. In the attachement there is a wireshark trace with only one call (which is the affected one) and a debug log (level 3) [debug_trace_log.zip](https://github.com/kamailio/kamailio/files/693234/debu… -- 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/issues/919

4 17

Build-Depends / Debian/Ubuntu
by Carsten Bock 11 Jan '17

11 Jan '17

Hi, until recently, we only had build-depends (in pkg/kamailio/deb/jessie or pkg/kamailio/deb/trusty), which were available in the official repositories of the OS (e.g. of Debian or Ubuntu). Recently, some new build-depends were added: - libradcli-dev - libxmlrpc-c3-dev However, those two packages are not or no longer available on Standard Ubuntu 14.04 LTS (trusty) or Debian 8: Reading package lists... Done Building dependency tree Reading state information... Done E: Unable to locate package libradcli-dev E: Unable to locate package libxmlrpc-c3-dev At least, "libradcli-dev" can be found in jessie-backports (not in trusty-backports(!)), while I haven't found a proper source for "libxmlrpc-c3-dev". Is it supposed to be that way? Or should we use the "pkg/kamailio/deb/debian/" files and the script in the backports folder? If yes, then I would vote for removing the other build scripts. Thanks, Carsten -- Carsten Bock CEO (Geschäftsführer) ng-voice GmbH Millerntorplatz 1 20359 Hamburg / Germany http://www.ng-voice.com mailto:carsten@ng-voice.com Office +49 40 5247593-40 Fax +49 40 5247593-99 Sitz der Gesellschaft: Hamburg Registergericht: Amtsgericht Hamburg, HRB 120189 Geschäftsführer: Carsten Bock Ust-ID: DE279344284 Hier finden Sie unsere handelsrechtlichen Pflichtangaben: http://www.ng-voice.com/imprint/

2 2

git:master:b75d4ca2: dialog: increase cseq after uac auth for local acks
by Daniel-Constantin Mierla 11 Jan '17

11 Jan '17

Module: kamailio Branch: master Commit: b75d4ca219d7185e0a73cc9132760fe05227faa4 URL: https://github.com/kamailio/kamailio/commit/b75d4ca219d7185e0a73cc9132760fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-11T15:22:50+01:00 dialog: increase cseq after uac auth for local acks - related to GH #918, #919 --- Modified: src/modules/dialog/dlg_cseq.c --- Diff: https://github.com/kamailio/kamailio/commit/b75d4ca219d7185e0a73cc9132760fe… Patch: https://github.com/kamailio/kamailio/commit/b75d4ca219d7185e0a73cc9132760fe… --- diff --git a/src/modules/dialog/dlg_cseq.c b/src/modules/dialog/dlg_cseq.c index 3f70bbc..41c9864 100644 --- a/src/modules/dialog/dlg_cseq.c +++ b/src/modules/dialog/dlg_cseq.c @@ -401,15 +401,13 @@ int dlg_cseq_msg_sent(void *data) parse_headers(&msg, HDR_EOH_F, 0); /* check if transaction is marked for a new increment */ - if(get_cseq(&msg)->method_id!=METHOD_ACK) { - hfk = sr_hdr_get_z(&msg, cenv->uac_cseq_auth.s); - if(hfk!=NULL) { - LM_DBG("new cseq inc requested\n"); - nval = hfk->body; - trim(&nval); - } else { - LM_DBG("new cseq inc not requested\n"); - } + hfk = sr_hdr_get_z(&msg, cenv->uac_cseq_auth.s); + if(hfk!=NULL) { + LM_DBG("new cseq inc requested\n"); + nval = hfk->body; + trim(&nval); + } else { + LM_DBG("new cseq inc not requested\n"); } if(nval.len<=0) { @@ -418,6 +416,8 @@ int dlg_cseq_msg_sent(void *data) LM_DBG("cseq refresh requested\n"); nval = hfk->body; trim(&nval); + } else { + LM_DBG("cseq refresh not requested\n"); } } if(nval.len<=0) {

1 0

git:master:9456bb94: Merge pull request #923 from mslehto/unittest
by GitHub 11 Jan '17

11 Jan '17

Module: kamailio Branch: master Commit: 9456bb94c78dec50101a0328e5b8ee17278dd60e URL: https://github.com/kamailio/kamailio/commit/9456bb94c78dec50101a0328e5b8ee1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-01-11T09:21:50+01:00 Merge pull request #923 from mslehto/unittest unittest updates --- Modified: test/unit/12.cfg Modified: test/unit/12.sh Modified: test/unit/18.sh Modified: test/unit/19.cfg Modified: test/unit/19.sh Modified: test/unit/2.cfg Modified: test/unit/2.sh Modified: test/unit/20.cfg Modified: test/unit/20.sh Modified: test/unit/27.sh Modified: test/unit/33.cfg Modified: test/unit/33.sh Modified: test/unit/34.cfg Modified: test/unit/34.sh Modified: test/unit/4.sh Modified: test/unit/5.sh Modified: test/unit/7.cfg Modified: test/unit/7.sh Modified: test/unit/include/common Modified: test/unit/presence.cfg --- Diff: https://github.com/kamailio/kamailio/commit/9456bb94c78dec50101a0328e5b8ee1… Patch: https://github.com/kamailio/kamailio/commit/9456bb94c78dec50101a0328e5b8ee1…

1 0

git:master:1d5d3655: test/unit: use sh instead of bash in unit test 5
by Mikko Lehto 11 Jan '17

11 Jan '17

Module: kamailio Branch: master Commit: 1d5d36556e28bcbd0500701440a87617e9d79497 URL: https://github.com/kamailio/kamailio/commit/1d5d36556e28bcbd0500701440a8761… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-01-11T01:48:13+02:00 test/unit: use sh instead of bash in unit test 5 --- Modified: test/unit/5.sh --- Diff: https://github.com/kamailio/kamailio/commit/1d5d36556e28bcbd0500701440a8761… Patch: https://github.com/kamailio/kamailio/commit/1d5d36556e28bcbd0500701440a8761… --- diff --git a/test/unit/5.sh b/test/unit/5.sh index cb44738..97c28d1 100755 --- a/test/unit/5.sh +++ b/test/unit/5.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # loads the kamailio default config # Copyright (C) 2007 1&1 Internet AG

1 0

git:master:f31d36e3: test/unit: update unit test 34
by Mikko Lehto 11 Jan '17

11 Jan '17

Module: kamailio Branch: master Commit: f31d36e31133175c7bf466e2ab9bbc4d7836496e URL: https://github.com/kamailio/kamailio/commit/f31d36e31133175c7bf466e2ab9bbc4… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-01-11T01:48:02+02:00 test/unit: update unit test 34 - sh instead of bash - pua_mi is not part of Kamailio anymore - server_address is mandatory parameter for rls --- Modified: test/unit/34.cfg Modified: test/unit/34.sh --- Diff: https://github.com/kamailio/kamailio/commit/f31d36e31133175c7bf466e2ab9bbc4… Patch: https://github.com/kamailio/kamailio/commit/f31d36e31133175c7bf466e2ab9bbc4… --- diff --git a/test/unit/34.cfg b/test/unit/34.cfg index c9f7c0c..473bf10 100644 --- a/test/unit/34.cfg +++ b/test/unit/34.cfg @@ -6,7 +6,6 @@ loadmodule "presence_xml.so" loadmodule "presence_mwi.so" loadmodule "pua.so" loadmodule "pua_bla.so" -loadmodule "pua_mi.so" loadmodule "pua_usrloc.so" loadmodule "xmpp.so" loadmodule "pua_xmpp.so" @@ -16,10 +15,12 @@ loadmodule "presence_dialoginfo.so" loadmodule "rr.so" loadmodule "dialog.so" loadmodule "pua_dialoginfo.so" +loadmodule "pv.so" +modparam("xmpp", "xmpp_host", "example.invalid"); modparam("rls", "xcap_root", "http://localhost/xcap-root:8000") modparam("presence_xml", "integrated_xcap_server", 1) modparam("pua_bla|pua_usrloc", "default_domain", "localhost") modparam("pua_bla", "header_name", "Sender") -modparam("pua_bla|pua_xmpp", "server_address", "sip:bla@127.0.0.1") +modparam("pua_bla|pua_xmpp|rls", "server_address", "sip:bla@127.0.0.1") modparam("dialog", "dlg_flag", 10) diff --git a/test/unit/34.sh b/test/unit/34.sh index 8cce1da..adc8213 100755 --- a/test/unit/34.sh +++ b/test/unit/34.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # load all presence related modules with mysql # Copyright (C) 2008 1&1 Internet AG @@ -21,9 +21,9 @@ # Needs a default kamailio database setup for mysql -source include/common -source include/require -source include/database +. include/common +. include/require.sh +. include/database.sh CFG=34.cfg @@ -31,7 +31,7 @@ if ! (check_kamailio && check_module "db_mysql" && check_module "presence" \ && check_module "presence_xml" && check_module "pua" \ && check_module "xcap_client" && check_module "rls" \ && check_module "presence_mwi" && check_module "pua_bla" \ - && check_module "pua_mi" && check_module "pua_usrloc" \ + && check_module "pua_usrloc" \ && check_module "pua_xmpp" && check_module "xmpp" \ && check_module "presence_dialoginfo" && check_module "pua_dialoginfo" \ && check_mysql); then @@ -43,7 +43,7 @@ cp $CFG $CFG.bak echo "loadmodule \"db_mysql/db_mysql.so\"" >> $CFG # start -$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG > /dev/null +$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG -a no > /dev/null ret=$? sleep 1

1 0

git:master:ff6ce3bb: test/unit: update unit test 27
by Mikko Lehto 11 Jan '17

11 Jan '17

Module: kamailio Branch: master Commit: ff6ce3bb0bb5581bdcc802e3be61b9e7a37d5d57 URL: https://github.com/kamailio/kamailio/commit/ff6ce3bb0bb5581bdcc802e3be61b9e… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-01-11T01:47:46+02:00 test/unit: update unit test 27 - change mi_fifo to jsonrpcs - sh instead of bash - reorder module load order to avoid sl error --- Modified: test/unit/27.sh Modified: test/unit/presence.cfg --- Diff: https://github.com/kamailio/kamailio/commit/ff6ce3bb0bb5581bdcc802e3be61b9e… Patch: https://github.com/kamailio/kamailio/commit/ff6ce3bb0bb5581bdcc802e3be61b9e… --- diff --git a/test/unit/27.sh b/test/unit/27.sh index 8d837b6..21b6e94 100755 --- a/test/unit/27.sh +++ b/test/unit/27.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # test publish and subscribe for presence # Copyright (C) 2007 1&1 Internet AG diff --git a/test/unit/presence.cfg b/test/unit/presence.cfg index 299a4bf..6bf1c6d 100644 --- a/test/unit/presence.cfg +++ b/test/unit/presence.cfg @@ -1,6 +1,4 @@ # -# $Id$ -# # simple quick-start config script - Stand-alone presence server # @@ -20,15 +18,15 @@ rev_dns=no # ------------------ module loading ---------------------------------- loadmodule "db_mysql/db_mysql.so" -loadmodule "sl/sl.so" loadmodule "maxfwd/maxfwd.so" loadmodule "textops/textops.so" loadmodule "tm/tm.so" +loadmodule "sl/sl.so" loadmodule "rr/rr.so" loadmodule "presence/presence.so" loadmodule "presence_xml/presence_xml.so" loadmodule "avpops/avpops.so" -loadmodule "mi_fifo/mi_fifo.so" +loadmodule "jsonrpcs/jsonrpcs.so" # ----------------- setting module-specific parameters --------------- @@ -43,7 +41,9 @@ modparam("presence_xml", "force_active", 1) modparam("presence", "server_address", "sip:10.10.10.10:5060") -modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo_presence") +#odparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo_presence") +modparam("jsonrpcs", "transport", 2) +modparam("jsonrpcs", "fifo_name", "kamailio_rpc.fifo") # ------------------------- request routing logic -------------------

1 0

git:master:25c4d4f3: test/unit: update unit test 20
by Mikko Lehto 11 Jan '17

11 Jan '17

Module: kamailio Branch: master Commit: 25c4d4f32a4b20419e2129398678790037fc2502 URL: https://github.com/kamailio/kamailio/commit/25c4d4f32a4b20419e2129398678790… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-01-11T01:47:31+02:00 test/unit: update unit test 20 - change stream redirection to classic 2>&1 - sh instead of bash - change mi_fifo to jsonrpcs --- Modified: test/unit/20.cfg Modified: test/unit/20.sh --- Diff: https://github.com/kamailio/kamailio/commit/25c4d4f32a4b20419e2129398678790… Patch: https://github.com/kamailio/kamailio/commit/25c4d4f32a4b20419e2129398678790… --- diff --git a/test/unit/20.cfg b/test/unit/20.cfg index 8bcd936..858ab7c 100644 --- a/test/unit/20.cfg +++ b/test/unit/20.cfg @@ -18,12 +18,13 @@ loadmodule "sl/sl.so" loadmodule "maxfwd/maxfwd.so" loadmodule "acc/acc.so" #for debugging purposes only -loadmodule "mi_fifo/mi_fifo.so" +loadmodule "jsonrpcs/jsonrpcs.so" loadmodule "xlog/xlog.so" #-----------------------Module parameters------------------------------------- -modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") +modparam("jsonrpcs", "transport", 2) +modparam("jsonrpcs", "fifo_name", "kamailio_rpc.fifo") modparam("usrloc", "db_mode", 3) modparam("usrloc", "db_url", "mysql://kamailio:kamailiorw@127.0.0.1/kamailio") modparam("acc", "log_flag", 1) diff --git a/test/unit/20.sh b/test/unit/20.sh index 2e2fec1..d8d0405 100755 --- a/test/unit/20.sh +++ b/test/unit/20.sh @@ -1,4 +1,4 @@ -#! /bin/bash +#!/bin/sh # test basic accounting functionality # Copyright (C) 2007 1&1 Internet AG @@ -33,11 +33,11 @@ TMPFILE=`mktemp -t kamailio-test.XXXXXXXXXX` # add an registrar entry to the db; $MYSQL "INSERT INTO location (ruid, username,contact,socket,user_agent,cseq,q) VALUES (\"kamailio-test-uid\",\"foo\",\"sip:foo@127.0.0.1\",\"udp:127.0.0.1:5060\",\"kamailio_test\",1,-1);" -sipp -sn uas -bg -i 127.0.0.1 -m 1 -f 10 -p 5060 &> /dev/null +sipp -sn uas -bg -i 127.0.0.1 -m 1 -f 10 -p 5060 > /dev/null 2>&1 $BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG > $TMPFILE 2>&1 -sipp -sn uac -s foo 127.0.0.1:5059 -i 127.0.0.1 -m 1 -f 10 -p 5061 &> /dev/null +sipp -sn uac -s foo 127.0.0.1:5059 -i 127.0.0.1 -m 1 -f 10 -p 5061 > /dev/null 2>&1 egrep 'ACC:[[:space:]]+transaction[[:space:]]+answered:[[:print:]]*code=200;reason=OK$' $TMPFILE > /dev/null ret=$? @@ -45,7 +45,7 @@ ret=$? sleep 1 # cleanup -killall -9 sipp &> /dev/null +killall -9 sipp > /dev/null 2>&1 kill_kamailio rm $TMPFILE

1 0

git:master:4ad8091d: test/unit: update unit test 19
by Mikko Lehto 11 Jan '17

11 Jan '17

Module: kamailio Branch: master Commit: 4ad8091da6f848ca831006d6993f45cc7b2934a0 URL: https://github.com/kamailio/kamailio/commit/4ad8091da6f848ca831006d6993f45c… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-01-11T01:47:11+02:00 test/unit: update unit test 19 - does not need bash - change mi_fifo to jsonrpcs --- Modified: test/unit/19.cfg Modified: test/unit/19.sh --- Diff: https://github.com/kamailio/kamailio/commit/4ad8091da6f848ca831006d6993f45c… Patch: https://github.com/kamailio/kamailio/commit/4ad8091da6f848ca831006d6993f45c… --- diff --git a/test/unit/19.cfg b/test/unit/19.cfg index 0aefe73..ccc1e0e 100644 --- a/test/unit/19.cfg +++ b/test/unit/19.cfg @@ -18,12 +18,13 @@ loadmodule "sl/sl.so" loadmodule "maxfwd/maxfwd.so" loadmodule "pv/pv.so" #for debugging purposes only -loadmodule "mi_fifo/mi_fifo.so" +loadmodule "jsonrpcs" loadmodule "xlog/xlog.so" #-----------------------Module parameters------------------------------------- -modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") +modparam("jsonrpcs", "transport", 2) +modparam("jsonrpcs", "fifo_name", "kamailio_rpc.fifo") modparam("usrloc", "db_mode", 3) modparam("usrloc", "db_url", "mysql://kamailio:kamailiorw@localhost/kamailio") diff --git a/test/unit/19.sh b/test/unit/19.sh index 2cbf18f..8815aa0 100755 --- a/test/unit/19.sh +++ b/test/unit/19.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # check user lookup for proxy functionality with usrloc and registrar for mysql # Copyright (C) 2007 1&1 Internet AG @@ -36,9 +36,9 @@ UAC=5080 # add an registrar entry to the db; $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 > /dev/null -sipp -sn uas -bg -i localhost -m 10 -f 2 -p $UAS &> /dev/null -sipp -sn uac -s foo 127.0.0.1:$SRV -i localhost -m 10 -f 2 -p $UAC &> /dev/null +$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG -a no > /dev/null +sipp -sn uas -bg -i 127.0.0.1 -m 10 -f 2 -p $UAS > /dev/null 2>&1 +sipp -sn uac -s foo 127.0.0.1:$SRV -i 127.0.0.1 -m 10 -f 2 -p $UAC > /dev/null 2>&1 ret=$?

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2017