Hello,
in order to build the packages for 3.1.0 without conflicts, please make
your commits before 14:00CEST (Madrid, Paris, Berlin - UTC+2). If you
still have some to do afterwards, please ask on
sr-dev(a)lists.sip-router.org before committing.
Thanks,
Daniel
--
Daniel-Constantin Mierla
http://www.asipto.com
Module: sip-router
Branch: master
Commit: 7fdb47ff7f10e5dcd4855b83c58d4d9a60f5fb81
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7fdb47f…
Author: Henning Westerholt <henning.westerholt(a)1und1.de>
Committer: Henning Westerholt <henning.westerholt(a)1und1.de>
Date: Wed Oct 6 11:30:44 2010 +0200
xmlops: regenerate README after doc change
---
modules/xmlops/README | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/modules/xmlops/README b/modules/xmlops/README
index e2c57e1..6c183ff 100644
--- a/modules/xmlops/README
+++ b/modules/xmlops/README
@@ -25,7 +25,7 @@ Daniel-Constantin Mierla
1.1. Overview
- This is a module implementing funtions and pseudo-variables for XML
+ This is a module implementing functions and pseudo-variables for XML
operations.
1.2. Dependencies
@@ -39,7 +39,8 @@ Daniel-Constantin Mierla
The following libraries or applications must be installed before
running kamailio with this module loaded:
- * libxml - for compilaiton is needed the devel vesion as well.
+ * libxml - for compilation from source, the development headers from
+ this library are needed as well.
1.3. Parameters
@@ -69,7 +70,7 @@ modparam("xmlops", "xml_ns", "rpid=urn:ietf:params:xml:ns:pidf:rpid")
1.4.1. $xml(name=>spec)
Pseudo-variable for XML document operations using xpath syntax. For
- more see the Peudo-Variables Cookbook.
+ more see the Pseudo-Variables Cookbook.
Example 3. xml usage
...
Module: sip-router
Branch: master
Commit: cdd414350ab425c916ddc934fd444dc6700b08df
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cdd4143…
Author: Alex Balashov <abalashov(a)evaristesys.com>
Committer: Alex Balashov <abalashov(a)evaristesys.com>
Date: Wed Oct 6 02:33:44 2010 -0400
Added regenerated README for 'debugger' as well, because that seems to
be the convention for doc changes. Is it?
---
modules/debugger/README | 61 ++++++++++++++++++++++++-----------------------
1 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/modules/debugger/README b/modules/debugger/README
index 8e55a64..4725d77 100644
--- a/modules/debugger/README
+++ b/modules/debugger/README
@@ -91,8 +91,8 @@ Chapter 1. Admin Guide
1. Overview
This module provides an interactive config file debugger. It can print
- the trace of config execution for a SIP message to log and set
- breakpoints on every config action, allowing to execute step by step
+ a trace of config execution for a SIP message to log and set
+ breakpoints on every config action, allowing step-by-step execution of
the config.
Debugging can be done from local or remote host via RPC interface
@@ -105,9 +105,9 @@ Chapter 1. Admin Guide
Also the config running trace can be enabled/disabled at runtime.
When the SIP router process is stopped at a breakpoint, you can
- investigate the values of any pseudo-varaibles. Note that some of
- pseudo-variables may produce memory leak, that is planned to fix in the
- future (here falls pseudo-variables with dynamic name such as htable,
+ investigate the values of any pseudo-variables. Note that some of
+ pseudo-variables may produce memory leaks; a fix is planned in the
+ future (here fall pseudo-variables with dynamic name such as htable,
sqlops). References to SIP message, avps, headers, script and shared
variables are safe.
@@ -164,7 +164,7 @@ modparam("debugger", "breakpoint", 1)
3.3. log_level (int)
- What log level to be used to print module specific messages.
+ What log level is to be used to print module-specific messages.
Default value is “-1” (L_ERR).
@@ -175,7 +175,7 @@ modparam("debugger", "log_level", 1)
3.4. log_facility (str)
- What log facility to be used to print module specific messages.
+ What log facility is to be used to print module-specific messages.
Default value is “NULL” (default from core).
@@ -186,7 +186,7 @@ modparam("debugger", "log_facility", "LOG_DAEMON")
3.5. log_prefix (str)
- String to print before any module specific messages.
+ String to print before any module-specific messages.
Default value is “*** cfgtrace:”.
@@ -198,9 +198,9 @@ modparam("debugger", "log_prefix", "from-debugger-with-love:")
3.6. step_usleep (int)
Microseconds to sleep before checking for new commands when waiting at
- breakpoint
+ breakpoint.
- Default value is “100000” (that is 0.1sec).
+ Default value is “100000” (that is 0.1 sec).
Example 1.6. Set step_usleep parameter
...
@@ -211,7 +211,7 @@ modparam("debugger", "step_usleep", 500000)
How many sleeps of 'step_usleep' the RPC process performs when waiting
for a reply from worker process before responding to RPC. This avoids
- blocking RPC process for ever in case the worker process 'forgets' to
+ blocking RPC process forever in case the worker process 'forgets' to
write back a reply.
Default value is “200”.
@@ -227,11 +227,12 @@ modparam("debugger", "step_loops", 100)
4.1. dbg_breakpoint(mode)
- Anchor a breakpoint at that line in config. Mode specifies whether the
- breakpoint is enabled (1) or disabled (0) at startup.
+ Anchor a breakpoint at the current line of the config (the one on which
+ this function is called). The 'mode' specifies whether the breakpoint
+ is enabled (1) or disabled (0) at startup.
Note that this version does not export this anchors to RPC for
- interactive debugging (temporary disabled).
+ interactive debugging (temporarily disabled).
Example 1.8. dbg_breakpoint usage
...
@@ -252,10 +253,10 @@ if($si=="10.0.0.10")
Name: dbg.list
Parameters:
- * _pid_ : pid for which to list the details. If it missing, then will
- print for all processes.
+ * _pid_ : pid for which to list the details. If 'pid' is omitted then
+ will print for all processes.
- Examples for using with sercmd:
+ Examples of use with sercmd:
dbg.ls
dbg.ls 1234
@@ -266,10 +267,10 @@ if($si=="10.0.0.10")
Name: dbg.trace
Parameters:
- * _cmd_ : inner command can be 'on' or 'off' to enable or disable the
- tracing for one or all processe.
- * _pid_ : pid for which to list the details. If it missing, then will
- print for all processes.
+ * _cmd_ : inner command can be 'on' or 'off' to enable or disable
+ tracing for one or all processes.
+ * _pid_ : pid for which to list the details. If 'pid' is omitted,
+ then it will print details for all processes.
Examples for using with sercmd:
dbg.trace on
@@ -285,8 +286,8 @@ if($si=="10.0.0.10")
Parameters:
* _cmd_ : inner command, see next section for the list of available
values.
- * _pid_ : pid for which to apply the inner command. If it is missing,
- then will be applied for all processes.
+ * _pid_ : pid for which to apply the inner command. If 'pid' is
+ omitted, then the inner command will be applied to all processes.
* _params_ : extra params specific for each inner command.
Inner commands:
@@ -321,9 +322,9 @@ if($si=="10.0.0.10")
message. Just enable cfg running trace, send the message and watch the
logs.
- Another typical usage is to do interactive debugging and run
- step-by-step each line in routing blocks of config file for a
- particular SIP message.
+ Another typical usage is to do interactive debugging and run each line
+ of the route blocks of the config file step-by-step for a particular
+ SIP message.
You need to connect using sercmd (or other RPC client) to SIP Router.
Then you can enable cfg breakpoints and send the SIP message. One
@@ -383,7 +384,7 @@ sercmd> dbg.bp move 6402
200 ok
...
- Running config trace looks like:
+ Running the config trace looks like:
...
9(6285) ERROR: *** cfgtrace: c=[/etc/kamailio/debugger.cfg] l=368 a=6 n=route
9(6285) ERROR: *** cfgtrace: c=[/etc/kamailio/debugger.cfg] l=461 a=17 n=if
@@ -432,8 +433,8 @@ set
9(6285) ERROR: *** cfgtrace: c=[/etc/kamailio/debugger.cfg] l=516 a=3 n=exit
...
- Above example is for registration with default config for version
+ The above example is for registration with default config for version
3.1.0, without authentication. Listed fields are: 'c' - config file;
'l' - line; 'a' - internal action id; 'n' - name of executed action.
- 'ERROR' prefix is printed because these messages were sent to L_ERR log
- level.
+ 'ERROR' prefix is printed because these messages were sent to the L_ERR
+ log level.
I compiled 3.0.3 on a Debian system and tried using sqlops.
The module loads ok, but in debugging I only see it registering the modparam "sqlcon" name. Using any function in the module results in errors in parsing the config file. "Unknown command, missing loadmodule?"
Anyone else that have seen this?
/O
If the HTTP responses are implemented by using the SIP parser + fake
Via header to appease it, is it appropriate to conclude that the same
SIP worker processes are used to answer HTTP queries as ones used to
process SIP messages?
Or is there some more asynchronous mechanism, external pthreads, etc.
used to handle HTTP requests?
If SIP workers are used, I will add a note in the xhttp documentation
reminding users not to do anything in their xhttp event-route that is
particularly latent, and observe the same lean throughput principles
as in normal route script. Otherwise, little HTTP requests sent to
the server can block SIP worker threads.
--
Alex Balashov - Principal
Evariste Systems LLC
1170 Peachtree Street
12th Floor, Suite 1200
Atlanta, GA 30309
Tel: +1-678-954-0670
Fax: +1-404-961-1892
Web: http://www.evaristesys.com/
Hello,
I have been searching for the error in KAMCTL regarding lcr commands in
the new RC1 version.
The files "kamctl.base" and "kamctl" in the directory "utils/kamctl"
should be corrected, because following error is included by now:
===========
KAMCTL.BASE
===========
1) wrong table names in kamctl.base
2) wrong column definition (grp_id is no longer present)
excerpt:
[...]
# lcr tables
if [ -z "$LCR_TABLE" ] ; then
LCR_TABLE=lcr
fi
LCR_ID_COLUMN=lcr_id
LCR_PREFIX_COLUMN=prefix
LCR_GRPID_COLUMN=grp_id
# gw table
if [ -z "$GW_TABLE" ] ; then
GW_TABLE=gw
fi
[...]
=======
KAMCTL
=======
1) the DB-queries are not up to date, because the table structure has
changed; now three tables instead of two are used; the GRPID_column is no
longer valid a.s.o.
2) I have not found any declaration of RPCCMD within the sourcecode - so
these functions are not supported now
excerpt:
[...]
### LCR management
#
lcr() {
case $1 in
show_gws)
require_dbengine
mecho "lcr gateways"
QUERY="select * FROM $GW_TABLE ORDER BY $LCR_ID_COLUMN,
$LCR_GW_GRPID_COLUMN; "
$DBROCMD "$QUERY"
;;
show_routes)
require_dbengine
mecho "lcr routes"
QUERY="select * FROM $LCR_TABLE ORDER BY $LCR_ID_COLUMN,
$LCR_PREFIX_COLUMN; "
$DBROCMD "$QUERY"
;;
reload)
$RPCCMD lcr.reload
;;
dump_gws)
$RPCCMD lcr.dump_gws
;;
dump_routes)
$RPCCMD lcr.dump_lcrs
;;
[...]
regards,
Klaus Feichtinger
Module: sip-router
Branch: master
Commit: fc07c55d2c7f549feeb0eb7cb4f98a1180614dda
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fc07c55…
Author: Alex Balashov <abalashov(a)evaristesys.com>
Committer: Alex Balashov <abalashov(a)evaristesys.com>
Date: Wed Oct 6 03:15:26 2010 -0400
One more fix to xhttp documentation.
---
modules/xhttp/README | 5 +++--
modules/xhttp/doc/xhttp_admin.xml | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/modules/xhttp/README b/modules/xhttp/README
index 0133f15..9619be5 100644
--- a/modules/xhttp/README
+++ b/modules/xhttp/README
@@ -66,8 +66,9 @@ Chapter 1. Admin Guide
The xmlrpc module uses the same concept. xHTTP module offers a generic
HTTP handling way, by calling event_route[xhttp:request] in your
- config. You can check the HTTP URI via config variable $hu. Note that
- $ru will raise errors since URO is not valid for SIP.
+ config. You can check the HTTP URL via config variable $hu. Note that
+ use of $ru will raise errors since the structure of an HTTP URL is not
+ compatible with that of a SIP URI.
2. Dependencies
diff --git a/modules/xhttp/doc/xhttp_admin.xml b/modules/xhttp/doc/xhttp_admin.xml
index ee735ca..44f7ef0 100644
--- a/modules/xhttp/doc/xhttp_admin.xml
+++ b/modules/xhttp/doc/xhttp_admin.xml
@@ -24,8 +24,9 @@
<para>
The xmlrpc module uses the same concept. xHTTP module offers a
generic HTTP handling way, by calling event_route[xhttp:request]
- in your config. You can check the HTTP URI via config variable
- $hu. Note that $ru will raise errors since URO is not valid for SIP.
+ in your config. You can check the HTTP URL via config variable
+ $hu. Note that use of $ru will raise errors since the structure
+ of an HTTP URL is not compatible with that of a SIP URI.
</para>
</section>
<section>
Module: sip-router
Branch: master
Commit: 45b3f656c69ad43e6f9cf072ce3805dfcfdd49b4
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=45b3f65…
Author: Alex Balashov <abalashov(a)evaristesys.com>
Committer: Alex Balashov <abalashov(a)evaristesys.com>
Date: Wed Oct 6 03:10:47 2010 -0400
Some typo fixes and minor tweaks to xmlops docs.
---
modules/xmlops/doc/functions.xml | 2 +-
modules/xmlops/doc/xmlops.xml | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/modules/xmlops/doc/functions.xml b/modules/xmlops/doc/functions.xml
index 8f1fc49..36daac0 100644
--- a/modules/xmlops/doc/functions.xml
+++ b/modules/xmlops/doc/functions.xml
@@ -11,7 +11,7 @@
</title>
<para>
Pseudo-variable for XML document operations using xpath syntax. For
- more see the Peudo-Variables Cookbook.
+ more see the Pseudo-Variables Cookbook.
</para>
<example>
<title><function>xml</function> usage</title>
diff --git a/modules/xmlops/doc/xmlops.xml b/modules/xmlops/doc/xmlops.xml
index fe8a9a1..94fc4b8 100644
--- a/modules/xmlops/doc/xmlops.xml
+++ b/modules/xmlops/doc/xmlops.xml
@@ -23,7 +23,7 @@
<section id="xmlops.overview">
<title>Overview</title>
<para>
- This is a module implementing funtions and pseudo-variables for
+ This is a module implementing functions and pseudo-variables for
XML operations.
</para>
</section>
@@ -51,8 +51,8 @@
<itemizedlist>
<listitem>
<para>
- <emphasis>libxml</emphasis> - for compilaiton is needed the devel
- vesion as well.
+ <emphasis>libxml</emphasis> - for compilation from source, the
+ development headers from this library are needed as well.
</para>
</listitem>
</itemizedlist>
Module: sip-router
Branch: master
Commit: b520501258d59192746b1771e6827da543963189
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b520501…
Author: Alex Balashov <abalashov(a)evaristesys.com>
Committer: Alex Balashov <abalashov(a)evaristesys.com>
Date: Wed Oct 6 03:08:05 2010 -0400
Fixed some typos in xhttp module docs.
---
modules/xhttp/README | 15 ++++++++-------
modules/xhttp/doc/xhttp_admin.xml | 12 ++++++------
2 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/modules/xhttp/README b/modules/xhttp/README
index ae772fd..0133f15 100644
--- a/modules/xhttp/README
+++ b/modules/xhttp/README
@@ -59,14 +59,15 @@ Chapter 1. Admin Guide
1. Overview
- This module provides a basic HTTP/1.0 server functionaly inside SIP
- server. SIP and HTTP are very similar protocols, practically the SIP
- parser can handle easy HTTP requests just by adding a fake Via header.
+ This module provides basic HTTP/1.0 server functionality inside SIP
+ Router. SIP and HTTP are very similar protocols, so, practically, the
+ SIP parser can easily handle HTTP requests just by adding a fake Via
+ header.
The xmlrpc module uses the same concept. xHTTP module offers a generic
HTTP handling way, by calling event_route[xhttp:request] in your
config. You can check the HTTP URI via config variable $hu. Note that
- $ru will rise errors since URO is not valid for SIP.
+ $ru will raise errors since URO is not valid for SIP.
2. Dependencies
@@ -91,8 +92,8 @@ Chapter 1. Admin Guide
3.1. url_skip (str)
- Regular expression to match the HTTP URL. If there is match, then event
- route is not executed.
+ Regular expression to match the HTTP URL. If there is a match, then
+ event route is not executed.
Default value is null (don't skip).
@@ -103,7 +104,7 @@ modparam("xhttp", "url_skip", "^/RPC2")
3.2. url_match (str)
- Regular expression to match the HTPP URL. If there is no match, then
+ Regular expression to match the HTTP URL. If there is no match, then
event route is not executed. This check is done after url_skip, so if
both url_skip and url_match would match then the event route is not
executed (url_skip has higher priority).
diff --git a/modules/xhttp/doc/xhttp_admin.xml b/modules/xhttp/doc/xhttp_admin.xml
index 7128d34..ee735ca 100644
--- a/modules/xhttp/doc/xhttp_admin.xml
+++ b/modules/xhttp/doc/xhttp_admin.xml
@@ -16,16 +16,16 @@
<section>
<title>Overview</title>
<para>
- This module provides a basic HTTP/1.0 server functionaly inside SIP
- server. SIP and HTTP are very similar protocols, practically the
- SIP parser can handle easy HTTP requests just by adding a fake
+ This module provides basic HTTP/1.0 server functionality inside SIP
+ Router. SIP and HTTP are very similar protocols, so, practically, the
+ SIP parser can easily handle HTTP requests just by adding a fake
Via header.
</para>
<para>
The xmlrpc module uses the same concept. xHTTP module offers a
generic HTTP handling way, by calling event_route[xhttp:request]
in your config. You can check the HTTP URI via config variable
- $hu. Note that $ru will rise errors since URO is not valid for SIP.
+ $hu. Note that $ru will raise errors since URO is not valid for SIP.
</para>
</section>
<section>
@@ -63,7 +63,7 @@
<section>
<title><varname>url_skip</varname> (str)</title>
<para>
- Regular expression to match the HTTP URL. If there is match,
+ Regular expression to match the HTTP URL. If there is a match,
then event route is not executed.
</para>
<para>
@@ -83,7 +83,7 @@ modparam("xhttp", "url_skip", "^/RPC2")
<section>
<title><varname>url_match</varname> (str)</title>
<para>
- Regular expression to match the HTPP URL. If there is no match,
+ Regular expression to match the HTTP URL. If there is no match,
then event route is not executed. This check is done after
url_skip, so if both url_skip and url_match would match then
the event route is not executed (url_skip has higher priority).