<p>Friendly Automation <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/15983">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  Benjamin Keith Ford: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved
  Friendly Automation: Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sip_to_pjsip: Fix missing cases<br><br>Adds the "auto" case which is valid with<br>both chan_sip dtmfmode and chan_pjsip's<br>dtmf_mode, adds subscribecontext to<br>subscribe_context conversion, and accounts<br>for cipher = ALL being invalid.<br><br>ASTERISK-29459<br><br>Change-Id: Ie27d6606efad3591038000e5f3c34fa94730f6f2<br>---<br>M contrib/scripts/sip_to_pjsip/sip_to_pjsip.py<br>1 file changed, 7 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py b/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py</span><br><span>index e0a5e19..e7c3d8f 100755</span><br><span>--- a/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py</span><br><span>+++ b/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py</span><br><span>@@ -158,7 +158,7 @@</span><br><span>     """</span><br><span>     key = 'dtmf_mode'</span><br><span>     # available pjsip.conf values: rfc4733, inband, info, none</span><br><span style="color: hsl(0, 100%, 40%);">-    if val == 'inband' or val == 'info':</span><br><span style="color: hsl(120, 100%, 40%);">+    if val == 'inband' or val == 'info' or val == 'auto':</span><br><span>         set_value(key, val, section, pjsip, nmapped)</span><br><span>     elif val == 'rfc2833':</span><br><span>         set_value(key, 'rfc4733', section, pjsip, nmapped)</span><br><span>@@ -500,6 +500,7 @@</span><br><span>     ['tonezone',           set_value('tone_zone')],</span><br><span>     ['language',           set_value],</span><br><span>     ['allowsubscribe',     set_value('allow_subscribe')],</span><br><span style="color: hsl(120, 100%, 40%);">+    ['subscribecontext',   set_value('subscribe_context')],</span><br><span>     ['subminexpiry',       set_value('sub_min_expiry')],</span><br><span>     ['rtp_engine',         set_value],</span><br><span>     ['mailbox',            from_mailbox],</span><br><span>@@ -773,6 +774,11 @@</span><br><span> </span><br><span> def set_tls_cipher(val, pjsip, section, nmapped):</span><br><span>     """Sets cipher based on sip.conf tlscipher or sslcipher"""</span><br><span style="color: hsl(120, 100%, 40%);">+    if val == 'ALL':</span><br><span style="color: hsl(120, 100%, 40%);">+        return</span><br><span style="color: hsl(120, 100%, 40%);">+    print('chan_sip ciphers do not match 1:1 with PJSIP ciphers.' \</span><br><span style="color: hsl(120, 100%, 40%);">+          ' You should manually review and adjust this.', file=sys.stderr)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>     set_value('cipher', val, section, pjsip, nmapped, 'transport')</span><br><span> </span><br><span> </span><br><span></span><br></pre><div style="white-space:pre-wrap"></div><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/15983">change 15983</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/c/asterisk/+/15983"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ie27d6606efad3591038000e5f3c34fa94730f6f2 </div>
<div style="display:none"> Gerrit-Change-Number: 15983 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: N A <mail@interlinked.x10host.com> </div>
<div style="display:none"> Gerrit-Reviewer: Benjamin Keith Ford <bford@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Sean Bright <sean@seanbright.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>