From 3cb9c84da195de8bd2a8b905e37efa9bea741fa8 Mon Sep 17 00:00:00 2001 From: Jaap Keuter Date: Fri, 11 Dec 2009 17:18:00 +0000 Subject: [PATCH] From Martin Willi: The attached patch fixes the check for types with the long extension format and re-enables it. svn path=/trunk/; revision=31244 --- epan/dissectors/packet-mip.c | 6 +----- 1 file changed, 1 insertion(+), 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: