aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-dhcpv6.c
diff options
context:
space:
mode:
authorstig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>2009-03-06 19:43:45 +0000
committerstig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>2009-03-06 19:43:45 +0000
commitf1fdd8e07a47a38b55c2621749a0240e54626e27 (patch)
tree4b860a8545b34d522afecb77c5c15c4c6e1bada0 /epan/dissectors/packet-dhcpv6.c
parent0965c7829063289b3467309a6219739b904fa8ee (diff)
From Alexis La Goutte (bug 3308):
Add DHCP(v4 & v6) Option for CAPWAP (RFC5417) git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27625 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-dhcpv6.c')
-rw-r--r--epan/dissectors/packet-dhcpv6.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c
index 7200f3f92d..0c4173f44c 100644
--- a/epan/dissectors/packet-dhcpv6.c
+++ b/epan/dissectors/packet-dhcpv6.c
@@ -16,6 +16,7 @@
* RFC3898.txt (NIS options)
* RFC4704.txt (Client FQDN)
* RFC5007.txt (DHCPv6 Leasequery)
+ * RFC5417.txt (CAPWAP Access Controller DHCP Option)
* draft-ietf-dhc-dhcpv6-opt-timeconfig-03.txt
* draft-ietf-dhc-dhcpv6-opt-lifetime-00.txt
*
@@ -130,6 +131,7 @@ static gint ett_dhcpv6_option_vsoption = -1;
#define OPTION_CLT_TIME 46
#define OPTION_LQ_RELAY_DATA 47
#define OPTION_LQ_CLIENT_LINK 48
+#define OPTION_CAPWAP_AC_V6 52
/* temporary value until defined by IETF */
#define OPTION_MIP6_HA 165
@@ -212,6 +214,7 @@ static const value_string opttype_vals[] = {
{ OPTION_CLT_TIME, "Client Last Transaction Time" },
{ OPTION_LQ_RELAY_DATA, "Leasequery Relay Data" },
{ OPTION_LQ_CLIENT_LINK, "Leasequery Client Link Address List" },
+ { OPTION_CAPWAP_AC_V6, "CAPWAP Access Controllers" },
{ OPTION_MIP6_HA, "Mobile IPv6 Home Agent" },
{ OPTION_MIP6_HOA, "Mobile IPv6 Home Address" },
{ OPTION_NAI, "Network Access Identifier" },
@@ -973,6 +976,19 @@ dhcpv6_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree,
ip6_to_str(&in6));
}
break;
+ case OPTION_CAPWAP_AC_V6:
+ if (optlen % 16) {
+ proto_tree_add_text(subtree, tvb, off, optlen,
+ "CAPWAP Access Controllers address: malformed option");
+ break;
+ }
+ for (i = 0; i < optlen; i += 16) {
+ tvb_get_ipv6(tvb, off + i, &in6);
+ proto_tree_add_text(subtree, tvb, off + i,
+ sizeof(in6), "CAPWAP Access Controllers address: %s",
+ ip6_to_str(&in6));
+ }
+ break;
case OPTION_IAPREFIX:
{
guint32 preferred_lifetime, valid_lifetime;