sr-dev May 2009

sr-dev@lists.kamailio.org

26 participants
263 discussions

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, 7 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, 7 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, 7 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, 7 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, 7 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, 7 months

git:master: lcr: fix double free on error

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: b974149715b5f1a5ce9e36a5b795162965276e20 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b974149… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed May 13 19:15:24 2009 +0200 lcr: fix double free on error On mod_init() error the lcr module did attempt to free twice all the shared memory allocated vars (free_shared_memory() is called twice on error, once when mod_init() fails and once when the module destroy function is called). --- modules/lcr/lcr_mod.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c index 9fc5089..41a3c43 100644 --- a/modules/lcr/lcr_mod.c +++ b/modules/lcr/lcr_mod.c @@ -699,27 +699,34 @@ static void free_shared_memory(void) { if (gws_1) { shm_free(gws_1); + gws_1=0; } if (gws_2) { shm_free(gws_2); + gws_2=0; } if (gws) { shm_free(gws); + gws=0; } if (lcrs_1) { lcr_hash_table_contents_free(lcrs_1); shm_free(lcrs_1); + lcrs_1=0; } if (lcrs_2) { lcr_hash_table_contents_free(lcrs_2); shm_free(lcrs_2); + lcrs_2=0; } if (lcrs) { shm_free(lcrs); + lcrs=0; } if (reload_lock) { lock_destroy(reload_lock); lock_dealloc(reload_lock); + reload_lock=0; } }

15 years, 7 months

git:master: core: destroy RPCs on exit

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 56131033611eefc37155cd3bd509fc5167c2b7e5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5613103… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed May 13 19:14:57 2009 +0200 core: destroy RPCs on exit --- main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/main.c b/main.c index 6369c5a..235d66e 100644 --- a/main.c +++ b/main.c @@ -496,6 +496,7 @@ void cleanup(show_status) some process crashed and let it locked; this will allow an almost gracious shutdown */ #endif + destroy_rpcs(); destroy_modules(); #ifdef USE_DNS_CACHE destroy_dns_cache();

15 years, 7 months

git:master: lcr doc: re-gerenarated README

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 3c03f2280ceb7d54c81eb7d3d5bbb71866012fc2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3c03f22… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed May 13 13:59:53 2009 +0200 lcr doc: re-gerenarated README --- modules/lcr/README | 592 +++++++++++++++++++++++++++++++--------------------- 1 files changed, 357 insertions(+), 235 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=3c0…

15 years, 7 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, 7 months

← Newer
1
...
12
13
14
15
16
17
18
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2009