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
This commit is contained in:
Jaap Keuter 2009-12-11 17:18:00 +00:00
parent 63fc401318
commit 3cb9c84da1
1 changed files with 1 additions and 5 deletions

View File

@ -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: