From 5a209a968044ad5dad0d61c1d0ed576769a48f20 Mon Sep 17 00:00:00 2001
From: Travis Cross <tc@traviscross.com>
Date: Wed, 27 Aug 2014 23:10:54 +0000
Subject: [PATCH] Remove misleading `tport` example from configs
As an example of using mod_sofia's gateway parameter `contact-params`
we'd used the value `tport=tcp`. Looking around, it's clear this has
misled people into believing you can specify `tport=tcp` to make the
gateway use TCP or `tport=tls` to make the gateway use TLS. This does
not work.
The actual contact parameter is named `transport` rather than `tport`,
and you shouldn't use `transport` in `contact-params` because we
automatically add a `transport` to the Contact: based on the value of
`register-transport` (even if the gateway is set to not register).
It's clear why this would be confusing, so we'll just remove this as
an example.
---
conf/insideout/directory/default/brian.xml | 2 +-
conf/insideout/sip_profiles/external/example.xml | 2 +-
conf/insideout/sip_profiles/internal/example.xml | 2 +-
conf/rayo/sip_profiles/external/example.xml | 2 +-
conf/sbc/sbc_profiles/external/example.xml | 2 +-
conf/sbc/sbc_profiles/internal/example.xml | 2 +-
conf/softphone/accounts/example.xml | 2 +-
conf/vanilla/directory/default/brian.xml | 2 +-
conf/vanilla/sip_profiles/external/example.xml | 2 +-
conf/vanilla/sip_profiles/internal/example.xml | 2 +-
src/mod/endpoints/mod_sofia/conf/sofia.conf.xml | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/conf/insideout/directory/default/brian.xml b/conf/insideout/directory/default/brian.xml
index 4bd562686f..43f349f144 100644
--- a/conf/insideout/directory/default/brian.xml
+++ b/conf/insideout/directory/default/brian.xml
@@ -34,7 +34,7 @@
<!--Use the callerid of an inbound call in the from field on outbound calls via this gateway -->
<!--<param name="caller-id-in-from" value="false"/>-->
<!--extra sip params to send in the contact-->
- <!--<param name="contact-params" value="tport=tcp"/>-->
+ <!--<param name="contact-params" value=""/>-->
<!--send an options ping every x seconds, failure will unregister and/or mark it down-->
<!--<param name="ping" value="25"/>-->
<!--</gateway>-->
diff --git a/conf/insideout/sip_profiles/external/example.xml b/conf/insideout/sip_profiles/external/example.xml
index c6b79e8fe3..64081fdcd8 100644
--- a/conf/insideout/sip_profiles/external/example.xml
+++ b/conf/insideout/sip_profiles/external/example.xml
@@ -27,7 +27,7 @@
<!--Use the callerid of an inbound call in the from field on outbound calls via this gateway -->
<!--<param name="caller-id-in-from" value="false"/>-->
<!--extra sip params to send in the contact-->
- <!--<param name="contact-params" value="tport=tcp"/>-->
+ <!--<param name="contact-params" value=""/>-->
<!--send an options ping every x seconds, failure will unregister and/or mark it down-->
<!--<param name="ping" value="25"/>-->
<!--</gateway>-->
diff --git a/conf/insideout/sip_profiles/internal/example.xml b/conf/insideout/sip_profiles/internal/example.xml
index c6b79e8fe3..64081fdcd8 100644
--- a/conf/insideout/sip_profiles/internal/example.xml
+++ b/conf/insideout/sip_profiles/internal/example.xml
@@ -27,7 +27,7 @@
<!--Use the callerid of an inbound call in the from field on outbound calls via this gateway -->
<!--<param name="caller-id-in-from" value="false"/>-->
<!--extra sip params to send in the contact-->
- <!--<param name="contact-params" value="tport=tcp"/>-->
+ <!--<param name="contact-params" value=""/>-->
<!--send an options ping every x seconds, failure will unregister and/or mark it down-->
<!--<param name="ping" value="25"/>-->
<!--</gateway>-->
diff --git a/conf/rayo/sip_profiles/external/example.xml b/conf/rayo/sip_profiles/external/example.xml
index 2a4df31aaf..0497bcd1e1 100644
--- a/conf/rayo/sip_profiles/external/example.xml
+++ b/conf/rayo/sip_profiles/external/example.xml
@@ -27,7 +27,7 @@
<!--Use the callerid of an inbound call in the from field on outbound calls via this gateway -->
<!--<param name="caller-id-in-from" value="false"/>-->
<!--extra sip params to send in the contact-->
- <!--<param name="contact-params" value="tport=tcp"/>-->
+ <!--<param name="contact-params" value=""/>-->
<!--send an options ping every x seconds, failure will unregister and/or mark it down-->
<!--<param name="ping" value="25"/>-->
<!--</gateway>-->
diff --git a/conf/sbc/sbc_profiles/external/example.xml b/conf/sbc/sbc_profiles/external/example.xml
index c6b79e8fe3..64081fdcd8 100644
--- a/conf/sbc/sbc_profiles/external/example.xml
+++ b/conf/sbc/sbc_profiles/external/example.xml
@@ -27,7 +27,7 @@
<!--Use the callerid of an inbound call in the from field on outbound calls via this gateway -->
<!--<param name="caller-id-in-from" value="false"/>-->
<!--extra sip params to send in the contact-->
- <!--<param name="contact-params" value="tport=tcp"/>-->
+ <!--<param name="contact-params" value=""/>-->
<!--send an options ping every x seconds, failure will unregister and/or mark it down-->
<!--<param name="ping" value="25"/>-->
<!--</gateway>-->
diff --git a/conf/sbc/sbc_profiles/internal/example.xml b/conf/sbc/sbc_profiles/internal/example.xml
index c6b79e8fe3..64081fdcd8 100644
--- a/conf/sbc/sbc_profiles/internal/example.xml
+++ b/conf/sbc/sbc_profiles/internal/example.xml
@@ -27,7 +27,7 @@
<!--Use the callerid of an inbound call in the from field on outbound calls via this gateway -->
<!--<param name="caller-id-in-from" value="false"/>-->
<!--extra sip params to send in the contact-->
- <!--<param name="contact-params" value="tport=tcp"/>-->
+ <!--<param name="contact-params" value=""/>-->
<!--send an options ping every x seconds, failure will unregister and/or mark it down-->
<!--<param name="ping" value="25"/>-->
<!--</gateway>-->
diff --git a/conf/softphone/accounts/example.xml b/conf/softphone/accounts/example.xml
index 7ac8db1186..249b460709 100644
--- a/conf/softphone/accounts/example.xml
+++ b/conf/softphone/accounts/example.xml
@@ -27,7 +27,7 @@
<!--Use the callerid of an inbound call in the from field on outbound calls via this gateway -->
<!--<param name="caller-id-in-from" value="false"/>-->
<!--extra sip params to send in the contact-->
- <!--<param name="contact-params" value="tport=tcp"/>-->
+ <!--<param name="contact-params" value=""/>-->
<!--send an options ping every x seconds, failure will unregister and/or mark it down-->
<!--<param name="ping" value="25"/>-->
<!--</gateway>-->
diff --git a/conf/vanilla/directory/default/brian.xml b/conf/vanilla/directory/default/brian.xml
index 5ea3f58ea6..98f720f47e 100644
--- a/conf/vanilla/directory/default/brian.xml
+++ b/conf/vanilla/directory/default/brian.xml
@@ -36,7 +36,7 @@
<!--Use the callerid of an inbound call in the from field on outbound calls via this gateway -->
<!--<param name="caller-id-in-from" value="false"/>-->
<!--extra sip params to send in the contact-->
- <!--<param name="contact-params" value="tport=tcp"/>-->
+ <!--<param name="contact-params" value=""/>-->
<!--send an options ping every x seconds, failure will unregister and/or mark it down-->
<!--<param name="ping" value="25"/>-->
<!--</gateway>-->
diff --git a/conf/vanilla/sip_profiles/external/example.xml b/conf/vanilla/sip_profiles/external/example.xml
index 2a4df31aaf..0497bcd1e1 100644
--- a/conf/vanilla/sip_profiles/external/example.xml
+++ b/conf/vanilla/sip_profiles/external/example.xml
@@ -27,7 +27,7 @@
<!--Use the callerid of an inbound call in the from field on outbound calls via this gateway -->
<!--<param name="caller-id-in-from" value="false"/>-->
<!--extra sip params to send in the contact-->
- <!--<param name="contact-params" value="tport=tcp"/>-->
+ <!--<param name="contact-params" value=""/>-->
<!--send an options ping every x seconds, failure will unregister and/or mark it down-->
<!--<param name="ping" value="25"/>-->
<!--</gateway>-->
diff --git a/conf/vanilla/sip_profiles/internal/example.xml b/conf/vanilla/sip_profiles/internal/example.xml
index 10263b05a5..a5cbd7d2b7 100644
--- a/conf/vanilla/sip_profiles/internal/example.xml
+++ b/conf/vanilla/sip_profiles/internal/example.xml
@@ -27,7 +27,7 @@
<!--Use the callerid of an inbound call in the from field on outbound calls via this gateway -->
<!--<param name="caller-id-in-from" value="false"/>-->
<!--extra sip params to send in the contact-->
- <!--<param name="contact-params" value="tport=tcp"/>-->
+ <!--<param name="contact-params" value=""/>-->
<!-- Put the extension in the contact -->
<!--<param name="extension-in-contact" value="true"/>-->
<!--send an options ping every x seconds, failure will unregister and/or mark it down-->
diff --git a/src/mod/endpoints/mod_sofia/conf/sofia.conf.xml b/src/mod/endpoints/mod_sofia/conf/sofia.conf.xml
index f624fa5a74..52fb8faefb 100644
--- a/src/mod/endpoints/mod_sofia/conf/sofia.conf.xml
+++ b/src/mod/endpoints/mod_sofia/conf/sofia.conf.xml
@@ -43,7 +43,7 @@
calls via this gateway -->
<param name="caller-id-in-from" value="false"/>
<!-- extra sip params to send in the contact -->
- <param name="contact-params" value="tport=tcp"/>
+ <param name="contact-params" value=""/>
<!-- put the extension in the contact -->
<param name="extension-in-contact" value="true"/>
<!-- send an options ping every x seconds, failure will unregister