aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorTomas Kukosa <tomas.kukosa@siemens.com>2008-01-09 13:30:31 +0000
committerTomas Kukosa <tomas.kukosa@siemens.com>2008-01-09 13:30:31 +0000
commit27a531e06a7e20c852d8a2bd8b3e49474b85f17b (patch)
treee1fc089e225afe435ac2de6efdfddd003c7c0466 /tools
parent4dd5de365beea06d89c4bd6e61ecfc020acb8a66 (diff)
more sophisticated H245 OLC handling focusing on more reliable T.38 establishment
svn path=/trunk/; revision=24043
Diffstat (limited to 'tools')
-rwxr-xr-xtools/asn2wrs.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/tools/asn2wrs.py b/tools/asn2wrs.py
index bb0ff698c0..a2f2d2070b 100755
--- a/tools/asn2wrs.py
+++ b/tools/asn2wrs.py
@@ -1587,7 +1587,6 @@ class EthCtx:
#--- eth_output_val ------------------------------------------------------
def eth_output_val(self):
- if (not len(self.eth_value_ord1)): return
fx = self.output.file_open('val', ext='h')
for v in self.eth_value_ord1:
vv = self.eth_value[v]['value']
@@ -2266,7 +2265,9 @@ class EthCnf:
par = get_par(line[result.end():], 0, 3, fn=fn, lineno=lineno)
for i in range(0, len(par)):
if (par[i] == 'NO_PROT_PREFIX'): default_flags |= EF_NO_PROT
+ elif (par[i] == 'PROT_PREFIX'): default_flags &= ~ EF_NO_PROT
elif (par[i] == 'NO_TYPE_PREFIX'): default_flags |= EF_NO_TYPE
+ elif (par[i] == 'TYPE_PREFIX'): default_flags &= ~ EF_NO_TYPE
elif (par[i] == 'UPPER_CASE'): default_flags |= EF_UCASE
elif (par[i] == 'NO_UPPER_CASE'): default_flags &= ~EF_UCASE
else: warnings.warn_explicit("Unknown parameter value '%s'" % (par[i]), UserWarning, fn, lineno)
@@ -2397,7 +2398,9 @@ class EthCnf:
flags = default_flags
for i in range(1, len(par)):
if (par[i] == 'NO_PROT_PREFIX'): flags |= EF_NO_PROT
+ elif (par[i] == 'PROT_PREFIX'): flags &= ~ EF_NO_PROT
elif (par[i] == 'NO_TYPE_PREFIX'): flags |= EF_NO_TYPE
+ elif (par[i] == 'TYPE_PREFIX'): flags &= ~ EF_NO_TYPE
elif (par[i] == 'UPPER_CASE'): flags |= EF_UCASE
elif (par[i] == 'NO_UPPER_CASE'): flags &= ~EF_UCASE
else: warnings.warn_explicit("Unknown parameter value '%s'" % (par[i]), UserWarning, fn, lineno)
@@ -4189,6 +4192,11 @@ class ChoiceType (Type):
out += ectx.eth_vals(tname, vals)
return out
+ def reg_enum_vals(self, tname, ectx):
+ vals = self.get_vals(ectx)
+ for (val, id) in vals:
+ ectx.eth_reg_value(id, self, val, ethname=ectx.eth_enum_item(tname, id))
+
def eth_type_enum(self, tname, ectx):
out = '\n'
vals = self.get_vals(ectx)