sr-dev

sr-dev@lists.kamailio.org

10 participants
42696 discussions

by Marius Zbihlei

Module: sip-router Branch: master Commit: a34219547aea940755ea1b4532e0b672f8363c51 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a342195… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Oct 14 16:53:27 2009 +0300 Test 20.sh fixed Fixed module loading Checked contact data into location db as using localhost couldn't be resolved by ser Fixed regex for ACC as new dprint sources add some extra info --- test/unit/20.cfg | 8 ++++---- test/unit/20.sh | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test/unit/20.cfg b/test/unit/20.cfg index 409ca1a..7405967 100644 --- a/test/unit/20.cfg +++ b/test/unit/20.cfg @@ -6,16 +6,16 @@ fork=yes log_stderror=yes listen=127.0.0.1 port=5059 -dns=no +dns=yes rev_dns=no #-----------------------Loading Modiules------------------------------------- -mpath="../modules/" -loadmodule "db_mysql/db_mysql.so" +mpath="../../modules_k/" +loadmodule "../../modules/tm/tm.so" +loadmodule "../../modules/db_mysql/db_mysql.so" loadmodule "usrloc/usrloc.so" loadmodule "registrar/registrar.so" loadmodule "sl/sl.so" -loadmodule "tm/tm.so" loadmodule "maxfwd/maxfwd.so" loadmodule "acc/acc.so" #for debugging purposes only diff --git a/test/unit/20.sh b/test/unit/20.sh index 1d2ca8b..d0f14d3 100755 --- a/test/unit/20.sh +++ b/test/unit/20.sh @@ -31,15 +31,15 @@ CFG="20.cfg" TMPFILE=`mktemp -t kamailio-test.XXXXXXXXXX` # add an registrar entry to the db; -$MYSQL "INSERT INTO location (username,contact,socket,user_agent,cseq,q) VALUES (\"foo\",\"sip:foo@localhost\",\"udp:127.0.0.1:5060\",\"ser_test\",1,-1);" +$MYSQL "INSERT INTO location (username,contact,socket,user_agent,cseq,q) VALUES (\"foo\",\"sip:foo@127.0.0.1\",\"udp:127.0.0.1:5060\",\"ser_test\",1,-1);" -sipp -sn uas -bg -i localhost -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 -../$BIN -w . -f $CFG &> $TMPFILE +$BIN -w . -f $CFG &> $TMPFILE sipp -sn uac -s foo 127.0.0.1:5059 -i 127.0.0.1 -m 1 -f 10 -p 5061 &> /dev/null -egrep '^ACC:[[:space:]]+transaction[[:space:]]+answered:[[:print:]]*code=200;reason=OK$' $TMPFILE > /dev/null +egrep 'ACC:[[:space:]]+transaction[[:space:]]+answered:[[:print:]]*code=200;reason=OK$' $TMPFILE > /dev/null ret=$? # cleanup @@ -47,6 +47,6 @@ killall -9 sipp &> /dev/null $KILL &> /dev/null rm $TMPFILE -$MYSQL "DELETE FROM location WHERE ((contact = \"sip:foo@localhost\") and (user_agent = \"ser_test\"));" +$MYSQL "DELETE FROM location WHERE ((contact = \"sip:foo@127.0.0.1\") and (user_agent = \"ser_test\"));" exit $ret;

14 years, 6 months

is gen_ha1 used?

by Daniel-Constantin Mierla

Hello, is gen_ha1 (from utils/gen_ha1) used anywhere in SR? It installs by default. Doing a recursive grep I couldn't find it. kamctl uses md5sum that comes with most of the distros to get same functionality without installing additional application. echo -n "username:domain:password" | md2sum | awk '{ print $1 }' Cheers, Daniel -- Daniel-Constantin Mierla * Kamailio SIP Masterclass, Nov 9-13, 2009, Berlin * http://www.asipto.com/index.php/sip-router-masterclass/

14 years, 6 months

[PATCH] Adding define/ifdef/ifndef to cfg preprocessing

by Bogdan Harjoc

