Module: sip-router
Branch: master
Commit: a9ca3f4a05d0655b11ba90bc64d68b53c4ba039c
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a9ca3f4…
Author: Olle E. Johansson <oej(a)edvina.net>
Committer: Olle E. Johansson <oej(a)edvina.net>
Date: Fri Feb 8 21:03:07 2013 +0100
ipops Minor updates to README
---
modules/ipops/README | 15 +++++++++------
modules/ipops/doc/ipops_admin.xml | 11 +++++------
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/modules/ipops/README b/modules/ipops/README
index cd61bb0..a0250a5 100644
--- a/modules/ipops/README
+++ b/modules/ipops/README
@@ -76,8 +76,8 @@ Chapter 1. Admin Guide
1. Overview
- This module offers operations for handling IP addresses in both IPv4
- and IPv6.
+ This module offers operations for handling IP addresses, both IPv4 and
+ IPv6.
IPv6 is defined in RFC 2460. The same IPv6 address can be represented
by different ASCII strings, so binary comparison is required. For
@@ -131,7 +131,8 @@ Chapter 1. Admin Guide
FALSE otherwise.
Parameters:
- * ip - String or pseudo-variable containing the IP to evaluate.
+ * ip - String or pseudo-variable containing the IP address to
+ evaluate.
This function can be used from REQUEST_ROUTE, FAILURE_ROUTE,
ONREPLY_ROUTE, BRANCH_ROUTE and LOCAL_ROUTE.
@@ -251,7 +252,8 @@ switch($rc) {
4.7. compare_ips (ip1, ip2)
Returns TRUE if both IP addresses are the same. FALSE otherwise. This
- function also allows comparing an IPv6 against an IPv6 reference.
+ function also allows comparing an IPv6 address against an IPv6
+ reference.
Parameters:
* ip1 - String or pseudo-variable containing the first IP to compare.
@@ -275,8 +277,9 @@ if (compare_ips("1080:0000:0000:0000:0008:0800:200C:417A", "[1080::8:800:200C:41
does NOT allow comparing an IPv6 against an IPv6 reference.
Parameters:
- * ip1 - String or pseudo-variable containing the first IP to compare.
- * ip2 - String or pseudo-variable containing the second IP to
+ * ip1 - String or pseudo-variable containing the first IP address to
+ compare.
+ * ip2 - String or pseudo-variable containing the second IP address to
compare.
This function can be used from REQUEST_ROUTE, FAILURE_ROUTE,
diff --git a/modules/ipops/doc/ipops_admin.xml b/modules/ipops/doc/ipops_admin.xml
index 317d86b..8cbeac2 100644
--- a/modules/ipops/doc/ipops_admin.xml
+++ b/modules/ipops/doc/ipops_admin.xml
@@ -19,9 +19,8 @@
<title>Overview</title>
<para>
- This module offers operations for handling IP addresses in both IPv4 and IPv6.
+ This module offers operations for handling IP addresses, both IPv4 and IPv6.
</para>
-
<para>
IPv6 is defined in <ulink url="http://tools.ietf.org/html/rfc2460">RFC 2460</ulink>.
The same IPv6 address can be represented by different ASCII strings, so binary comparison is required.
@@ -108,7 +107,7 @@
<itemizedlist>
<listitem>
<para>
- <emphasis>ip</emphasis> - String or pseudo-variable containing the IP to evaluate.
+ <emphasis>ip</emphasis> - String or pseudo-variable containing the IP address to evaluate.
</para>
</listitem>
</itemizedlist>
@@ -367,7 +366,7 @@ switch($rc) {
<para>
Returns TRUE if both IP addresses are the same. FALSE otherwise.
- This function also allows comparing an IPv6 against an IPv6 reference.
+ This function also allows comparing an IPv6 address against an IPv6 reference.
</para>
<para>Parameters:</para>
@@ -419,12 +418,12 @@ if (compare_ips("1080:0000:0000:0000:0008:0800:200C:417A", "[1080::8:800:200C:41
<itemizedlist>
<listitem>
<para>
- <emphasis>ip1</emphasis> - String or pseudo-variable containing the first IP to compare.
+ <emphasis>ip1</emphasis> - String or pseudo-variable containing the first IP address to compare.
</para>
</listitem>
<listitem>
<para>
- <emphasis>ip2</emphasis> - String or pseudo-variable containing the second IP to compare.
+ <emphasis>ip2</emphasis> - String or pseudo-variable containing the second IP address to compare.
</para>
</listitem>
</itemizedlist>
Module: sip-router
Branch: master
Commit: 28ee292ca10a8fc8428ac8cff763dbf57ed19db3
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=28ee292…
Author: Olle E. Johansson <oej(a)edvina.net>
Committer: Olle E. Johansson <oej(a)edvina.net>
Date: Fri Feb 8 21:21:02 2013 +0100
ldap Convert an "a" to an "o"
---
modules/ldap/doc/ldap_admin.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/modules/ldap/doc/ldap_admin.xml b/modules/ldap/doc/ldap_admin.xml
index c76b5e2..a959d69 100644
--- a/modules/ldap/doc/ldap_admin.xml
+++ b/modules/ldap/doc/ldap_admin.xml
@@ -21,7 +21,7 @@
<para>The following features are offered by the LDAP module:</para>
<itemizedlist>
<listitem>
- <para>LDAP search function based an a LDAP URL</para>
+ <para>LDAP search function based on a LDAP URL</para>
</listitem>
<listitem>
<para>LDAP result parsing functions to store LDAP data as AVP variables</para>
Module: sip-router
Branch: master
Commit: 63653d7d18a7124ff3a33991f3db4cd8271a9e24
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=63653d7…
Author: Olle E. Johansson <oej(a)edvina.net>
Committer: Olle E. Johansson <oej(a)edvina.net>
Date: Fri Feb 8 20:56:06 2013 +0100
mi_fifo Typo fixes mostly
---
modules/mi_fifo/README | 18 +++++++++---------
modules/mi_fifo/doc/mi_fifo_admin.xml | 18 +++++++++---------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/modules/mi_fifo/README b/modules/mi_fifo/README
index 82875dc..ed42377 100644
--- a/modules/mi_fifo/README
+++ b/modules/mi_fifo/README
@@ -70,11 +70,11 @@ Chapter 1. Admin Guide
1. Overview
This is a module which provides a FIFO transport layer implementation
- for Management Interface.
+ for the Management Interface.
2. FIFO command syntax
- The external commands issued via FIFO interface must follow the
+ The external commands issued via the FIFO interface must follow the
following syntax:
* request = first_line argument*
* first_line = ':'command_name':'reply_fifo'\n'
@@ -117,7 +117,7 @@ Chapter 1. Admin Guide
Example 1.1. Set fifo_name parameter
...
-modparam("mi_fifo", "fifo_name", "/tmp/openser_fifo")
+modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")
...
4.2. fifo_mode (integer)
@@ -134,9 +134,9 @@ modparam("mi_fifo", "fifo_mode", 0600)
4.3. fifo_group (integer) fifo_group (string)
- Group to be used for creating the listening FIFO file.
+ System Group to be used for creating the listening FIFO file.
- Default value is the inherited one.
+ Default value is the inherited one (process group).
Example 1.3. Set fifo_group parameter
...
@@ -146,9 +146,9 @@ modparam("mi_fifo", "fifo_group", "root")
4.4. fifo_user (integer) fifo_group (string)
- User to be used for creating the listening FIFO file.
+ System User to be used for creating the listening FIFO file.
- Default value is the inherited one.
+ Default value is the inherited one (process user).
Example 1.4. Set fifo_user parameter
...
@@ -170,7 +170,7 @@ modparam("mi_fifo", "reply_dir", "/home/kamailio/tmp/")
4.6. reply_indent (string)
Strings to be used for line indentation. As the MI data structure is
- tree oriendeted, the depth level will printed as indentation.
+ tree oriented, the depth level will be printed as indentation.
Default value is ""\t" (TAB)".
@@ -186,7 +186,7 @@ modparam("mi_fifo", "reply_indent", " ")
6. Example
This is an example showing the FIFO format for the "get_statistics
- dialog: tm:" MI commad: response.
+ dialog: tm:" MI command response.
Example 1.7. FIFO request
:get_statistics:reply_fifo\n
diff --git a/modules/mi_fifo/doc/mi_fifo_admin.xml b/modules/mi_fifo/doc/mi_fifo_admin.xml
index 0227144..714772d 100644
--- a/modules/mi_fifo/doc/mi_fifo_admin.xml
+++ b/modules/mi_fifo/doc/mi_fifo_admin.xml
@@ -17,14 +17,14 @@
<title>Overview</title>
<para>
This is a module which provides a FIFO transport layer
- implementation for Management Interface.
+ implementation for the Management Interface.
</para>
</section>
<section>
<title>FIFO command syntax</title>
<para>
- The external commands issued via FIFO interface must follow the
+ The external commands issued via the FIFO interface must follow the
following syntax:
<itemizedlist>
<listitem><para><emphasis>
@@ -97,7 +97,7 @@
<title>Set <varname>fifo_name</varname> parameter</title>
<programlisting format="linespecific">
...
-modparam("mi_fifo", "fifo_name", "/tmp/openser_fifo")
+modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")
...
</programlisting>
</example>
@@ -128,11 +128,11 @@ modparam("mi_fifo", "fifo_mode", 0600)
<title><varname>fifo_group</varname> (integer)
<varname>fifo_group</varname> (string)</title>
<para>
- Group to be used for creating the listening FIFO file.
+ System Group to be used for creating the listening FIFO file.
</para>
<para>
<emphasis>
- Default value is the inherited one.
+ Default value is the inherited one (process group).
</emphasis>
</para>
<example>
@@ -150,11 +150,11 @@ modparam("mi_fifo", "fifo_group", "root")
<title><varname>fifo_user</varname> (integer)
<varname>fifo_group</varname> (string)</title>
<para>
- User to be used for creating the listening FIFO file.
+ System User to be used for creating the listening FIFO file.
</para>
<para>
<emphasis>
- Default value is the inherited one.
+ Default value is the inherited one (process user).
</emphasis>
</para>
<example>
@@ -192,7 +192,7 @@ modparam("mi_fifo", "reply_dir", "/home/kamailio/tmp/")
<title><varname>reply_indent</varname> (string)</title>
<para>
Strings to be used for line indentation. As the MI data structure
- is tree oriendeted, the depth level will printed as indentation.
+ is tree oriented, the depth level will be printed as indentation.
</para>
<para>
<emphasis>
@@ -222,7 +222,7 @@ modparam("mi_fifo", "reply_indent", " ")
<title>Example</title>
<para>
This is an example showing the FIFO format for the
- <quote>get_statistics dialog: tm:</quote> MI commad:
+ <quote>get_statistics dialog: tm:</quote> MI command
response.
</para>
<example>
Reading the outbound module documentation, Kamailio has to be recompiled with stun support.
Any reason why STUN is disabled by default?
For this to work with packaging, would it be possible to make this a configuration option instead of a compile option?
if it is possible, would it require a major change or can we do that as a bugfix for the 4.0?
/O
When I used, last versions from git, I got error and crash of kamailo
using m_dump.
I got latest version from git, and I made one patch:
diff --git a/modules/msilo/msilo.c b/modules/msilo/msilo.c
index 209b309..4bda8fa 100644
--- a/modules/msilo/msilo.c
+++ b/modules/msilo/msilo.c
@@ -1125,8 +1125,16 @@ static int m_dump(struct sip_msg* msg, str* owner_s)
memcpy(tmp_extra_hdrs.s, extra_hdrs_str.s,
extra_hdrs_str.len);
memcpy(tmp_extra_hdrs.s+extra_hdrs_str.len,
str_vals[4].s, str_vals[4].len);
} else {
- tmp_extra_hdrs.len = 0;
- tmp_extra_hdrs.s = "";
+ tmp_extra_hdrs.len = 0;
+ if ((tmp_extra_hdrs.s = pkg_malloc(1)) == NULL)
+ {
+ LM_ERR("Out of pkg memory");
+ if (msilo_dbf.free_result(db_con, db_res) < 0)
+ LM_ERR("failed to free the
query result\n");
+ msg_list_set_flag(ml, mid, MS_MSG_ERRO);
+ goto error;
+ }
+ tmp_extra_hdrs.s[0]='\x0';
}
hdr_str.len = 1024;
if(m_build_headers(&hdr_str, str_vals[3] /*ctype*/,
The problem is:
tmp_extra_hdrs.s = "";
and consequent
pkg_free(tmp_extra_hdrs.s);
As I see, there are couple of ways to solve problem, one of them is
setting tmp_extra_hdrs.s = 0; but then we have warnings, or setting
tmp_extra_hdrs.s = 0;
and check before pkg_free, but pkg_free is used on couple of places.
I am not sure what is the best way to report bugs and offer patches.
Hi,
I'm using the presence module and I'm quite annoying about the flood
of messages from the module. This is a trivial patch just for set the
level of that message to debug.
Thanks in advance,
Víctor
LOG(L_ERR, "sipcapture:hep_msg_received HEP is not enabled\n");
if(!hep_capture_on) {
LOG(L_ERR, "sipcapture:hep_msg_received HEP is not enabled\n");
return -1;
}
THis part of the code (in hep.c) seems to log the error all the time, but when we have an issue, log it twice.
/O