Author: rco
Date: 2010-04-22 16:40:59 +0200 (Thu, 22 Apr 2010)
New Revision: 1819
Modified:
trunk/core/AmSipDialog.cpp
trunk/core/etc/sems.conf.sample
Log:
- fix for the case where force_outbound_proxy is set to "yes" whereby no
outbound_proxy has been set.
- added description for the new option in the example config file.
Modified: trunk/core/AmSipDialog.cpp
===================================================================
--- trunk/core/AmSipDialog.cpp 2010-04-22 14:27:20 UTC (rev 1818)
+++ trunk/core/AmSipDialog.cpp 2010-04-22 14:40:59 UTC (rev 1819)
@@ -572,14 +572,14 @@
if(!route.empty()) {
- req.route = "Route: ";
- if(force_outbound_proxy){
+ req.route = SIP_HDR_COLSP(SIP_HDR_ROUTE);
+ if(force_outbound_proxy && !outbound_proxy.empty()){
req.route += "<" + outbound_proxy + ";lr>, ";
}
req.route += route + CRLF;
}
else if (remote_tag.empty() && !outbound_proxy.empty()) {
- req.route = "Route: <" + outbound_proxy + ";lr>" CRLF;
+ req.route = SIP_HDR_COLSP(SIP_HDR_ROUTE) "<" + outbound_proxy + ";lr>"
CRLF;
}
if(!body.empty()) {
Modified: trunk/core/etc/sems.conf.sample
===================================================================
--- trunk/core/etc/sems.conf.sample 2010-04-22 14:27:20 UTC (rev 1818)
+++ trunk/core/etc/sems.conf.sample 2010-04-22 14:40:59 UTC (rev 1819)
@@ -71,11 +71,9 @@
# optional parameter: outbound_proxy=uri
#
-# - this sets a next hop for calls and registrations outgoing
-# from SEMS. This does not apply to requests in a dialog that
-# is initiated by someone else and incoming to SEMS, as in
-# this case the next_hop is taken by SEMS from the incoming
-# request that established the dialog.
+# - this sets an outbound proxy for calls and registrations initiated
+# by SEMS. This does not apply to requests in a dialog that
+# is initiated by someone else and incoming to SEMS.
# If this is not set (default setting), then for dialogs
# initiated by SEMS the r-uri is resolved and the request
# is sent there directly.
@@ -88,6 +86,17 @@
# Example:
# outbound_proxy=sip:proxy.mydomain.net
+# optional parameter: force_outbound_proxy={yes|no}
+#
+# - forces SEMS to send any request to the outbound proxy in any
+# situation. This option will only have an effect if the
+# outbound_proxy option has been set.
+#
+# default: no
+#
+# Example:
+# force_outbound_proxy=yes
+
# optional parameter: rtp_low_port=<port>
#
# - sets lowest for RTP used port
_______________________________________________
Semsdev mailing list
[email protected]
http://lists.iptel.org/mailman/listinfo/semsdev
