diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2016-06-30 23:32:27 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-07-04 16:27:45 +0000 |
| commit | 3f8049099efe2c79f752020a36f553a2ab7d26e4 (patch) | |
| tree | 8a1f26e4093747f3a354c8e184de8801ef28608d | |
| parent | 764b147a7c604e7b718a48770ce010bf2ab6e5ea (diff) | |
NHRP: Add option for source address in authentication extension.
It seems that not all Cisco IOS implementations adhere to RFC2332
with respect to having the source address after the SPI in the
authentication extension. This change adds a preference to suppress
the interpretation of the bytes following the SPI as the source
address. The default is to adhere to the RFC.
Bug: 12569
Change-Id: I00d3c1b90ace54f16f0fe4704e6127a5c4881c82
Reviewed-on: https://code.wireshark.org/review/16231
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | epan/dissectors/packet-nhrp.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/epan/dissectors/packet-nhrp.c b/epan/dissectors/packet-nhrp.c index 941707834d..c073a5b838 100644 --- a/epan/dissectors/packet-nhrp.c +++ b/epan/dissectors/packet-nhrp.c @@ -30,6 +30,7 @@ #include <epan/packet.h> +#include <epan/prefs.h> #include <epan/addr_resolv.h> #include <epan/expert.h> #include <epan/etypes.h> @@ -151,6 +152,8 @@ static expert_field ei_nhrp_hdr_extoff = EI_INIT; static expert_field ei_nhrp_ext_malformed = EI_INIT; static expert_field ei_nhrp_ext_extra = EI_INIT; +static gboolean pref_auth_ext_has_addr = TRUE; + /* NHRP Packet Types */ #define NHRP_RESOLUTION_REQ 1 #define NHRP_RESOLUTION_REPLY 2 @@ -881,6 +884,12 @@ static void dissect_nhrp_ext(tvbuff_t *tvb, break; case NHRP_EXT_AUTH: + /* This is ugly, but this is the only place srcLen is actually + * used so we manipulate it here. + */ + if (!pref_auth_ext_has_addr) + srcLen = 0; + /* fallthrough */ case NHRP_EXT_MOBILE_AUTH: if (len < (4 + srcLen)) { proto_tree_add_expert_format(nhrp_tree, pinfo, &ei_nhrp_ext_malformed, tvb, offset, len, @@ -891,7 +900,7 @@ static void dissect_nhrp_ext(tvbuff_t *tvb, auth_tree = proto_tree_add_subtree_format(nhrp_tree, tvb, offset, len, ett_nhrp_auth_ext, NULL, "Extension Data: SPI=%u: Data=%s", tvb_get_ntohs(tvb, offset + 2), - tvb_bytes_to_str(wmem_packet_scope(), tvb, offset + 4, len - 4)); + tvb_bytes_to_str(wmem_packet_scope(), tvb, offset + 4 + srcLen, len - (4 + srcLen))); proto_tree_add_item(auth_tree, hf_nhrp_auth_ext_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(auth_tree, hf_nhrp_auth_ext_spi, tvb, offset + 2, 2, ENC_BIG_ENDIAN); if (srcLen == 4) @@ -1369,11 +1378,18 @@ proto_register_nhrp(void) { &ei_nhrp_ext_extra, { "nhrp.ext.extra", PI_MALFORMED, PI_ERROR, "Superfluous data follows End Extension", EXPFILL }}, }; + module_t *nhrp_module; expert_module_t* expert_nhrp; proto_nhrp = proto_register_protocol("NBMA Next Hop Resolution Protocol", "NHRP", "nhrp"); proto_register_field_array(proto_nhrp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); + nhrp_module = prefs_register_protocol(proto_nhrp, NULL); + prefs_register_bool_preference(nhrp_module, "auth_ext_has_addr", + "Authentication Extension data contains the source address", + "Whether the Authentication Extension data contains the source address. " + "Some Cisco IOS implementations forgo this part of RFC2332.", + &pref_auth_ext_has_addr); expert_nhrp = expert_register_protocol(proto_nhrp); expert_register_field_array(expert_nhrp, ei, array_length(ei)); } |