aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2018-09-11 19:05:34 -0700
committerGuy Harris <guy@alum.mit.edu>2018-09-12 02:07:27 +0000
commit47b1ec984bc114b30c3bc144f48cd9b4c477e8c5 (patch)
tree12e4a70c7327b3327294641b373480a7714798c2
parent69a01b650ac6c48b46d72838188ec1a5ffc40765 (diff)
Fix WITHOUT_VALS.
It was setting EF_TYPE and then clearing it; it should set EF_TYPE and clear EF_VALS. Change-Id: Ie0a85a12646c0395e50abb34caf32367e4191da0 Reviewed-on: https://code.wireshark.org/review/29621 Reviewed-by: Guy Harris <guy@alum.mit.edu>
-rwxr-xr-xtools/asn2wrs.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/asn2wrs.py b/tools/asn2wrs.py
index a4c1115..4e2fe30 100755
--- a/tools/asn2wrs.py
+++ b/tools/asn2wrs.py
@@ -2421,7 +2421,7 @@ class EthCnf:
if not par: continue
p = 1
if (par[0] == 'WITH_VALS'): default_flags |= EF_TYPE|EF_VALS
- elif (par[0] == 'WITHOUT_VALS'): default_flags |= EF_TYPE; default_flags &= ~EF_TYPE
+ elif (par[0] == 'WITHOUT_VALS'): default_flags |= EF_TYPE; default_flags &= ~EF_VALS
elif (par[0] == 'ONLY_VALS'): default_flags &= ~EF_TYPE; default_flags |= EF_VALS
elif (ctx == 'EXPORTS'): p = 0
else: warnings.warn_explicit("Unknown parameter value '%s'" % (par[0]), UserWarning, fn, lineno)
@@ -2557,7 +2557,7 @@ class EthCnf:
p = 2
if (len(par)>=2):
if (par[1] == 'WITH_VALS'): flags |= EF_TYPE|EF_VALS
- elif (par[1] == 'WITHOUT_VALS'): flags |= EF_TYPE; flags &= ~EF_TYPE
+ elif (par[1] == 'WITHOUT_VALS'): flags |= EF_TYPE; flags &= ~EF_VALS
elif (par[1] == 'ONLY_VALS'): flags &= ~EF_TYPE; flags |= EF_VALS
elif (ctx == 'EXPORTS'): p = 1
else: warnings.warn_explicit("Unknown parameter value '%s'" % (par[1]), UserWarning, fn, lineno)