sr-dev May 2009

sr-dev@lists.kamailio.org

26 participants
263 discussions

git:master: presence: fixed bug in taking the parsed event structure
by Daniel-Constantin Mierla 06 May '09

06 May '09

Module: sip-router Branch: master Commit: aeb3faa191f3cad69b1f4179889279dc19aa4bd6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aeb3faa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed May 6 20:52:32 2009 +0200 presence: fixed bug in taking the parsed event structure --- modules_k/presence/publish.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/presence/publish.c b/modules_k/presence/publish.c index bb7c653..a329433 100644 --- a/modules_k/presence/publish.c +++ b/modules_k/presence/publish.c @@ -334,7 +334,7 @@ int handle_publish(struct sip_msg* msg, char* sender_uri, char* str2) goto unsupported_event; /* search event in the list */ - event= search_event((event_t*)msg->event->type); + event= search_event((event_t*)msg->event->parsed); if(event== NULL) { goto unsupported_event;

1 0

git:master: core: PUBLISH and REFER recognized by first line parser
by Daniel-Constantin Mierla 06 May '09

06 May '09

Module: sip-router Branch: master Commit: 8b5212639540cb5cc85e648fb2e59d43714fecdb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8b52126… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed May 6 20:53:56 2009 +0200 core: PUBLISH and REFER recognized by first line parser - still duplicity of getting the method - parse_metod() and macro by parsing first line --- parser/parse_fline.c | 2 ++ parser/parse_fline.h | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/parser/parse_fline.c b/parser/parse_fline.c index 81b235f..f5fb400 100644 --- a/parser/parse_fline.c +++ b/parser/parse_fline.c @@ -127,6 +127,8 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start * fl) else IFISMETHOD( OPTIONS, 'O') else IFISMETHOD( PRACK, 'P') else IFISMETHOD( UPDATE, 'U') + else IFISMETHOD( REFER, 'R') + else IFISMETHOD( PUBLISH, 'P') /* if you want to add another method XXX, include METHOD_XXX in H-file (this is the value which you will take later in processing and define XXX_LEN as length of method name; diff --git a/parser/parse_fline.h b/parser/parse_fline.h index aae71a4..8e581b4 100644 --- a/parser/parse_fline.h +++ b/parser/parse_fline.h @@ -62,6 +62,8 @@ #define OPTIONS_LEN 7 #define PRACK_LEN 5 #define UPDATE_LEN 6 +#define REFER_LEN 5 +#define PUBLISH_LEN 7 struct msg_start { int type; /* Type of the Message - Request/Response */

1 0

git:master: tmx: doc updated
by Daniel-Constantin Mierla 06 May '09

06 May '09

