diff options
| author | jake <jake@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-12-11 17:18:00 +0000 |
|---|---|---|
| committer | jake <jake@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-12-11 17:18:00 +0000 |
| commit | 43b85f33aa41e5913ad9cc45474df5b0ad234f09 (patch) | |
| tree | 37e8a9d8394103ed785a73843fc27990afcc2774 /epan | |
| parent | 6d0a6f8f1747020d48bfe68330e5fe572db3c85b (diff) | |
From Martin Willi:
The attached patch fixes the check for types with the long extension format and re-enables it.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31244 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-mip.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/epan/dissectors/packet-mip.c b/epan/dissectors/packet-mip.c index b30a090ff8..32d0a3f086 100644 --- a/epan/dissectors/packet-mip.c +++ b/epan/dissectors/packet-mip.c @@ -395,15 +395,11 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree) proto_tree_add_item(ext_tree, hf_mip_ext_type, tvb, offset, 1, ext_type); offset++; -#if 0 /* FIXME: This test doesn't make sense: t != a1 || t != a2 is true if a1 != a2 */ - if (ext_type != GEN_AUTH_EXT || ext_type != PMIPv4_NON_SKIP_EXT) { -#endif + if (ext_type != GEN_AUTH_EXT && ext_type != PMIPv4_NON_SKIP_EXT) { /* Another nasty hack since GEN_AUTH_EXT and PMIPv4_NON_SKIP_EXT broke everything */ proto_tree_add_uint(ext_tree, hf_mip_ext_len, tvb, offset, 1, ext_len); offset++; -#if 0 } -#endif switch (ext_type) { case MH_AUTH_EXT: |