diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2014-08-26 13:01:24 +0200 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2014-08-26 12:07:44 +0000 |
| commit | 7836a714ab31791fdde46492154ba559a7103a8b (patch) | |
| tree | 35ee7e0e022f677e990a45fbf2514a642b2a7f3f /tools | |
| parent | 338f6aca64859fe0135f436280d79e4bf248f29d (diff) | |
Skinny: do not try to create a wmem_strbuf whose size is bigger than the max size allowed
While we are at it, fix errors spotted by the pre-commit tools/SkinnyProtocolOptimized
Bug: 10409
Change-Id: Ic84632e0563f801239603534121e3487cf0d6d24
Reviewed-on: https://code.wireshark.org/review/3861
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/SkinnyProtocolOptimized.xml | 2 | ||||
| -rwxr-xr-x | tools/parse_xml2skinny_dissector.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/SkinnyProtocolOptimized.xml b/tools/SkinnyProtocolOptimized.xml index 6961e90204..865f16c71c 100644 --- a/tools/SkinnyProtocolOptimized.xml +++ b/tools/SkinnyProtocolOptimized.xml @@ -479,7 +479,7 @@ <ether comment="Mac Address" longcomment="Ethernet/Mac Address" name="macAddress" size="12" type="ether"/> <integer comment="IPv4 Address Scope" name="ipV4AddressScope" type="uint32"/> <integer comment="Maximum number of lines" name="maxNumberOfLines" type="uint32"/> - <ip comment="IPv5 Address" endianness="big" name="stationIpV6Addr" type="ipv6"/> + <ip comment="IPv6 Address" endianness="big" name="stationIpV6Addr" type="ipv6"/> <integer comment="IPv6 Address Scope" name="ipV6AddressScope" type="uint32"/> <string comment="Firmware Load Name" name="firmwareLoadName" size="32" type="char"/> </fields> diff --git a/tools/parse_xml2skinny_dissector.py b/tools/parse_xml2skinny_dissector.py index 7be1f1e266..8b6a8fc198 100755 --- a/tools/parse_xml2skinny_dissector.py +++ b/tools/parse_xml2skinny_dissector.py @@ -606,7 +606,7 @@ def xml2obj(src): if self.type == "ipv4": return self.indent_out('ptvcursor_add(cursor, hf_skinny_%s, 4, ENC_BIG_ENDIAN);\n' %self.name) else: - return self.indent_out('ptvcursor_add(cursor, hf_skinny_%s, 16, ENC_BIG_ENDIAN);\n' %self.name) + return self.indent_out('ptvcursor_add(cursor, hf_skinny_%s, 16, ENC_NA);\n' %self.name) class Ipv4or6(DataNode): def __init__(self): |