Module: sip-router Branch: master Commit: 87d5961121ade01714ac9717caa9691f6b6a9e9c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=87d5961… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun May 3 15:39:05 2009 +0200 tmx: doc updated --- modules_k/tmx/README | 183 ++++++++++++++++++++++++++++----------- modules_k/tmx/doc/tmx_admin.xml | 41 +++++++++ 2 files changed, 175 insertions(+), 49 deletions(-) diff --git a/modules_k/tmx/README b/modules_k/tmx/README index 8342571..83d6e37 100644 --- a/modules_k/tmx/README +++ b/modules_k/tmx/README @@ -18,57 +18,125 @@ Daniel-Constantin Mierla 1. Admin Guide - 1.1. Overview - 1.2. Dependencies - - 1.2.1. Kamailio Modules - 1.2.2. External Libraries or Applications - - 1.3. Exported pseudo-variables - 1.4. Exported MI Functions - - 1.4.1. t_uac_dlg - 1.4.2. t_uac_cancel - 1.4.3. t_hash - 1.4.4. t_reply - - 1.5. Exported statistics - - 1.5.1. received_replies - 1.5.2. relayed_replies - 1.5.3. local_replies - 1.5.4. UAS_transactions - 1.5.5. UAC_transactions - 1.5.6. 2xx_transactions - 1.5.7. 3xx_transactions - 1.5.8. 4xx_transactions - 1.5.9. 5xx_transactions - 1.5.10. 6xx_transactions - 1.5.11. inuse_transactions + 1. Overview + 2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + + 3. Exported Functions + + 3.1. t_cancel_branches(which) + + 4. Exported pseudo-variables + 5. Exported MI Functions + + 5.1. t_uac_dlg + 5.2. t_uac_cancel + 5.3. t_hash + 5.4. t_reply + + 6. Exported statistics + + 6.1. received_replies + 6.2. relayed_replies + 6.3. local_replies + 6.4. UAS_transactions + 6.5. UAC_transactions + 6.6. 2xx_transactions + 6.7. 3xx_transactions + 6.8. 4xx_transactions + 6.9. 5xx_transactions + 6.10. 6xx_transactions + 6.11. inuse_transactions + + List of Examples + + 1.1. t_cancel_branches usage Chapter 1. Admin Guide -1.1. Overview + Table of Contents + + 1. Overview + 2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + + 3. Exported Functions + + 3.1. t_cancel_branches(which) + + 4. Exported pseudo-variables + 5. Exported MI Functions + + 5.1. t_uac_dlg + 5.2. t_uac_cancel + 5.3. t_hash + 5.4. t_reply + + 6. Exported statistics + + 6.1. received_replies + 6.2. relayed_replies + 6.3. local_replies + 6.4. UAS_transactions + 6.5. UAC_transactions + 6.6. 2xx_transactions + 6.7. 3xx_transactions + 6.8. 4xx_transactions + 6.9. 5xx_transactions + 6.10. 6xx_transactions + 6.11. inuse_transactions + +1. Overview This module collects extensions from Kamailio TM module. Kamailio TM (Transaction Management) module documentation is available at: http://www.kamailio.org/docs/modules/1.5.x/tm.html -1.2. Dependencies +2. Dependencies -1.2.1. Kamailio Modules + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + +2.1. Kamailio Modules The following modules must be loaded before this module: * tm - transaction management. -1.2.2. External Libraries or Applications +2.2. External Libraries or Applications The following libraries or applications must be installed before running Kamailio with this module loaded: * None. -1.3. Exported pseudo-variables +3. Exported Functions + + 3.1. t_cancel_branches(which) + +3.1. t_cancel_branches(which) + + Cancel branches of an active SIP transaction. The function can be + called for a SIP reply that will identify the current branch. + + Parameter can be:. + * all - cancel all branches. + * others - cancel all branches but the current one. + * this - cancel current branch. + + This function can be used in ONREPLY_ROUTE. + + Example 1.1. t_cancel_branches usage +... +if (t_cancel_branches("all")) { + xlog("cancelled all branches\n"); +} +... + +4. Exported pseudo-variables * $T_branch_idx * $T_reply_code @@ -78,9 +146,14 @@ Chapter 1. Admin Guide Exported pseudo-variables are documented at http://www.kamailio.org/dokuwiki/. -1.4. Exported MI Functions +5. Exported MI Functions + + 5.1. t_uac_dlg + 5.2. t_uac_cancel + 5.3. t_hash + 5.4. t_reply -1.4.1. t_uac_dlg +5.1. t_uac_dlg Generates and sends a local SIP request. @@ -95,7 +168,7 @@ Chapter 1. Admin Guide * body - (optional, may not be present) request body (if present, requires the "Content-Type" and "Content-length" headers) -1.4.2. t_uac_cancel +5.2. t_uac_cancel Generates and sends a CANCEL for an existing local SIP request. @@ -103,14 +176,14 @@ Chapter 1. Admin Guide * callid - callid of the INVITE request to be cancelled. * cseq - cseq of the INVITE request to be cancelled. -1.4.3. t_hash +5.3. t_hash Gets information about the load of TM internal hash table. Parameters: * none -1.4.4. t_reply +5.4. t_reply Generates and sends a reply for an existing inbound SIP transaction. @@ -124,51 +197,63 @@ Chapter 1. Admin Guide * body - (optional, may not be present) reply body (if present, requires the "Content-Type" and "Content-length" headers) -1.5. Exported statistics +6. Exported statistics + + 6.1. received_replies + 6.2. relayed_replies + 6.3. local_replies + 6.4. UAS_transactions + 6.5. UAC_transactions + 6.6. 2xx_transactions + 6.7. 3xx_transactions + 6.8. 4xx_transactions + 6.9. 5xx_transactions + 6.10. 6xx_transactions + 6.11. inuse_transactions Exported statistics are listed in the next sections. All statistics except "inuse_transactions" can be reset. -1.5.1. received_replies +6.1. received_replies Total number of total replies received by TM module. -1.5.2. relayed_replies +6.2. relayed_replies Total number of replies received and relayed by TM module. -1.5.3. local_replies +6.3. local_replies Total number of replies local generated by TM module. -1.5.4. UAS_transactions +6.4. UAS_transactions Total number of transactions created by received requests. -1.5.5. UAC_transactions +6.5. UAC_transactions Total number of transactions created by local generated requests. -1.5.6. 2xx_transactions +6.6. 2xx_transactions Total number of transactions completed with 2xx replies. -1.5.7. 3xx_transactions +6.7. 3xx_transactions Total number of transactions completed with 3xx replies. -1.5.8. 4xx_transactions +6.8. 4xx_transactions Total number of transactions completed with 4xx replies. -1.5.9. 5xx_transactions +6.9. 5xx_transactions Total number of transactions completed with 5xx replies. -1.5.10. 6xx_transactions +6.10. 6xx_transactions Total number of transactions completed with 6xx replies. -1.5.11. inuse_transactions +6.11. inuse_transactions Number of transactions existing in memory at current time. diff --git a/modules_k/tmx/doc/tmx_admin.xml b/modules_k/tmx/doc/tmx_admin.xml index 9b0eb85..760125c 100644 --- a/modules_k/tmx/doc/tmx_admin.xml +++ b/modules_k/tmx/doc/tmx_admin.xml @@ -57,6 +57,47 @@ </section> <section> + <title>Exported Functions</title> + <section> + <title> + <function moreinfo="none">t_cancel_branches(which)</function> + </title> + <para> + Cancel branches of an active SIP transaction. The function can be + called for a SIP reply that will identify the current branch. + </para> + <para> + Parameter can be:. + </para> + <itemizedlist> + <listitem><para> + <emphasis>all</emphasis> - cancel all branches. + </para></listitem> + <listitem><para> + <emphasis>others</emphasis> - cancel all branches but + the current one. + </para></listitem> + <listitem><para> + <emphasis>this</emphasis> - cancel current branch. + </para></listitem> + </itemizedlist> + <para> + This function can be used in ONREPLY_ROUTE. + </para> + <example> + <title><function>t_cancel_branches</function> usage</title> + <programlisting format="linespecific"> +... +if (t_cancel_branches("all")) { + xlog("cancelled all branches\n"); +} +... +</programlisting> + </example> + </section> + </section> + + <section> <title>Exported pseudo-variables</title> <itemizedlist> <listitem><para>