Since include_file was just added, why not go one extra step and allow things like (adapted from etc/kamailio.cfg): #!define PRESENCE #!ifdef PRESENCE loadmodule "presence.so" loadmodule "presence_xml.so" #!else #!ifndef KAMAILIO ... #!endif #!endif M4 is already used and a better alternative IMO, but cfg is clearly not a typical language, so I imagine someone may find this useful. Patch against commit 7362f824. For a minimal test input, this can be used: ===== listen=::1 #!define xyz #!ifdef xyz listen=::2 #!ifndef abc listen=::3 #!else listen=::4 #!endif listen=::5 #!endif ===== While wr're at it, the ID token seemed wrong -- it misses _ids_that_start_with_underscores (?). Bogdan diff --git a/cfg.lex b/cfg.lex index 8490364..df4a2ee 100644 --- a/cfg.lex +++ b/cfg.lex @@ -105,6 +105,12 @@ #define PVAR_P_S 7 /* pvar: $(...) or $foo(...)*/ #define PVARID_S 8 /* $foo.bar...*/ #define STR_BETWEEN_S 9 + #define LINECOMMENT_S 10 + #define DEFINE_S 11 + #define DEFINE_EOL_S 12 + #define IFDEF_S 13 + #define IFDEF_EOL_S 14 + #define IFDEF_SKIP_S 15 #define STR_BUF_ALLOC_UNIT 128 struct str_buf{ @@ -152,11 +158,18 @@ struct sr_yy_fname *next; } *sr_yy_fname_list = 0; + static int pp_define(int len, const char * text); + static int pp_ifdef_type(int pos); + static void pp_ifdef_var(int len, const char * text); + static void pp_ifdef(); + static void pp_else(); + static void pp_endif(); %} /* start conditions */ %x STRING1 STRING2 STR_BETWEEN COMMENT COMMENT_LN ATTR SELECT AVP_PVAR PVAR_P %x PVARID INCLF +%x LINECOMMENT DEFINE_ID DEFINE_EOL IFDEF_ID IFDEF_EOL IFDEF_SKIP /* config script types : #!SER or #!KAMAILIO or #!MAX_COMPAT */ SER_CFG SER @@ -474,8 +487,9 @@ TLSv1 "tlsv1"|"TLSv1"|"TLSV1" LETTER [a-zA-Z] DIGIT [0-9] -ALPHANUM {LETTER}|{DIGIT}|[_] -ID {LETTER}{ALPHANUM}* +LETTER_ {LETTER}|[_] +ALPHANUM {LETTER_}|{DIGIT} +ID {LETTER_}{ALPHANUM}* NUM_ID {ALPHANUM}+ HEX [0-9a-fA-F] HEXNUMBER 0x{HEX}+ @@ -506,6 +520,12 @@ COM_LINE # COM_START "/\*" COM_END "\*/" +DEFINE define +IFDEF ifdef +IFNDEF ifndef +ENDIF endif +/* else is already defined */ + EAT_ABLE [\ \t\b\r] %% @@ -1121,7 +1141,36 @@ EAT_ABLE [\ \t\b\r] sr_cfg_compat=SR_COMPAT_KAMAILIO;} <INITIAL>{COM_LINE}!{MAXCOMPAT_CFG}{CR} { count(); sr_cfg_compat=SR_COMPAT_MAX;} -<INITIAL>{COM_LINE}.*{CR} { count(); } + +<INITIAL>{COM_LINE}!{DEFINE}{EAT_ABLE}+ { count(); + state = DEFINE_S; BEGIN(DEFINE_ID); } +<DEFINE_ID>{ID} { count(); + if (pp_define(yyleng, yytext)) return 1; + state = DEFINE_EOL_S; BEGIN(DEFINE_EOL); } +<DEFINE_EOL>{EAT_ABLE}*{CR} { count(); + state = INITIAL; BEGIN(INITIAL); } + +<INITIAL,IFDEF_SKIP>{COM_LINE}!{IFDEF}{EAT_ABLE}+ { count(); + if (pp_ifdef_type(1)) return 1; + state = IFDEF_S; BEGIN(IFDEF_ID); } +<INITIAL,IFDEF_SKIP>{COM_LINE}!{IFNDEF}{EAT_ABLE}+ { count(); + if (pp_ifdef_type(0)) return 1; + state = IFDEF_S; BEGIN(IFDEF_ID); } +<IFDEF_ID>{ID} { count(); + pp_ifdef_var(yyleng, yytext); + state = IFDEF_EOL_S; BEGIN(IFDEF_EOL); } +<IFDEF_EOL>{EAT_ABLE}*{CR} { count(); pp_ifdef(); } + +<INITIAL,IFDEF_SKIP>{COM_LINE}!{ELSE}{EAT_ABLE}*{CR} { count(); pp_else(); } + +<INITIAL,IFDEF_SKIP>{COM_LINE}!{ENDIF}{EAT_ABLE}*{CR} { count(); pp_endif(); } + + /* we're in an ifdef that evaluated to false -- throw it away */ +<IFDEF_SKIP>.|{CR} { count(); } + + /* this is split so the shebangs match more, giving them priority */ +<INITIAL>{COM_LINE} { count(); state = LINECOMMENT_S; BEGIN(LINECOMMENT); } +<LINECOMMENT>.*{CR} { count(); state = INITIAL_S; BEGIN(INITIAL); } <INITIAL>{ID} { count(); addstr(&s_buf, yytext, yyleng); yylval.strval=s_buf.s; @@ -1472,3 +1521,102 @@ static int sr_pop_yy_state() return 0; } +/* define/ifdef support */ + +#define MAX_DEFINES 1024 +static str pp_defines[MAX_DEFINES]; +static int pp_num_defines = 0; + +/* pp_ifdef_stack[i] is 1 if the ifdef test at depth i is either + * ifdef(defined), ifndef(undefined), or the opposite of these + * two, but in an else branch + */ +#define MAX_IFDEFS 16 +static int pp_ifdef_stack[MAX_IFDEFS]; +static int pp_sptr = 0; /* stack pointer */ + +static int pp_lookup(int len, const char * text) +{ + str var = {(char *)text, len}; + int i; + + for (i=0; i<pp_num_defines; i++) + if (STR_EQ(pp_defines[i], var)) + return i; + + return -1; +} + +static int pp_define(int len, const char * text) +{ + if (pp_num_defines == MAX_DEFINES) { + LOG(L_CRIT, "ERROR: too many defines -- adjust MAX_DEFINES\n"); + return -1; + } + + if (pp_lookup(len, text) >= 0) { + LOG(L_CRIT, "ERROR: already defined: %.*s\n", len, text); + return -1; + } + + pp_defines[pp_num_defines].len = len; + pp_defines[pp_num_defines].s = (char*)pkg_malloc(len+1); + memcpy(pp_defines[pp_num_defines].s, text, len); + pp_num_defines++; + + return 0; +} + +static int pp_ifdef_type(int type) +{ + if (pp_sptr == MAX_IFDEFS) { + LOG(L_CRIT, "ERROR: too many nested ifdefs -- adjust MAX_IFDEFS\n"); + return -1; + } + + pp_ifdef_stack[pp_sptr] = type; + return 0; +} + +/* this sets the result of the if[n]def expr: + * ifdef defined -> 1 + * ifdef undefined -> 0 + * ifndef defined -> 0 + * ifndef undefined -> 1 + */ +static void pp_ifdef_var(int len, const char * text) +{ + pp_ifdef_stack[pp_sptr] ^= (pp_lookup(len, text) < 0); +} + +static void pp_update_state() +{ + int i; + + for (i=0; i<pp_sptr; i++) + if (! pp_ifdef_stack[i]) { + state = IFDEF_SKIP_S; BEGIN(IFDEF_SKIP); + return; + } + + state = INITIAL; BEGIN(INITIAL); +} + +static void pp_ifdef() +{ + pp_sptr++; + pp_update_state(); +} + +static void pp_else() +{ + pp_ifdef_stack[pp_sptr-1] ^= 1; + pp_update_state(); +} + +static void pp_endif() +{ + pp_sptr--; + pp_update_state(); +} +

14 years, 6 months

git:sr_3.0: lib/srdb1/schema/trusted.xml: forgot to increase version number

by Juha Heinanen

Module: sip-router Branch: sr_3.0 Commit: 959b95ff5490c144b726362285ae7df9ba80ab1b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=959b95f… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Oct 14 15:39:15 2009 +0300 lib/srdb1/schema/trusted.xml: forgot to increase version number - Forgot to increase version number of trusted table after increasing size of tag field. --- lib/srdb1/schema/trusted.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/srdb1/schema/trusted.xml b/lib/srdb1/schema/trusted.xml index e2cee2f..179e3f4 100644 --- a/lib/srdb1/schema/trusted.xml +++ b/lib/srdb1/schema/trusted.xml @@ -9,7 +9,7 @@ <table id="trusted" xmlns:db="http://docbook.org/ns/docbook"> <name>trusted</name> - <version>4</version> + <version>5</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>This table is used by the permissions module to determine if a call has the appropriate permission to be established. More information about the permissions module can be found at: &KAMAILIO_MOD_DOC;permissions.html

14 years, 6 months

git:sr_3.0: lib/srdb1/schema/trusted.xml: increased tag length from 32 to 64 chars

by Juha Heinanen

Module: sip-router Branch: sr_3.0 Commit: 0312ea0bbb0bfd442e27e3ee791f66c4fcf68dcc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0312ea0… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Oct 14 15:27:00 2009 +0300 lib/srdb1/schema/trusted.xml: increased tag length from 32 to 64 chars --- lib/srdb1/schema/trusted.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/srdb1/schema/trusted.xml b/lib/srdb1/schema/trusted.xml index 2a5c185..e2cee2f 100644 --- a/lib/srdb1/schema/trusted.xml +++ b/lib/srdb1/schema/trusted.xml @@ -53,7 +53,7 @@ <column> <name>tag</name> <type>string</type> - <size>32</size> + <size>64</size> <null/> <description>Tag</description> </column>

