From e0472eb1d06c42e4df6733a7058e4ce381f48a72 Mon Sep 17 00:00:00 2001
From: Pascal Cadotte Michaud <pcm@wazo.io>
Date: Sat, 27 Oct 2018 10:59:15 -0400
Subject: [PATCH] contrib/sip_to_pjsip: handle setvar in conversion
Given a sip.conf with the following content:
setvar FOO=1
setvar BAR=42
I want my generated pjsip.conf to containt the following set_vars
set_var FOO=1
set_var BAR=42
in the matching endpoint section.
Change-Id: I6c822401fda4133c3b44bf31e655b4eb939d4d26
---
contrib/scripts/sip_to_pjsip/sip_to_pjsip.py | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py b/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py
index d05f97d5fb..1860a317f2 100755
--- a/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py
+++ b/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py
@@ -40,6 +40,11 @@ def section_by_type(section, pjsip, type):
return sect
+def ignore(key=None, val=None, section=None, pjsip=None,
+ nmapped=None, type='endpoint'):
+ """Ignore a key and mark it as mapped"""
+
+
def set_value(key=None, val=None, section=None, pjsip=None,
nmapped=None, type='endpoint'):
"""Sets the key to the value within the section in pjsip.conf"""
@@ -508,6 +513,7 @@ peer_map = [
['dtlscapath', set_value('dtls_ca_path')],
['dtlssetup', set_value('dtls_setup')],
['encryption_taglen', from_encryption_taglen],
+ ['setvar', ignore],
############################ maps to an aor ###################################
@@ -1117,6 +1123,19 @@ def map_registrations(sip, pjsip, nmapped):
reg.write(pjsip, nmapped)
+def map_setvars(sip, section, pjsip, nmapped):
+ """
+ Map all setvar in peer section to the appropriate endpoint set_var
+ """
+ try:
+ setvars = sip.section(section)[0].get('setvar')
+ except LookupError:
+ return
+
+ for setvar in setvars:
+ set_value('set_var', setvar, section, pjsip, nmapped)
+
+
def map_peer(sip, section, pjsip, nmapped):
"""
Map the options from a peer section in sip.conf into the appropriate
@@ -1218,6 +1237,7 @@ def convert(sip, filename, non_mappings, include):
pass
else:
map_peer(sip, section, pjsip, nmapped)
+ map_setvars(sip, section, pjsip, nmapped)
find_non_mapped(sip.defaults(), nmapped)
find_non_mapped(sip.sections(), nmapped)
--
GitLab