3 6

git:master: test: port all registrar based tests (mysql, postgres, unixodbc ) to sr
by Henning Westerholt 06 May '09

06 May '09

Module: sip-router Branch: master Commit: 582d58306bbd4ce00a24f37099fff14aaaef87f0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=582d583… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed May 6 18:55:33 2009 +0200 test: port all registrar based tests (mysql, postgres, unixodbc) to sr --- test/unit/11.cfg | 24 ++++++++++++------------ test/unit/11.sh | 16 ++++++---------- test/unit/22.sh | 15 ++++++--------- test/unit/31.sh | 4 ++-- test/unit/39.sh | 4 ++-- test/unit/44.sh | 15 ++++++--------- 6 files changed, 34 insertions(+), 44 deletions(-) diff --git a/test/unit/11.cfg b/test/unit/11.cfg index 73f10fb..314bccb 100644 --- a/test/unit/11.cfg +++ b/test/unit/11.cfg @@ -1,26 +1,26 @@ # ----------- global configuration parameters ------------------------ -debug=3 +debug=2 fork=yes log_stderror=no children=1 disable_tcp=yes # ------------------ module loading ---------------------------------- -mpath="../modules/" -loadmodule "sl/sl.so" -loadmodule "tm/tm.so" -loadmodule "rr/rr.so" -loadmodule "maxfwd/maxfwd.so" -loadmodule "textops/textops.so" -loadmodule "xlog/xlog.so" -loadmodule "pv/pv.so" -loadmodule "mi_fifo/mi_fifo.so" +loadpath "../../modules_k/" +loadmodule "sl" +loadmodule "../../modules/tm/tm.so" +loadmodule "rr" +loadmodule "maxfwd" +loadmodule "textops" +loadmodule "xlog" +loadmodule "pv" +loadmodule "mi_fifo" modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") -loadmodule "usrloc/usrloc.so" +loadmodule "usrloc" modparam("usrloc", "db_mode", 1) -loadmodule "registrar/registrar.so" +loadmodule "registrar" modparam("registrar", "reg_callid_avp", "$avp(s:foobar)") modparam("registrar", "min_expires", 5) modparam("usrloc", "timer_interval", 2) diff --git a/test/unit/11.sh b/test/unit/11.sh index 1e065c8..8902e5c 100755 --- a/test/unit/11.sh +++ b/test/unit/11.sh @@ -31,9 +31,9 @@ fi ; cp $CFG $CFG.bak -echo "loadmodule \"db_mysql/db_mysql.so\"" >> $CFG +echo "loadmodule \"$SR_DIR/modules/db_mysql/db_mysql.so\"" >> $CFG -../$BIN -w . -f $CFG > /dev/null +$BIN -w . -f $CFG > /dev/null ret=$? sleep 1 @@ -43,10 +43,8 @@ sipsak -U -C sip:foobar@localhost -s sip:49721123456789@localhost -H localhost & sipsak -U -C sip:foobar1@localhost -s sip:49721123456789@localhost -H localhost &> /dev/null ret=$? -cd ../scripts - if [ "$ret" -eq 0 ]; then - ./$CTL ul show | grep "AOR:: 49721123456789" &> /dev/null + $CTL ul show | grep "AOR:: 49721123456789" &> /dev/null ret=$? fi; @@ -106,7 +104,7 @@ if [ "$ret" -eq 0 ]; then fi; if [ "$ret" -eq 0 ]; then - ./$CTL ul show | grep "AOR:: 49721123456789" > /dev/null + $CTL ul show | grep "AOR:: 49721123456789" > /dev/null ret=$? if [ "$ret" -eq 0 ]; then ret=1 @@ -160,7 +158,7 @@ fi; $KILL # restart to test preload_udomain functionality -../$BIN -w . -f ../test/$CFG > /dev/null +$BIN -w . -f $CFG > /dev/null ret=$? sleep 1 @@ -173,7 +171,7 @@ fi; # check if the methods value is correct if [ "$ret" -eq 0 ]; then - ./$CTL ul show | grep "Methods:: 4294967295" &> /dev/null + $CTL ul show | grep "Methods:: 4294967295" &> /dev/null ret=$? fi; @@ -182,8 +180,6 @@ $MYSQL "delete from location where username like '49721123456789%';" $KILL -cd ../test - mv $CFG.bak $CFG exit $ret \ No newline at end of file diff --git a/test/unit/22.sh b/test/unit/22.sh index 46ea775..aa990b2 100755 --- a/test/unit/22.sh +++ b/test/unit/22.sh @@ -30,10 +30,10 @@ fi ; CFG=11.cfg cp $CFG $CFG.tmp -echo "loadmodule \"db_postgres/db_postgres.so\"" >> $CFG +echo "loadmodule \"$SR_DIR/modules/db_postgres/db_postgres.so\"" >> $CFG echo "modparam(\"usrloc\", \"db_url\", \"postgres://openser:openserrw@localhost/openser\")" >> $CFG -../$BIN -w . -f $CFG > /dev/null +$BIN -w . -f $CFG > /dev/null ret=$? sleep 1 @@ -41,10 +41,8 @@ sleep 1 sipsak -U -C sip:foobar@localhost -s sip:49721123456789@localhost -H localhost &> /dev/null ret=$? -cd ../scripts - if [ "$ret" -eq 0 ]; then - ./$CTL ul show | grep "AOR:: 49721123456789" > /dev/null + $CTL ul show | grep "AOR:: 49721123456789" > /dev/null ret=$? fi; @@ -61,7 +59,7 @@ if [ "$ret" -eq 0 ]; then fi; if [ "$ret" -eq 0 ]; then - ./$CTL ul show | grep "AOR:: 49721123456789" > /dev/null + $CTL ul show | grep "AOR:: 49721123456789" > /dev/null ret=$? if [ "$ret" -eq 0 ]; then ret=1 @@ -85,7 +83,7 @@ fi; $KILL # restart to test preload_udomain functionality -../$BIN -w . -f ../test/$CFG > /dev/null +$BIN -w . -f $CFG > /dev/null ret=$? sleep 1 @@ -98,7 +96,7 @@ fi; # check if the methods value is correct if [ "$ret" -eq 0 ]; then - ./$CTL ul show | grep "Methods:: 4294967295" &> /dev/null + $CTL ul show | grep "Methods:: 4294967295" &> /dev/null ret=$? fi; @@ -106,7 +104,6 @@ $KILL $PSQL "delete from location where username like '49721123456789%';" -cd ../test mv $CFG.tmp $CFG exit $ret diff --git a/test/unit/31.sh b/test/unit/31.sh index 45cd5e5..5673d14 100755 --- a/test/unit/31.sh +++ b/test/unit/31.sh @@ -35,7 +35,7 @@ NR=50 cp $CFG $CFG.bak -echo "loadmodule \"db_mysql/db_mysql.so\"" >> $CFG +echo "loadmodule \"$SR_DIR/modules/db_mysql/db_mysql.so\"" >> $CFG echo "modparam(\"usrloc\", \"fetch_rows\", 13)" >> $CFG COUNTER=0 @@ -44,7 +44,7 @@ while [ $COUNTER -lt $NR ]; do $MYSQL "insert into location (username, domain, contact, user_agent) values ('foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); insert into location (username, domain, contact, user_agent) values ('foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); insert into location (username, domain, contact, user_agent) values ('foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); insert into location (username, domain, contact, user_agent) values ('foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); insert into location (username, domain, contact, user_agent) values ('foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); insert into location (username, domain, contact, user_agent) values ('foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); insert into location (username, domain, contact, user_agent) values ('foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); insert into location (username, domain, contact, user_agent) values ('foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); insert into location (username, domain, contact, user_agent) values ('foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); insert into location (username, domain, contact, user_agent) values ('foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___');" done -../$BIN -w . -f $CFG > /dev/null +$BIN -w . -f $CFG > /dev/null ret=$? sleep 1 diff --git a/test/unit/39.sh b/test/unit/39.sh index 385edf5..d14cfff 100755 --- a/test/unit/39.sh +++ b/test/unit/39.sh @@ -36,7 +36,7 @@ NR=25 cp $CFG $CFG.bak -echo "loadmodule \"db_unixodbc/db_unixodbc.so\"" >> $CFG +echo "loadmodule \"$SR_DIR/modules_k/db_unixodbc/db_unixodbc.so\"" >> $CFG echo "modparam(\"usrloc\", \"db_url\", \"unixodbc://openser:openserrw@localhost/openser\")" >> $CFG echo "modparam(\"usrloc\", \"fetch_rows\", 13)" >> $CFG @@ -49,7 +49,7 @@ while [ $COUNTER -lt $NR ]; do CNT=$(($CNT+10)) done -../$BIN -w . -f $CFG > /dev/null +$BIN -w . -f $CFG > /dev/null ret=$? sleep 2 diff --git a/test/unit/44.sh b/test/unit/44.sh index e9f31f5..e148212 100755 --- a/test/unit/44.sh +++ b/test/unit/44.sh @@ -30,10 +30,10 @@ fi ; CFG=11.cfg cp $CFG $CFG.tmp -echo "loadmodule \"db_unixodbc/db_unixodbc.so\"" >> $CFG +echo "loadmodule \"$SR_DIR/modules_k/db_unixodbc/db_unixodbc.so\"" >> $CFG echo "modparam(\"usrloc\", \"db_url\", \"unixodbc://openser:openserrw@localhost/openser\")" >> $CFG -../$BIN -w . -f $CFG > /dev/null +$BIN -w . -f $CFG > /dev/null ret=$? sleep 1 @@ -41,10 +41,8 @@ sleep 1 sipsak -U -C sip:foobar@localhost -s sip:49721123456789@localhost -H localhost &> /dev/null ret=$? -cd ../scripts - if [ "$ret" -eq 0 ]; then - ./$CTL ul show | grep "AOR:: 49721123456789" > /dev/null + $CTL ul show | grep "AOR:: 49721123456789" > /dev/null ret=$? fi; @@ -61,7 +59,7 @@ if [ "$ret" -eq 0 ]; then fi; if [ "$ret" -eq 0 ]; then - ./$CTL ul show | grep "AOR:: 49721123456789" > /dev/null + $CTL ul show | grep "AOR:: 49721123456789" > /dev/null ret=$? if [ "$ret" -eq 0 ]; then ret=1 @@ -85,7 +83,7 @@ fi; $KILL # restart to test preload_udomain functionality -../$BIN -w . -f ../test/$CFG > /dev/null +$BIN -w . -f $CFG > /dev/null ret=$? sleep 1 @@ -98,7 +96,7 @@ fi; # check if the methods value is correct if [ "$ret" -eq 0 ]; then - ./$CTL ul show | grep "Methods:: 4294967295" &> /dev/null + $CTL ul show | grep "Methods:: 4294967295" &> /dev/null ret=$? fi; @@ -106,7 +104,6 @@ $KILL echo "delete from location where username like '49721123456789%';" | $ISQL -cd ../test mv $CFG.tmp $CFG exit $ret