14 years, 6 months

git:master: Test 19

by Marius Zbihlei

Module: sip-router Branch: master Commit: aae7a8ff5ff19186219b80511e15e7f538f10945 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aae7a8f… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Oct 14 14:50:09 2009 +0300 Test 19 Fixed tm loading order Fixed path of ser executable --- test/unit/19.cfg | 2 +- test/unit/19.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unit/19.cfg b/test/unit/19.cfg index a398fff..6f3ad8b 100644 --- a/test/unit/19.cfg +++ b/test/unit/19.cfg @@ -11,11 +11,11 @@ rev_dns=no #-----------------------Loading Modules------------------------------------- mpath="../../modules_k/" +loadmodule "../../modules/tm/tm.so" loadmodule "../../modules/db_mysql/db_mysql.so" loadmodule "usrloc/usrloc.so" loadmodule "registrar/registrar.so" loadmodule "sl/sl.so" -loadmodule "../../modules/tm/tm.so" loadmodule "maxfwd/maxfwd.so" loadmodule "pv/pv.so" #for debugging purposes only diff --git a/test/unit/19.sh b/test/unit/19.sh index ff56e83..bdd8143 100755 --- a/test/unit/19.sh +++ b/test/unit/19.sh @@ -36,7 +36,7 @@ UAC=5080 # add an registrar entry to the db; $MYSQL "INSERT INTO location (username,contact,socket,user_agent,cseq,q) VALUES (\"foo\",\"sip:foo@localhost:$UAS\",\"udp:127.0.0.1:$UAS\",\"ser_test\",1,-1);" -../$BIN -w . -f $CFG &> /dev/null +$BIN -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

14 years, 6 months

git:master: Fixed path of ser exacutable in test(18.sh)

by Marius Zbihlei

Module: sip-router Branch: master Commit: 2b6a11bc628c2579bf8b6fdece55e01afa3bc769 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2b6a11b… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Oct 14 14:22:28 2009 +0300 Fixed path of ser exacutable in test(18.sh) Improved cleaning of files(18.sh) --- test/unit/18.sh | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/test/unit/18.sh b/test/unit/18.sh index a93e7cc..0dd0c0f 100755 --- a/test/unit/18.sh +++ b/test/unit/18.sh @@ -34,7 +34,7 @@ CFG=18.cfg echo -e "debug=3" > $CFG # start: -../$BIN -f ./$CFG -l 127.0.0.1 -n 0 -rR -v -E -d -T -N 0 -b 23 -m 42 -w ./ -u $(id -u) -g $(id -g) -P ./pid.out -G ./pgid.out > /dev/null 2>&1 +$BIN -f ./$CFG -l 127.0.0.1 -n 0 -rR -v -E -d -T -N 0 -b 23 -m 42 -w ./ -u $(id -u) -g $(id -g) -P ./pid.out -G ./pgid.out > /dev/null 2>&1 ret=$? @@ -44,4 +44,7 @@ sleep 1 $KILL rm $CFG +rm -f ./pid.out +rm -f ./pgid.out + exit $ret

