<p>George Joseph <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/9539">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Kevin Harwell: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved; Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_pjsip: Update endpoint transport option documentation.<br><br>Change-Id: I5394fdff6a296efc8e1695a156e616acd932ae52<br>---<br>M configs/samples/pjsip.conf.sample<br>M res/res_pjsip.c<br>2 files changed, 18 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configs/samples/pjsip.conf.sample b/configs/samples/pjsip.conf.sample</span><br><span>index c2e2918..6969aa0 100644</span><br><span>--- a/configs/samples/pjsip.conf.sample</span><br><span>+++ b/configs/samples/pjsip.conf.sample</span><br><span>@@ -288,8 +288,8 @@</span><br><span> ; a transport that you'll need to uncomment from the previous examples.</span><br><span> ;</span><br><span> ; Uncomment one of the transport lines to choose which transport you want. If</span><br><span style="color: hsl(0, 100%, 40%);">-; not specified then the default transport chosen is the first defined transport</span><br><span style="color: hsl(0, 100%, 40%);">-; in the configuration file.</span><br><span style="color: hsl(120, 100%, 40%);">+; not specified then the default transport chosen is the first compatible transport</span><br><span style="color: hsl(120, 100%, 40%);">+; in the configuration file for the contact URL.</span><br><span> ;</span><br><span> ; Modify the "max_contacts=" line to change how many unique registrations to allow.</span><br><span> ;</span><br><span>@@ -670,7 +670,12 @@</span><br><span> ;timers=yes ; Session timers for SIP packets (default: "yes")</span><br><span> ;timers_sess_expires=1800 ; Maximum session timer expiration period</span><br><span> ; (default: "1800")</span><br><span style="color: hsl(0, 100%, 40%);">-;transport= ; Desired transport configuration (default: "")</span><br><span style="color: hsl(120, 100%, 40%);">+;transport= ; Explicit transport configuration to use (default: "")</span><br><span style="color: hsl(120, 100%, 40%);">+ ; This will force the endpoint to use the specified transport</span><br><span style="color: hsl(120, 100%, 40%);">+ ; configuration to send SIP messages. You need to already know</span><br><span style="color: hsl(120, 100%, 40%);">+ ; what kind of transport (UDP/TCP/IPv4/etc) the endpoint device</span><br><span style="color: hsl(120, 100%, 40%);">+ ; will use.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> ;trust_id_inbound=no ; Accept identification information received from this</span><br><span> ; endpoint (default: "no")</span><br><span> ;trust_id_outbound=no ; Send private identification details to the endpoint</span><br><span>diff --git a/res/res_pjsip.c b/res/res_pjsip.c</span><br><span>index 81386c7..1b41ca9 100644</span><br><span>--- a/res/res_pjsip.c</span><br><span>+++ b/res/res_pjsip.c</span><br><span>@@ -471,14 +471,17 @@</span><br><span> </para></description></span><br><span> </configOption></span><br><span> <configOption name="transport"></span><br><span style="color: hsl(0, 100%, 40%);">- <synopsis>Desired transport configuration</synopsis></span><br><span style="color: hsl(0, 100%, 40%);">- <description><para></span><br><span style="color: hsl(0, 100%, 40%);">- This will set the desired transport configuration to send SIP data through.</span><br><span style="color: hsl(120, 100%, 40%);">+ <synopsis>Explicit transport configuration to use</synopsis></span><br><span style="color: hsl(120, 100%, 40%);">+ <description></span><br><span style="color: hsl(120, 100%, 40%);">+ <para>This will <emphasis>force</emphasis> the endpoint to use the</span><br><span style="color: hsl(120, 100%, 40%);">+ specified transport configuration to send SIP messages. You need</span><br><span style="color: hsl(120, 100%, 40%);">+ to already know what kind of transport (UDP/TCP/IPv4/etc) the</span><br><span style="color: hsl(120, 100%, 40%);">+ endpoint device will use.</span><br><span> </para></span><br><span style="color: hsl(0, 100%, 40%);">- <warning><para>Not specifying a transport will <emphasis>DEFAULT</emphasis></span><br><span style="color: hsl(0, 100%, 40%);">- to the first configured transport in <filename>pjsip.conf</filename> which is</span><br><span style="color: hsl(0, 100%, 40%);">- valid for the URI we are trying to contact.</span><br><span style="color: hsl(0, 100%, 40%);">- </para></warning></span><br><span style="color: hsl(120, 100%, 40%);">+ <note><para>Not specifying a transport will select the first</span><br><span style="color: hsl(120, 100%, 40%);">+ configured transport in <filename>pjsip.conf</filename> which is</span><br><span style="color: hsl(120, 100%, 40%);">+ compatible with the URI we are trying to contact.</span><br><span style="color: hsl(120, 100%, 40%);">+ </para></note></span><br><span> <warning><para>Transport configuration is not affected by reloads. In order to</span><br><span> change transports, a full Asterisk restart is required</para></warning></span><br><span> </description></span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/9539">change 9539</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/9539"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 16 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I5394fdff6a296efc8e1695a156e616acd932ae52 </div>
<div style="display:none"> Gerrit-Change-Number: 9539 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Richard Mudgett <rmudgett@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>