[Asterisk-code-review] sip_to_pjsip: Fix missing cases (asterisk[16])

[Friendly Automation]

Friendly Automation has submitted this change. ( https://gerrit.asterisk.org/c/asterisk/+/16010 )

Change subject: sip_to_pjsip: Fix missing cases
......................................................................

sip_to_pjsip: Fix missing cases

Adds the "auto" case which is valid with
both chan_sip dtmfmode and chan_pjsip's
dtmf_mode, adds subscribecontext to
subscribe_context conversion, and accounts
for cipher = ALL being invalid.

ASTERISK-29459

Change-Id: Ie27d6606efad3591038000e5f3c34fa94730f6f2
---
M contrib/scripts/sip_to_pjsip/sip_to_pjsip.py
1 file changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py b/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py
index e0a5e19..e7c3d8f 100755
--- a/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py
+++ b/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py
@@ -158,7 +158,7 @@
     """
     key = 'dtmf_mode'
     # available pjsip.conf values: rfc4733, inband, info, none
-    if val == 'inband' or val == 'info':
+    if val == 'inband' or val == 'info' or val == 'auto':
         set_value(key, val, section, pjsip, nmapped)
     elif val == 'rfc2833':
         set_value(key, 'rfc4733', section, pjsip, nmapped)
@@ -500,6 +500,7 @@
     ['tonezone',           set_value('tone_zone')],
     ['language',           set_value],
     ['allowsubscribe',     set_value('allow_subscribe')],
+    ['subscribecontext',   set_value('subscribe_context')],
     ['subminexpiry',       set_value('sub_min_expiry')],
     ['rtp_engine',         set_value],
     ['mailbox',            from_mailbox],
@@ -773,6 +774,11 @@
 
 def set_tls_cipher(val, pjsip, section, nmapped):
     """Sets cipher based on sip.conf tlscipher or sslcipher"""
+    if val == 'ALL':
+        return
+    print('chan_sip ciphers do not match 1:1 with PJSIP ciphers.' \
+          ' You should manually review and adjust this.', file=sys.stderr)
+
     set_value('cipher', val, section, pjsip, nmapped, 'transport')
 
 

-- 
To view, visit https://gerrit.asterisk.org/c/asterisk/+/16010
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 16
Gerrit-Change-Id: Ie27d6606efad3591038000e5f3c34fa94730f6f2
Gerrit-Change-Number: 16010
Gerrit-PatchSet: 5
Gerrit-Owner: N A <mail at interlinked.x10host.com>
Gerrit-Reviewer: Benjamin Keith Ford <bford at digium.com>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at sangoma.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
Gerrit-Reviewer: Sean Bright <sean at seanbright.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20210608/412d7136/attachment.html>