14 years, 6 months

git:kamailio_3.0: core: added new event SREV_CORE_STATS

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 47c89177ce276cdf8f6a2d06fdd3359ba283fe4c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=47c8917… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 13 20:47:35 2009 +0200 core: added new event SREV_CORE_STATS - to be used by Kamailio core statistics not included in stock SR core --- events.c | 12 ++++++++++++ events.h | 2 ++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/events.c b/events.c index 0d07395..be98221 100644 --- a/events.c +++ b/events.c @@ -48,6 +48,11 @@ int sr_event_register_cb(int type, sr_event_cb_f f) _sr_events_list.net_data_out = f; else return -1; break; + case SREV_CORE_STATS: + if(_sr_events_list.core_stats==0) + _sr_events_list.core_stats = f; + else return -1; + break; default: return -1; } @@ -91,6 +96,13 @@ int sr_event_exec(int type, void *data) return ret; } else return 1; break; + case SREV_CORE_STATS: + if(unlikely(_sr_events_list.core_stats!=0)) + { + ret = _sr_events_list.core_stats(data); + return ret; + } else return 1; + break; default: return -1; } diff --git a/events.h b/events.h index 9fda619..9af0d71 100644 --- a/events.h +++ b/events.h @@ -25,12 +25,14 @@ #define SREV_NET_DATA_IN 1 #define SREV_NET_DATA_OUT 2 +#define SREV_CORE_STATS 3 typedef int (*sr_event_cb_f)(void *data); typedef struct sr_event_cb { sr_event_cb_f net_data_in; sr_event_cb_f net_data_out; + sr_event_cb_f core_stats; } sr_event_cb_t; void sr_event_cb_init(void);

14 years, 6 months

git:master: Fix path for dbtext

by Marius Zbihlei

Module: sip-router Branch: master Commit: 2605ea2432193a75ded29f522df996ea8fbcb4f4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2605ea2… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Oct 14 14:05:44 2009 +0300 Fix path for dbtext --- test/unit/15.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/unit/15.sh b/test/unit/15.sh index 3938e98..14b0e08 100755 --- a/test/unit/15.sh +++ b/test/unit/15.sh @@ -30,7 +30,7 @@ fi ; echo "loadmodule \"../../modules_k/db_text/db_text.so\"" >> $CFG cat 2.cfg >> $CFG -echo "modparam(\"$DB_ALL_MOD\", \"db_url\", \"text://`pwd`/../../scripts/dbtext/kamailio\")" >> $CFG +echo "modparam(\"$DB_ALL_MOD\", \"db_url\", \"text://`pwd`/../../utils/kamctl/dbtext/kamailio\")" >> $CFG $BIN -w . -f $CFG > /dev/null ret=$?

14 years, 6 months

git:master: Fixed loading of tm module in test

by Marius Zbihlei

Module: sip-router Branch: master Commit: 9e9f4383d19e891415469f5a06fa1734d73951b5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9e9f438… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Oct 14 13:13:15 2009 +0300 Fixed loading of tm module in test Fixed variable name ($fU instead of $fu) Test now runs ok --- test/unit/12.cfg | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unit/12.cfg b/test/unit/12.cfg index d1e11c7..1fcc96d 100644 --- a/test/unit/12.cfg +++ b/test/unit/12.cfg @@ -2,8 +2,8 @@ log_stderror=yes listen=127.0.0.1 loadpath "../../modules_k/" loadmodule "../../modules/db_mysql/db_mysql.so" -loadmodule "sl" loadmodule "../../modules/tm/tm.so" +loadmodule "sl" loadmodule "rr" loadmodule "maxfwd" loadmodule "textops" @@ -94,7 +94,7 @@ route[39] { $avp(i:82)=$(pu{uri.domain}); $avp(i:83)=$pu; xlog("L_ERR", "Getting identity from P-Preferred-Identity header\n"); - } else if ($fu) { + } else if ($fU) { $avp(i:81)=$(fu{uri.user}); $avp(i:82)=$(fu{uri.domain}); $avp(i:83)=$fu;

14 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