Module: sip-router
Branch: master
Commit: 6dc38a3618b2ad08bbc6feeee1c44ca19e0c5bd6
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6dc38a3…
Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com>
Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com>
Date: Sat May 18 20:42:24 2013 +0100
modules/msrp: Updated documentation
---
modules/msrp/README | 3 +++
modules/msrp/doc/msrp_admin.xml | 11 +++++++++++
2 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/modules/msrp/README b/modules/msrp/README
index 2e5b9da..343fd72 100644
--- a/modules/msrp/README
+++ b/modules/msrp/README
@@ -158,6 +158,9 @@ Chapter 1. Admin Guide
The following modules must be loaded before this module:
* None.
+ The following modules are required to make proper use of this module:
+ * tls.
+
2.2. External Libraries or Applications
The following libraries or applications must be installed before
diff --git a/modules/msrp/doc/msrp_admin.xml b/modules/msrp/doc/msrp_admin.xml
index 1d09ac0..0ebd85c 100644
--- a/modules/msrp/doc/msrp_admin.xml
+++ b/modules/msrp/doc/msrp_admin.xml
@@ -65,6 +65,17 @@
</listitem>
</itemizedlist>
</para>
+ <para>
+ The following modules are required to make proper use of this
+ module:
+ <itemizedlist>
+ <listitem>
+ <para>
+ <emphasis>tls</emphasis>.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
</section>
<section>
<title>External Libraries or Applications</title>
Module: sip-router
Branch: master
Commit: a1136bf809e7d088332d54440a72edee4e30c26a
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a1136bf…
Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com>
Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com>
Date: Sat May 18 20:27:45 2013 +0100
modules/outbound: moved the check for "Supported: outbound" to after the checks on the Route: header
- In the scenario when a call comes from a non-outbound end-point to an
outbound end-point the outbound options-tag will not be present, but outbound
should still be used on the final leg between the edge-proxy and the
end-point.
---
modules/outbound/ob_mod.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/modules/outbound/ob_mod.c b/modules/outbound/ob_mod.c
index 63be739..04f2e38 100644
--- a/modules/outbound/ob_mod.c
+++ b/modules/outbound/ob_mod.c
@@ -341,14 +341,6 @@ static int use_outbound_non_reg(struct sip_msg *msg)
int ret;
struct receive_info *rcv = NULL;
- /* Check if Supported: outbound is included */
- if (parse_supported(msg) == 0) {
- if (!(get_supported(msg) & F_OPTION_TAG_OUTBOUND)) {
- LM_DBG("outbound is not supported and thus not used\n");
- return 0;
- }
- }
-
/* Check to see if the top Route-URI is me and has a ;ob parameter */
if (msg->route
|| (parse_headers(msg, HDR_ROUTE_F, 0) != -1 && msg->route))
@@ -408,6 +400,14 @@ static int use_outbound_non_reg(struct sip_msg *msg)
}
}
+ /* Check if Supported: outbound is included */
+ if (parse_supported(msg) == 0) {
+ if (!(get_supported(msg) & F_OPTION_TAG_OUTBOUND)) {
+ LM_DBG("outbound is not supported and thus not used\n");
+ return 0;
+ }
+ }
+
/* Check there is a single Via: */
if (!(parse_headers(msg, HDR_VIA2_F, 0) == -1 || msg->via2 == 0
|| msg->via2->error != PARSE_OK))
Hello,
I tracked down the code for my attempt at this and have put it into the
pd/tcp_event_rt branch.
As discussed during the IRC meeting, the event_route[] bit itself is
pretty straight forward - I just can't work out where to trigger it from.
Regards,
Peter
--
Peter Dunkley
Technical Director
Crocodile RCS Ltd