1 0

git:master: test: small fix in module check, return success when found in the first dir
by Henning Westerholt 06 May '09

06 May '09

Module: sip-router Branch: master Commit: 1d166493996698771a54daa1e7e788c2ee3d2749 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1d16649… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed May 6 18:52:36 2009 +0200 test: small fix in module check, return success when found in the first dir --- test/unit/include/require | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/test/unit/include/require b/test/unit/include/require index 80a1058..f94b877 100644 --- a/test/unit/include/require +++ b/test/unit/include/require @@ -34,6 +34,8 @@ function check_module() { 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"

1 0

git:master: test: small fixes for test 2, port test 1 and 4
by Henning Westerholt 06 May '09

06 May '09

Module: sip-router Branch: master Commit: f2379c23397cda41a571587a8e2220627cbbadfe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f2379c2… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed May 6 18:35:38 2009 +0200 test: small fixes for test 2, port test 1 and 4 --- test/unit/1.sh | 4 ++-- test/unit/2.cfg | 21 ++++++++++----------- test/unit/2.sh | 6 +++--- test/unit/4.sh | 11 ++++------- 4 files changed, 19 insertions(+), 23 deletions(-) diff --git a/test/unit/1.sh b/test/unit/1.sh index 65859ec..f44fd4e 100755 --- a/test/unit/1.sh +++ b/test/unit/1.sh @@ -24,9 +24,9 @@ source include/common CFG=1.cfg # setup config -echo -e "debug=3" > $CFG +echo -e "debug=2" > $CFG -../$BIN -w . -f $CFG > /dev/null +$BIN -w . -f $CFG > /dev/null ret=$? sleep 1 diff --git a/test/unit/2.cfg b/test/unit/2.cfg index 5b7a1df..3528cca 100644 --- a/test/unit/2.cfg +++ b/test/unit/2.cfg @@ -1,8 +1,7 @@ debug=2 -# FIXME -##loadpath "../../modules" loadpath "../../modules_k" loadmodule "../../modules/tm/tm.so" +loadmodule "tmx" loadmodule "acc" loadmodule "alias_db" loadmodule "auth" @@ -10,8 +9,8 @@ loadmodule "auth_db" loadmodule "avpops" loadmodule "benchmark" loadmodule "cfgutils" -##loadmodule "dialog" -##loadmodule "dispatcher" +###loadmodule "dialog" +loadmodule "dispatcher" loadmodule "diversion" loadmodule "domain" loadmodule "domainpolicy" @@ -37,31 +36,31 @@ loadmodule "siputils" loadmodule "sl" loadmodule "sms" loadmodule "speeddial" -loadmodule "sst" -##loadmodule "statistics" +###loadmodule "sst" +loadmodule "statistics" loadmodule "textops" loadmodule "uac" ##loadmodule "uac_redirect" loadmodule "uri_db" loadmodule "usrloc" loadmodule "userblacklist" -##loadmodule "registrar" +loadmodule "registrar" loadmodule "permissions" loadmodule "pdt" -##loadmodule "pv" +loadmodule "pv" loadmodule "mediaproxy" loadmodule "xlog" modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") modparam("mi_datagram", "socket_name", "/tmp/kamailio.sock") -##modparam("dialog", "dlg_flag", 10) -##modparam("dialog", "db_mode", 2) +###modparam("dialog", "dlg_flag", 10) +###modparam("dialog", "db_mode", 2) ##modparam("tm", "fr_inv_timer_avp", "$avp(i:704)") modparam("^auth$|lcr", "rpid_avp", "$avp(i:302)") modparam("sms", "modems", "Nokia [d=/dev/ttyS1;b=9600;m=new;l=30] ") modparam("sms", "networks", "D1 [m=10] ;d2[ m=20]") modparam("sms", "links", "NOKIA[D1;d2]") -modparam("sst", "sst_flag", 6) +###modparam("sst", "sst_flag", 6) modparam("usrloc", "nat_bflag", 15) modparam("uri_db", "use_uri_table", 1) modparam("uri_db", "db_table", "uri") diff --git a/test/unit/2.sh b/test/unit/2.sh index 8cbea91..f0b09b9 100755 --- a/test/unit/2.sh +++ b/test/unit/2.sh @@ -35,9 +35,9 @@ cp $CFG $CFG.bak touch dispatcher.list -##echo "loadmodule \"../../modules/db_mysql/db_mysql.so\"" >> $CFG -##echo "modparam(\"dispatcher\", \"list_file\", \"`pwd`/../test/dispatcher.list\")" >> $CFG -cat $CFG > foobar +echo "loadmodule \"$SR_DIR/modules/db_mysql/db_mysql.so\"" >> $CFG +echo "modparam(\"dispatcher\", \"list_file\", \"$SR_DIR/$TEST_DIR/dispatcher.list\")" >> $CFG + # start $BIN -w . -f $CFG > /dev/null ret=$? diff --git a/test/unit/4.sh b/test/unit/4.sh index f29a317..4df2223 100755 --- a/test/unit/4.sh +++ b/test/unit/4.sh @@ -29,24 +29,21 @@ if ! (check_kamailio); then fi ; # setup config -echo -e "loadmodule \"../modules/mi_fifo/mi_fifo.so\"" > $CFG +echo -e "loadmodule \"$SR_DIR/modules_k/mi_fifo/mi_fifo.so\"" > $CFG +echo -e "loadmodule \"$SR_DIR/modules_k/kex/kex.so\"" >> $CFG echo -e "modparam(\"mi_fifo\", \"fifo_name\", \"/tmp/kamailio_fifo\")" >> $CFG -../$BIN -w . -f $CFG > /dev/null +$BIN -w . -f $CFG > /dev/null ret=$? -cd ../scripts - if [ "$ret" -eq 0 ] ; then sleep 1 - ./$CTL ps > /dev/null + $CTL version > /dev/null ret=$? fi ; -cd ../test - $KILL rm -f $CFG

1 0

git:master: core script parsing: minor fix: " at the end of file
by Andrei Pelinescu-Onciul 06 May '09

06 May '09

Module: sip-router Branch: master Commit: f84c93b38220f1480bd16fa30d1e3ffbb39d0c5d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f84c93b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed May 6 18:32:46 2009 +0200 core script parsing: minor fix: " at the end of file Having a closing quote at the end of file generated a parse error. Reported-by: Henning Westerholt <henning.westerholt(a)1und1.de> --- cfg.lex | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/cfg.lex b/cfg.lex index 167fc95..957e27f 100644 --- a/cfg.lex +++ b/cfg.lex @@ -952,6 +952,7 @@ EAT_ABLE [\ \t\b\r] <STRING1>{QUOTES} { count_more(); yytext[yyleng-1]=0; yyleng--; addstr(&s_buf, yytext, yyleng); + state=STR_BETWEEN_S; BEGIN(STR_BETWEEN); } <STRING2>{TICK} { count_more(); state=old_state; BEGIN(old_initial);

1 0

git:master: test: port test 2 to sr, comment non-working modules out
by Henning Westerholt 06 May '09

06 May '09

Module: sip-router Branch: master Commit: a9f51d5565f5bd13f2f88bebb6c4874703e0324f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a9f51d5… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed May 6 18:26:49 2009 +0200 test: port test 2 to sr, comment non-working modules out --- test/unit/2.cfg | 110 ++++++++++++++++++++++++++++--------------------------- test/unit/2.sh | 8 ++-- 2 files changed, 60 insertions(+), 58 deletions(-) diff --git a/test/unit/2.cfg b/test/unit/2.cfg index 1bdf793..5b7a1df 100644 --- a/test/unit/2.cfg +++ b/test/unit/2.cfg @@ -1,60 +1,62 @@ -debug=3 -mpath="../modules" -loadmodule "tm/tm.so" -loadmodule "acc/acc.so" -loadmodule "alias_db/alias_db.so" -loadmodule "auth/auth.so" -loadmodule "auth_db/auth_db.so" -loadmodule "avpops/avpops.so" -loadmodule "benchmark/benchmark.so" -loadmodule "cfgutils/cfgutils.so" -loadmodule "dialog/dialog.so" -loadmodule "dispatcher/dispatcher.so" -loadmodule "diversion/diversion.so" -loadmodule "domain/domain.so" -loadmodule "domainpolicy/domainpolicy.so" -loadmodule "enum/enum.so" -loadmodule "exec/exec.so" -loadmodule "db_flatstore/db_flatstore.so" -loadmodule "group/group.so" -loadmodule "htable/htable.so" -loadmodule "imc/imc.so" -loadmodule "maxfwd/maxfwd.so" -loadmodule "mi_datagram/mi_datagram.so" -loadmodule "mi_fifo/mi_fifo.so" -loadmodule "msilo/msilo.so" -loadmodule "nathelper/nathelper.so" -loadmodule "nat_traversal/nat_traversal.so" -loadmodule "path/path.so" -loadmodule "pike/pike.so" -loadmodule "ratelimit/ratelimit.so" -loadmodule "rr/rr.so" -loadmodule "seas/seas.so" -loadmodule "siptrace/siptrace.so" -loadmodule "siputils/siputils.so" -loadmodule "sl/sl.so" -loadmodule "sms/sms.so" -loadmodule "speeddial/speeddial.so" -loadmodule "sst/sst.so" -loadmodule "statistics/statistics.so" -loadmodule "textops/textops.so" -loadmodule "uac/uac.so" -loadmodule "uac_redirect/uac_redirect.so" -loadmodule "uri_db/uri_db.so" -loadmodule "usrloc/usrloc.so" -loadmodule "userblacklist/userblacklist.so" -loadmodule "registrar/registrar.so" -loadmodule "permissions/permissions.so" -loadmodule "pdt/pdt.so" -loadmodule "pv/pv.so" -loadmodule "mediaproxy/mediaproxy.so" -loadmodule "xlog/xlog.so" +debug=2 +# FIXME +##loadpath "../../modules" +loadpath "../../modules_k" +loadmodule "../../modules/tm/tm.so" +loadmodule "acc" +loadmodule "alias_db" +loadmodule "auth" +loadmodule "auth_db" +loadmodule "avpops" +loadmodule "benchmark" +loadmodule "cfgutils" +##loadmodule "dialog" +##loadmodule "dispatcher" +loadmodule "diversion" +loadmodule "domain" +loadmodule "domainpolicy" +loadmodule "enum" +loadmodule "exec" +loadmodule "../../modules/db_flatstore/db_flatstore.so" +loadmodule "group" +loadmodule "htable" +loadmodule "imc" +loadmodule "maxfwd" +loadmodule "mi_datagram" +loadmodule "mi_fifo" +loadmodule "msilo" +loadmodule "nathelper" +##loadmodule "nat_traversal" +loadmodule "path" +loadmodule "pike" +loadmodule "ratelimit" +loadmodule "rr" +##loadmodule "seas" +##loadmodule "siptrace" +loadmodule "siputils" +loadmodule "sl" +loadmodule "sms" +loadmodule "speeddial" +loadmodule "sst" +##loadmodule "statistics" +loadmodule "textops" +loadmodule "uac" +##loadmodule "uac_redirect" +loadmodule "uri_db" +loadmodule "usrloc" +loadmodule "userblacklist" +##loadmodule "registrar" +loadmodule "permissions" +loadmodule "pdt" +##loadmodule "pv" +loadmodule "mediaproxy" +loadmodule "xlog" modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") modparam("mi_datagram", "socket_name", "/tmp/kamailio.sock") -modparam("dialog", "dlg_flag", 10) -modparam("dialog", "db_mode", 2) -modparam("tm", "fr_inv_timer_avp", "$avp(i:704)") +##modparam("dialog", "dlg_flag", 10) +##modparam("dialog", "db_mode", 2) +##modparam("tm", "fr_inv_timer_avp", "$avp(i:704)") modparam("^auth$|lcr", "rpid_avp", "$avp(i:302)") modparam("sms", "modems", "Nokia [d=/dev/ttyS1;b=9600;m=new;l=30] ") modparam("sms", "networks", "D1 [m=10] ;d2[ m=20]") diff --git a/test/unit/2.sh b/test/unit/2.sh index d46f64e..8cbea91 100755 --- a/test/unit/2.sh +++ b/test/unit/2.sh @@ -35,11 +35,11 @@ cp $CFG $CFG.bak touch dispatcher.list -echo "loadmodule \"db_mysql/db_mysql.so\"" >> $CFG -echo "modparam(\"dispatcher\", \"list_file\", \"`pwd`/../test/dispatcher.list\")" >> $CFG - +##echo "loadmodule \"../../modules/db_mysql/db_mysql.so\"" >> $CFG +##echo "modparam(\"dispatcher\", \"list_file\", \"`pwd`/../test/dispatcher.list\")" >> $CFG +cat $CFG > foobar # start -../$BIN -w . -f $CFG > /dev/null +$BIN -w . -f $CFG > /dev/null ret=$? sleep 1

1 0

git:master: dispatcher(k): add 'struct tmb' to fix module loading after change 441ab3c9f2ca
by Henning Westerholt 06 May '09

06 May '09

Module: sip-router Branch: master Commit: 2e561ecaed74fb53e1ff3c5e671348b2f516cbcf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2e561ec… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed May 6 18:16:28 2009 +0200 dispatcher(k): add 'struct tmb' to fix module loading after change 441ab3c9f2ca --- modules_k/dispatcher/dispatcher.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules_k/dispatcher/dispatcher.c b/modules_k/dispatcher/dispatcher.c index fdd73ca..4453221 100644 --- a/modules_k/dispatcher/dispatcher.c +++ b/modules_k/dispatcher/dispatcher.c @@ -100,6 +100,9 @@ static int ds_ping_interval = 0; int ds_probing_mode = 0; int ds_append_branch = 1; +/* tm */ +struct tm_binds tmb; + /*db */ str ds_db_url = {NULL, 0}; str ds_set_id_col = str_init(DS_SET_ID_COL);

1 0

git:master: doc: config migration
by Andrei Pelinescu-Onciul 06 May '09

06 May '09

Module: sip-router Branch: master Commit: 9227fc8228064b789eaf66e939b8009333be1be0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9227fc8… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed May 6 17:57:25 2009 +0200 doc: config migration Added a config migration guide for ser 2.1 to sip-router. The kamailio part is empty for now. --- NEWS | 3 + doc/config_migration.txt | 115 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index 460d70c..b831a2f 100644 --- a/NEWS +++ b/NEWS @@ -42,6 +42,9 @@ core: strempty(expr) - returns true if expr evaluates to the empty string (equivalent to expr==""). e.g.: if (defined $v && !strempty($v)) $len=strlen($v); + - msg:len max_len comparison obsoleted and removed (it did not make any + sense, msg:len > max_len was always false, use something like + 4096 or 16384 in its place). - module search path support: loadpath takes now a list of directories separated by ':'. The list is searched in-order. For each directory d $d/${module_name}.so and $d/${module_name}/${module_name}.so are tried. diff --git a/doc/config_migration.txt b/doc/config_migration.txt new file mode 100644 index 0000000..d55510c --- /dev/null +++ b/doc/config_migration.txt @@ -0,0 +1,115 @@ +# $Id$ +# +# History: +# -------- +# 2009-05-06 created by andrei + +============================================================= += Config migration guide from ser or kamailio to sip-router = +============================================================= + + +ser 2.1 config migration +======================== + +1. Avps, selects and strings in if or other expressions + +The most important change is the different way in which avp and select are +evaluated in boolean expressions (if ()). +In ser "if ($v){}" or "if (@select){}" were true if the avp or select were +"defined" and if their value was non-empty (!= ""). +In sip-router this changed: the ifs will be true if the avp or select are +non-empty and they evaluate to a non-zero number. The catch is that a +non-numeric string evaluates to 0 (e.g. "abc" evaluates to 0, "123" evaluates +to 123, "" to 0, "0" to 0). +Something like "if($v)" should be used only if $v is supposed to have a numeric +value. "if (@select)" should not be used in general (it's probably not what you +want). + +The equivalent sip-router checks are: + +instead of if ($v) use if ($v != "") +instead of if (!$v) use if ($v == "") or if (strempty($v)). +instead of if (@select) use if (@select != "") +instead of if (!@select) use if (@select == "") or if (strempty(@select)). + +If the test is for value existence, then if ($v) can be replaced with + if (defined $v). + +E.g.: +replace + if (! $f.did) +with + if (strempty($f.did)) + +replace + if (method=="INVITE" && !(a)to.tag) +with + if (method=="INVITE" && strempty((a)to.tag)) + +replace + if ($f.did && ! $t.did) +with + if ($f.did != "" && $t.did == "") + +replace + if (@to.tag) +with + if (@to.tag != "") + + +2. Module path + +While in ser there was only a single directory holding the modules, now there +are 3: modules (for common modules), modules_s (for ser modules) and modules_k +(for kamailio modules). +The easiest way to migrate a ser config is to add: + + loadpath "/usr/lib/ser/modules:/usr/lib/ser/modules_s" + +at the beginning (before any loadmodule command). +This will set the module search path to first look into the common modules and +if not found in the ser modules. + +Make sure that all the loadmodule commands do not include the path to the +module or the .so extension (or else they won't make use of the loadpath). +E.g.: +replace + loadmodule "/usr/lib/ser/modules/tm.so" +with + loadmodule "tm" + + +3. Module names + +Some of the modules changed their name (usually after being merged with the +kamailio ones). +The most common changes are mysql -> db_mysql and postgres -> db_postgres. + +E.g.: +replace + loadmodule "mysql" +with + loadmodule "db_mysql" + + +4. msg:len and max_len + +max_len was removed. All the comparisons of msg:len with max_len must be +changed to use a number (e.g. 4096 or 16384) instead of max_len. +Comparing with max_len didn't make sense anyway since max_len was the size of +the internal receive buffer on UDP. You could never exceed it, unless you were +using TCP configured in a non-standard way. + +E.g.: +replace + if (msg:len >= max_len) +with + if (msg:len >= 4096) + + + +kamailio config migration +========================= + +[TODO: probably most of the things from the ser section apply too]

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
27
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2009