diff options
| author | Eliot Lear <lear@cisco.com> | 2016-12-15 10:21:06 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-12-16 14:26:49 +0000 |
| commit | 12fd99fcda388982944947afc4934dcfbd39448f (patch) | |
| tree | b8f4834596ea0bdb60850c110219615ba2b04755 /epan/dissectors/packet-dhcpv6.c | |
| parent | 93dec736c7f86c4958ec081fd4dd402b3e35be76 (diff) | |
| download | wireshark-12fd99fcda388982944947afc4934dcfbd39448f.tar.gz | |
[BOOTP/DHCPv6] Add new manufacturer usage description (MUD) DHCP option, which presents a URL.
Change-Id: I152a388db2f3b8c035c80bd06dfbb9a18f10c031
Reviewed-on: https://code.wireshark.org/review/19284
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-dhcpv6.c')
| -rw-r--r-- | epan/dissectors/packet-dhcpv6.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c index 15c638a5c6..058b301120 100644 --- a/epan/dissectors/packet-dhcpv6.c +++ b/epan/dissectors/packet-dhcpv6.c @@ -27,6 +27,7 @@ * RFC7598.txt (Configuration of Softwire Address and Port-Mapped Clients) * draft-ietf-dhc-dhcpv6-opt-timeconfig-03.txt * draft-ietf-dhc-dhcpv6-opt-lifetime-00.txt + * draft-ietf-opsawg-mud-02.txt (Manufacturer Usage Descriptions + IANA assignment) * CL-SP-CANN-DHCP-Reg-I10-130808.pdf * * Note that protocol constants are still subject to change, based on IANA @@ -155,6 +156,7 @@ static int hf_dhcpv6_hopcount = -1; static int hf_dhcpv6_xid = -1; static int hf_dhcpv6_peeraddr = -1; static int hf_dhcpv6_linkaddr = -1; +static int hf_opt_mudurl = -1; static int hf_option_ntpserver_type = -1; static int hf_option_ntpserver_length = -1; static int hf_option_ntpserver_addr = -1; @@ -382,6 +384,7 @@ static dissector_handle_t dhcpv6_handle; #define OPTION_ANI_AP_BSSID 108 /* RFC 7839 */ #define OPTION_ANI_OPERATOR_ID 109 /* RFC 7839 */ #define OPTION_ANI_OPERATOR_REALM 110 /* RFC 7839 */ +#define OPTION_MUDURL 112 /* MUDURL */ #define OPTION_IPv6_ADDRESS_ANDSF 143 /* RFC 6153 */ /* temporary value until defined by IETF */ @@ -532,6 +535,7 @@ static const value_string opttype_vals[] = { { OPTION_MIP6_HA, "Mobile IPv6 Home Agent" }, { OPTION_MIP6_HOA, "Mobile IPv6 Home Address" }, { OPTION_NAI, "Network Access Identifier" }, + { OPTION_MUDURL, "Manufacturer Usage Description" }, { 0, NULL } }; static value_string_ext opttype_vals_ext = VALUE_STRING_EXT_INIT(opttype_vals); @@ -2022,6 +2026,12 @@ dhcpv6_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, if (optlen > 0) proto_tree_add_item(subtree, hf_opt_tzdb, tvb, off, optlen, ENC_ASCII|ENC_NA); break; + + case OPTION_MUDURL: + if (optlen > 0) + proto_tree_add_item(subtree, hf_opt_mudurl, tvb, off, optlen, ENC_ASCII|ENC_NA); + break; + case OPTION_LQ_QUERY: { guint8 query_type; @@ -2612,6 +2622,8 @@ proto_register_dhcpv6(void) { "PSID length", "dhcpv6.s46_portparam.psid_len", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_option_s46_portparam_psid, { "PSID", "dhcpv6.s46_portparam.psid", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_opt_mudurl, + { "MUDURL", "dhcpv6.mudurl", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, }; static gint *ett[] = { |