sr-dev

sr-dev@lists.kamailio.org

15 participants
44215 discussions

git:master: core script engine: support for rval expr. in return/drop

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: ee308afd99cfb80d8a9787f6dfe7fb0935cdb386 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ee308af… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu May 14 21:42:46 2009 +0200 core script engine: support for rval expr. in return/drop --- action.c | 20 ++++++++++++++++---- route.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 4 deletions(-) diff --git a/action.c b/action.c index f99079a..9f89ac6 100644 --- a/action.c +++ b/action.c @@ -135,10 +135,22 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ret=E_BUG; switch ((unsigned char)a->type){ case DROP_T: - if (a->val[0].type==RETCODE_ST) - ret=h->last_retcode; - else - ret=(int) a->val[0].u.number; + switch(a->val[0].type){ + case NUMBER_ST: + ret=(int) a->val[0].u.number; + break; + case RVE_ST: + rve=(struct rval_expr*)a->val[0].u.data; + rval_expr_eval_int(h, msg, &ret, rve); + break; + case RETCODE_ST: + ret=h->last_retcode; + break; + default: + BUG("unexpected subtype %d in DROP_T\n", + a->val[0].type); + ret=0; + } h->run_flags|=(unsigned int)a->val[1].u.number; break; case FORWARD_T: diff --git a/route.c b/route.c index 8d8c7db..77adbfb 100644 --- a/route.c +++ b/route.c @@ -807,6 +807,43 @@ int fix_actions(struct action* a) return ret; } break; + case DROP_T: + /* only RVEs need fixing for drop/return/break */ + if (t->val[0].type!=RVE_ST) + break; + rve=(struct rval_expr*)t->val[0].u.data; + if (rve){ + err_rve=0; + if (!rve_check_type(&rve_type, rve, &err_rve, + &err_type, &expected_type)){ + if (err_rve) + LOG(L_ERR, "fix_actions: invalid expression " + "(%d,%d): subexpression (%d,%d) has type" + " %s, but %s is expected\n", + rve->fpos.s_line, rve->fpos.s_col, + err_rve->fpos.s_line, err_rve->fpos.s_col, + rval_type_name(err_type), + rval_type_name(expected_type) ); + else + LOG(L_ERR, "fix_actions: invalid expression " + "(%d,%d): type mismatch?", + rve->fpos.s_line, rve->fpos.s_col); + return E_UNSPEC; + } + if (rve_type!=RV_INT && rve_type!=RV_NONE){ + LOG(L_ERR, "fix_actions: invalid expression (%d,%d):" + " bad type, integer expected\n", + rve->fpos.s_line, rve->fpos.s_col); + return E_UNSPEC; + } + if ((ret=fix_rval_expr((void**)&rve))<0) + return ret; + }else{ + LOG(L_CRIT, "BUG: fix_actions: null drop/return" + " expression\n"); + return E_BUG; + } + break; case ASSIGN_T: case ADD_T: if (t->val[0].type !=LVAL_ST) {

15 years, 8 months

git:master: test: port carrierroute config load test to sr, add missing tmx mod to test 13

by Henning Westerholt

Module: sip-router Branch: master Commit: 658010d634f520d250978ee57839bdfc5f03f6eb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=658010d… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu May 14 16:25:59 2009 +0200 test: port carrierroute config load test to sr, add missing tmx mod to test 13 --- test/unit/13.cfg | 5 +---- test/unit/14.cfg | 22 +++++++--------------- test/unit/14.sh | 10 +++------- 3 files changed, 11 insertions(+), 26 deletions(-) diff --git a/test/unit/13.cfg b/test/unit/13.cfg index 509d3f6..aac3cab 100644 --- a/test/unit/13.cfg +++ b/test/unit/13.cfg @@ -6,6 +6,7 @@ loadmodule "xlog" loadmodule "maxfwd" loadmodule "../../modules/carrierroute/carrierroute.so" loadmodule "pv" +loadmodule "tmx" loadmodule "mi_fifo" modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") @@ -16,10 +17,6 @@ route{ sl_send_reply("483","Too Many Hops"); return; }; -# if (msg:len > max_len) { -# sl_send_reply("513", "Message too big"); -# return; -# }; cr_user_carrier("$fU", "$fd", "$avp(s:11)"); $avp(domain)="start"; if (!cr_route("$avp(carrier)", "$avp(s:10)", "$rU", "$rU", "call_id", "$avp(s:12)")) { diff --git a/test/unit/14.cfg b/test/unit/14.cfg index bb121ca..dde83a0 100644 --- a/test/unit/14.cfg +++ b/test/unit/14.cfg @@ -1,27 +1,19 @@ -mpath="../modules" -loadmodule "sl/sl.so" -loadmodule "xlog/xlog.so" -loadmodule "maxfwd/maxfwd.so" -loadmodule "carrierroute/carrierroute.so" -loadmodule "pv/pv.so" -loadmodule "mi_fifo/mi_fifo.so" +loadpath "../../modules_k" +loadmodule "sl" +loadmodule "xlog" +loadmodule "maxfwd" +loadmodule "../../modules/carrierroute/carrierroute.so" +loadmodule "pv" +loadmodule "mi_fifo" modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") -avp_aliases="domain=s:10" -avp_aliases="carrier=s:11" -avp_aliases="host=s:12" - route{ # initial sanity checks if (!mf_process_maxfwd_header("10")) { sl_send_reply("483","Too Many Hops"); return; }; - if (msg:len > max_len) { - sl_send_reply("513", "Message too big"); - return; - }; if (method == "REGISTER") { if(!cr_route("default", "register", "$rU", "$rU", "call_id", "$avp(s:30)")) { sl_send_reply("403", "Not allowed"); diff --git a/test/unit/14.sh b/test/unit/14.sh index 1db9d4f..b4fdc2f 100755 --- a/test/unit/14.sh +++ b/test/unit/14.sh @@ -31,19 +31,17 @@ fi ; cp $CFG $CFG.bak # setup config -echo "modparam(\"carrierroute\", \"config_file\", \"`pwd`/../test/carrierroute.cfg\")" >> $CFG +echo "modparam(\"carrierroute\", \"config_file\", \"carrierroute.cfg\")" >> $CFG -../$BIN -w . -f $CFG > /dev/null +$BIN -w . -f $CFG > /dev/null ret=$? sleep 1 -cd ../scripts - TMPFILE=`mktemp -t kamailio-test.XXXXXXXXXX` if [ "$ret" -eq 0 ] ; then - ./$CTL fifo cr_dump_routes > $TMPFILE + $CTL fifo cr_dump_routes > $TMPFILE ret=$? fi ; @@ -78,8 +76,6 @@ fi ; $KILL -cd ../test - mv $CFG.bak $CFG rm -f $TMPFILE

15 years, 8 months

git:master: test: port carrierroute DB load test to sr

by Henning Westerholt

Module: sip-router Branch: master Commit: a093e8ec5f454af62ff1c72356748af69153d0d4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a093e8e… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu May 14 16:24:57 2009 +0200 test: port carrierroute DB load test to sr --- test/unit/13.cfg | 38 +++++++++++++++++--------------------- test/unit/13.sh | 10 +++------- 2 files changed, 20 insertions(+), 28 deletions(-) diff --git a/test/unit/13.cfg b/test/unit/13.cfg index f426d11..509d3f6 100644 --- a/test/unit/13.cfg +++ b/test/unit/13.cfg @@ -1,32 +1,28 @@ -debug=3 -mpath="../modules" -loadmodule "sl/sl.so" -loadmodule "tm/tm.so" -loadmodule "xlog/xlog.so" -loadmodule "maxfwd/maxfwd.so" -loadmodule "carrierroute/carrierroute.so" -loadmodule "pv/pv.so" -loadmodule "mi_fifo/mi_fifo.so" +debug=2 +loadpath "../../modules_k" +loadmodule "sl" +loadmodule "../../modules/tm/tm.so" +loadmodule "xlog" +loadmodule "maxfwd" +loadmodule "../../modules/carrierroute/carrierroute.so" +loadmodule "pv" +loadmodule "mi_fifo" modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") -avp_aliases="domain=s:10" -avp_aliases="carrier=s:11" -avp_aliases="host=s:12" - route{ # initial sanity checks if (!mf_process_maxfwd_header("10")) { sl_send_reply("483","Too Many Hops"); return; }; - if (msg:len > max_len) { - sl_send_reply("513", "Message too big"); - return; - }; - cr_user_carrier("$fU", "$fd", "$avp(carrier)"); +# if (msg:len > max_len) { +# sl_send_reply("513", "Message too big"); +# return; +# }; + cr_user_carrier("$fU", "$fd", "$avp(s:11)"); $avp(domain)="start"; - if (!cr_route("$avp(carrier)", "$avp(domain)", "$rU", "$rU", "call_id", "$avp(host)")) { + if (!cr_route("$avp(carrier)", "$avp(s:10)", "$rU", "$rU", "call_id", "$avp(s:12)")) { xlog("L_ERR", "cr_route failed\n"); exit; } @@ -38,11 +34,11 @@ route{ failure_route[1] { revert_uri(); - if (!cr_next_domain("$avp(carrier)", "$avp(domain)", "$rU", "$avp(host)", "$T_reply_code", "$avp(domain)")) { + if (!cr_next_domain("$avp(s:11)", "$avp(s:10)", "$rU", "$avp(s:12)", "$T_reply_code", "$avp(s:10)")) { xlog("L_ERR", "cr_next_domain failed\n"); exit; } - if (!cr_route("$avp(carrier)", "$avp(domain)", "$rU", "$rU", "call_id", "$avp(host)")) { + if (!cr_route("$avp(s:11)", "$avp(s:10)", "$rU", "$rU", "call_id", "$avp(s:12)")) { xlog("L_ERR", "cr_route failed\n"); exit; } diff --git a/test/unit/13.sh b/test/unit/13.sh index 16a7f71..23ac6df 100755 --- a/test/unit/13.sh +++ b/test/unit/13.sh @@ -32,7 +32,7 @@ fi ; cp $CFG $CFG.bak # setup config -echo "loadmodule \"db_mysql/db_mysql.so\"" >> $CFG +echo "loadmodule \"../../modules/db_mysql/db_mysql.so\"" >> $CFG echo "modparam(\"carrierroute\", \"config_source\", \"db\")" >> $CFG # setup database @@ -65,18 +65,16 @@ mask, next_domain) values ('3', '2', '1', '49', 'host1.local', '503', '0', '0', $MYSQL "insert into carrierfailureroute(id, carrier, domain, scan_prefix, host_name, reply_code, flags, mask, next_domain) values ('4', '2', '2', '49', 'host1.local', '5..', '0', '0', '3');" -../$BIN -w . -f $CFG > /dev/null +$BIN -w . -f $CFG > /dev/null ret=$? sleep 1 -cd ../scripts - TMPFILE=`mktemp -t kamailio-test.XXXXXXXXXX` if [ "$ret" -eq 0 ] ; then - ./$CTL fifo cr_dump_routes > $TMPFILE + $CTL fifo cr_dump_routes > $TMPFILE ret=$? fi ; @@ -124,8 +122,6 @@ $MYSQL "delete from carrierfailureroute where carrier=1;" $MYSQL "delete from carrierfailureroute where carrier=2;" $MYSQL "delete from carrierfailureroute where carrier=3;" -cd ../test - mv $CFG.bak $CFG rm $TMPFILE

15 years, 8 months

x-lite 3.0 on linux

by Daniel-Constantin Mierla

Hello, during last weeks while testing the kamailio (openser) modules with sip-router core I got x-lite 3.0 working on linux (ubuntu) with wine 1.1.20. I posted guidelines at: http://appdb.winehq.org/objectManager.php?sClass=version&iId=16413 Voice, IM&Presence seem to work just fine. Video was not tested as I couldn't make any wine application see the video cam, although it is working fine on linux with skype or ekiga. For me it is a great tool to test the presence, hope it will be useful for some of you as well. Apart of x-lite, I got other sip softphone working with wine: - pangolin - works fine, but the presence status changes are not sent to server (no PUBLISH) -- might be a bug in the software, maybe someone running it on windows can confirm it or not - zoiper communicator rc1 free edition for windows - linux version seems to be available now, but requires to register with their site Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com/

15 years, 8 months

git:master: test: further adaptions for sr, test 12 still not work, missing return support

by Henning Westerholt

Module: sip-router Branch: master Commit: d1fe91745ef9517629e01c2ae38a8742d8a8899f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d1fe917… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu May 14 13:04:26 2009 +0200 test: further adaptions for sr, test 12 still not work, missing return support --- test/unit/12.cfg | 52 ++++++++++++++++++++++++---------------------------- test/unit/12.sh | 20 ++++++++------------ test/unit/7.sh | 2 +- 3 files changed, 33 insertions(+), 41 deletions(-) diff --git a/test/unit/12.cfg b/test/unit/12.cfg index a8517a8..d1e11c7 100644 --- a/test/unit/12.cfg +++ b/test/unit/12.cfg @@ -1,23 +1,19 @@ log_stderror=yes listen=127.0.0.1 -mpath="../modules/" -loadmodule "db_mysql/db_mysql.so" -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 "usrloc/usrloc.so" -loadmodule "registrar/registrar.so" -loadmodule "pv/pv.so" -loadmodule "mi_fifo/mi_fifo.so" +loadpath "../../modules_k/" +loadmodule "../../modules/db_mysql/db_mysql.so" +loadmodule "sl" +loadmodule "../../modules/tm/tm.so" +loadmodule "rr" +loadmodule "maxfwd" +loadmodule "textops" +loadmodule "xlog" +loadmodule "usrloc" +loadmodule "registrar" +loadmodule "pv" +loadmodule "mi_fifo" modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") -avp_aliases="identity_user=i:81" -avp_aliases="identity_domain=i:82" -avp_aliases="identity_uri=i:83" - route{ xlog("received by kamailio[$pp] at '$Tf' from $si:$sp, method: $(rm{s.tolower}), transport: $rP:$Ri:$rp, user agent: $ua\n"); @@ -25,7 +21,7 @@ route{ xlog("L_ERR", "Error getting identity\n"); exit; } - xlog("L_ERR", "My identity: $avp(identity_uri)\n"); + xlog("L_ERR", "My identity: $avp(i:83)\n"); $var(x) = "sip:" + $fU +"@" + $td; xlog("var(x): $var(x), MD5 var(x): $(var(x){s.md5})\n"); @@ -89,24 +85,24 @@ route[1] { route[39] { if ($ai) { - $avp(identity_user)=$(ai{uri.user}); - $avp(identity_domain)=$(ai{uri.domain}); - $avp(identity_uri)=$ai; + $avp(i:81)=$(ai{uri.user}); + $avp(i:82)=$(ai{uri.domain}); + $avp(i:83)=$ai; xlog("L_ERR", "Getting identity from P-Asserted-Identity header\n"); } else if ($pu) { - $avp(identity_user)=$(pu{uri.user}); - $avp(identity_domain)=$(pu{uri.domain}); - $avp(identity_uri)=$pu; + $avp(i:81)=$(pu{uri.user}); + $avp(i:82)=$(pu{uri.domain}); + $avp(i:83)=$pu; xlog("L_ERR", "Getting identity from P-Preferred-Identity header\n"); } else if ($fu) { - $avp(identity_user)=$(fu{uri.user}); - $avp(identity_domain)=$(fu{uri.domain}); - $avp(identity_uri)=$fu; + $avp(i:81)=$(fu{uri.user}); + $avp(i:82)=$(fu{uri.domain}); + $avp(i:83)=$fu; xlog("L_ERR", "Getting identity from FROM URI\n"); } else { xlog("L_ERR", "No identity for $rm: $fu -> $ru\n"); - return(-1); + return;# -1; } - return (1); + return; #1; } diff --git a/test/unit/12.sh b/test/unit/12.sh index bd4b0a1..b3438b8 100755 --- a/test/unit/12.sh +++ b/test/unit/12.sh @@ -29,26 +29,24 @@ if ! (check_netcat && check_kamailio); then exit 0 fi ; -../$BIN -w . -f $CFG &> $TMPFILE +$BIN -w . -f $CFG &> $TMPFILE ret=$? sleep 1 -# register a user -cat register.sip | nc -q 1 -u localhost 5060 > /dev/null - -cd ../scripts if [ "$ret" -eq 0 ] ; then - ./$CTL ul show | grep "AOR:: 1000" > /dev/null + # register a user + cat register.sip | nc -q 1 -u localhost 5060 > /dev/null + $CTL ul show | grep "AOR:: 1000" > /dev/null ret=$? + # unregister the user + cat unregister.sip | nc -q 1 -u localhost 5060 > /dev/null fi ; -# unregister the user -cat ../test/unregister.sip | nc -q 1 -u localhost 5060 > /dev/null if [ "$ret" -eq 0 ] ; then - ./$CTL ul show | grep "AOR:: 1000" > /dev/null + $CTL ul show | grep "AOR:: 1000" > /dev/null ret=$? if [ "$ret" -eq 0 ] ; then ret=1 @@ -85,9 +83,7 @@ if [ "$ret" -eq 0 ] ; then fi ; fi ; fi ; - -cd ../test - +cat $TMPFILE $KILL rm $TMPFILE diff --git a/test/unit/7.sh b/test/unit/7.sh index 0c631d0..b2851a4 100755 --- a/test/unit/7.sh +++ b/test/unit/7.sh @@ -33,7 +33,7 @@ if ! (check_kamailio); then fi ; # start -../$BIN -w . -f $CFG > /dev/null +$BIN -w . -f $CFG > /dev/null ret=$? sleep 1

15 years, 8 months

Auto-generated Docbook Documentation

by Jan Janak

Hello, Automatically generated HTML documentation from docbook documents stored in the git repository is available at http://sip-router.org/docbook/sip-router/branch/master/ This is all the docbook documentation that we currently have in the repository, including the documents under doc, modules, modules_k, modules_s, and lib subdirectories. The HTML documentation is updated automatically upon changes in the git repository. The script processes all directories that contain a Makefile with the string "docbook_dir" in it. If you add a new directory with docbook documentation anywhere in the git repository then add a Makefile in the directory that can be used to build the documentation and your documentation will be automatically converted to HTML and uploaded to the server. We do not have fancy stuff like module lists or documentation index yet. Also the CSS stylesheets need some changes to produce better-looking HTML pages and images are missing if they were included in a docbook document. We can address that later. Jan.

15 years, 8 months

git:master: docbook: Update the path to some modules.

by Jan Janak

Module: sip-router Branch: master Commit: dd3bc4d940bea59c49a5270be3dce71cda689f65 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dd3bc4d… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu May 14 01:46:24 2009 +0200 docbook: Update the path to some modules. This document includes some module documentation, but those particular modules currenly live in modules_s directory. --- doc/presence/presence_book.xml | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/presence/presence_book.xml b/doc/presence/presence_book.xml index d43d0d5..8e7ed37 100644 --- a/doc/presence/presence_book.xml +++ b/doc/presence/presence_book.xml @@ -16,10 +16,10 @@ http://www.sagehill.net/docbookxsl/ValidXinclude.htm --> <include xmlns="http://www.w3.org/2001/XInclude" href="trouble.xml"/> <include xmlns="http://www.w3.org/2001/XInclude" href="xcap.xml"/>  - <include xmlns="http://www.w3.org/2001/XInclude" href="../../modules/pa/doc/pa_incl.xml"/> - <include xmlns="http://www.w3.org/2001/XInclude" href="../../modules/rls/doc/rls_incl.xml"/> - <include xmlns="http://www.w3.org/2001/XInclude" href="../../modules/presence_b2b/doc/presence_b2b.xml"/> - <include xmlns="http://www.w3.org/2001/XInclude" href="../../modules/xcap/doc/xcap.xml"/> + <include xmlns="http://www.w3.org/2001/XInclude" href="../../modules_s/pa/doc/pa_incl.xml"/> + <include xmlns="http://www.w3.org/2001/XInclude" href="../../modules_s/rls/doc/rls_incl.xml"/> + <include xmlns="http://www.w3.org/2001/XInclude" href="../../modules_s/presence_b2b/doc/presence_b2b.xml"/> + <include xmlns="http://www.w3.org/2001/XInclude" href="../../modules_s/xcap/doc/xcap.xml"/>   @@ -35,8 +35,8 @@ href="../../modules/xcap/doc/xcap.xml"/> -->

15 years, 8 months

git:master: docbook: Update and add missing docbook Makefiles

by Jan Janak

Module: sip-router Branch: master Commit: b245ada5562e8fb4f7a832c9765c6ea28e980f60 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b245ada… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu May 14 01:44:10 2009 +0200 docbook: Update and add missing docbook Makefiles This change updates all the Makefiles used to process docbook documents so that they work with the new docbook build system. It also adds some missing Makefiles. Every directory containing docbook documentation should have a Makefile so that it can be processed independently. --- doc/Makefile | 31 ------------ doc/doc_root.xml | 120 --------------------------------------------- doc/presence/Makefile | 31 +---------- doc/rpc/Makefile | 4 -- doc/ser_radius/Makefile | 31 +---------- doc/serdev/Makefile | 31 +---------- doc/serfaq/Makefile | 31 +---------- doc/serhowto/Makefile | 31 +---------- doc/seruser/Makefile | 31 +---------- doc/sip/Makefile | 31 +---------- lib/cds/doc/Makefile | 4 ++ lib/doc/Makefile | 4 ++ lib/presence/doc/Makefile | 4 ++ lib/xcap/doc/Makefile | 4 ++ 14 files changed, 37 insertions(+), 351 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=b24…

15 years, 8 months

git:master: docbook: Fixed docbook dependency generator

by Jan Janak

Module: sip-router Branch: master Commit: d5ceae609414dbbc81052abdc1f4b74066d84b98 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d5ceae6… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed May 13 22:11:18 2009 +0200 docbook: Fixed docbook dependency generator Previous version of the XSL stylesheet that is used to generate dependencies for docbook documents did not work properly with docbook files included from other directories, it did not make dependencies relative to the top-level file being processed, resulting in dependency files that cannot be satisfied. This change fixes the stylesheet and makes all the depedendencies generated by the stylesheet relative to the directory of the top-level docbook document being processed. In addition to that it fixes a small typo in the main docbook Makefile. --- docbook/Makefile | 2 +- docbook/dep.xsl | 92 +++++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 78 insertions(+), 16 deletions(-) diff --git a/docbook/Makefile b/docbook/Makefile index b60ccf2..16691da 100644 --- a/docbook/Makefile +++ b/docbook/Makefile @@ -146,7 +146,7 @@ $(output_dir)/%.html: %.xml %.d $(single_html_xsl) $(all_deps) $(single_html_xsl) $< -$(output_dir)/%.txt: %.xml %.d $(txt_xsl) $(all_dep) +$(output_dir)/%.txt: %.xml %.d $(txt_xsl) $(all_deps) XML_CATALOG_FILES=$(catalog) $(xsltproc) $(xsltproc_flags) \ --xinclude \ $(txt_xsl) $< | $(lynx) $(lynx_flags) -stdin -dump > $@ diff --git a/docbook/dep.xsl b/docbook/dep.xsl index e3c6133..0415f96 100644 --- a/docbook/dep.xsl +++ b/docbook/dep.xsl @@ -1,10 +1,10 @@ <?xml version='1.0'?> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0' xmlns:xi="http://www.w3.org/2001/XInclude"> - - <xsl:param name="prefix"/> <xsl:param name="output"/> - + +  <xsl:template match="/"> <xsl:document href="{$output}" method="text" indent="no" omit-xml-declaration="yes"> @@ -13,36 +13,98 @@ </xsl:document> </xsl:template> - <xsl:template name="get-prefix"> - <xsl:if test="contains($prefix, '/')"> - <xsl:value-of select="concat(substring-before($prefix, '/'), '/')"/> - <xsl:call-template name="get-prefix"> - <xsl:with-param name="prefix" - select="substring-after($prefix, '/')"/> +  + <xsl:template name="dirname"> + <xsl:param name="filename"/> + <xsl:if test="contains($filename, '/')"> + <xsl:value-of + select="concat(substring-before($filename, '/'), '/')"/> + <xsl:call-template name="dirname"> + <xsl:with-param name="filename" + select="substring-after($filename, '/')"/> </xsl:call-template> </xsl:if> </xsl:template> + +  + <xsl:template name="addprefix"> + <xsl:param name="prefix"/> + <xsl:param name="filename"/> + <xsl:if test="(string-length($prefix) > 0) and not(starts-with($filename, '/'))"> + <xsl:value-of select="$prefix"/> + </xsl:if> + <xsl:value-of select="$filename"/> + </xsl:template> +  <xsl:template match='xi:include' mode="subroot"> - <xsl:value-of select="concat($prefix, concat(@href, ' '))"/> + <xsl:param name="prefix"/> + +  + <xsl:variable name="fullpath"> + <xsl:call-template name="addprefix"> + <xsl:with-param name="prefix" select="$prefix"/> + <xsl:with-param name="filename" select="@href"/> + </xsl:call-template> + </xsl:variable> + +  + <xsl:value-of select="concat($fullpath, ' ')"/> + +  <xsl:apply-templates select="document(@href)" mode="subroot"> +  <xsl:with-param name="prefix"> - <xsl:call-template name="get-prefix"> - <xsl:with-param name="prefix" - select="concat($prefix, @href)"/> + <xsl:call-template name="dirname"> + <xsl:with-param name="filename" select="$fullpath"/> </xsl:call-template> </xsl:with-param> + +  </xsl:apply-templates> </xsl:template> +  <xsl:template match='xi:include[@parse="text"]' mode="subroot"> - <xsl:value-of select="concat($prefix, concat(@href, ' '))"/> + <xsl:param name="prefix"/> + <xsl:call-template name="addprefix"> + <xsl:with-param name="prefix" select="$prefix"/> + <xsl:with-param name="filename" select="@href"/> + </xsl:call-template> + <xsl:text> </xsl:text> </xsl:template> +  <xsl:template match="graphic|imagedata|inlinemediaobject|textdata" mode="subroot"> - <xsl:value-of select="concat($prefix, concat(@fileref, ' '))"/> + <xsl:param name="prefix"/> + <xsl:call-template name="addprefix"> + <xsl:with-param name="prefix" select="$prefix"/> + <xsl:with-param name="filename" select="@fileref"/> + </xsl:call-template> + <xsl:text> </xsl:text> </xsl:template> +  <xsl:template match="text()|@*" mode="subroot"/> </xsl:stylesheet>

15 years, 8 months

git:master: lcr doc: added RPC commands section

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: f7246ca139a6b3437b91ad5cf0eca8662a4888a2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f7246ca… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed May 13 13:59:25 2009 +0200 lcr doc: added RPC commands section --- modules/lcr/doc/lcr_admin.xml | 50 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/modules/lcr/doc/lcr_admin.xml b/modules/lcr/doc/lcr_admin.xml index 253bb26..5f75a38 100644 --- a/modules/lcr/doc/lcr_admin.xml +++ b/modules/lcr/doc/lcr_admin.xml @@ -910,6 +910,56 @@ if (to_gw("1")) { </section> </section> <section> + <title>Exported RPC Commands</title> + <section> + <title><function>lcr.reload</function></title> + <para> + Causes lcr module to re-read the contents of gateway table + into memory. + </para> + <para> + Name: <emphasis>lcr.reload</emphasis> + </para> + <para>Parameters: <emphasis>none</emphasis></para> + <example> + <title><function>lcr.reload</function> RPC example</title> + <programlisting format="linespecific"> + $ sercmd lcr.reload + </programlisting> + </example> + </section> + + <section> + <title><function>lcr.dump_gws</function></title> + <para> + Causes lcr module to dump the contents of its + in-memory gw table. + </para> + <para>Parameters: <emphasis>none</emphasis></para> + <example> + <title><function>lcr.dump_gws</function> RPC example</title> + <programlisting format="linespecific"> + $ sercmd lcr.dump_gws + </programlisting> + </example> + </section> + + <section> + <title><function>lcr.dump_lcr</function></title> + <para> + Causes lcr module to dump the contents of its + in-memory lcr table. + </para> + <para>Parameters: <emphasis>none</emphasis></para> + <example> + <title><function>lcr.dump_lcr</function> RPC example</title> + <programlisting format="linespecific"> + $ sercmd lcr.dump_lcr + </programlisting> + </example> + </section> + </section> + <section> <title>Known Limitations</title> <para> In-memory gateway and in-memory lcr table are switched

15 years, 8 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev