diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-03-15 09:27:55 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-03-16 04:49:52 +0000 |
| commit | 72e7482f76443c173562afa9694be32d4c021b39 (patch) | |
| tree | b4c92366469203cb9a61c57ca357737147237c08 /epan/dissectors/packet-dhcpv6.c | |
| parent | 2210ef1c76b3b4d9cd0b8c8692f36ebd7c333c1c (diff) | |
| download | wireshark-72e7482f76443c173562afa9694be32d4c021b39.tar.gz | |
dhcpv6: Add Captive Portal option (103)
Change-Id: Ib56a1e9d1353d3245715bb0b5ba20672548bb9c1
Ping-Bug: 13483
Reviewed-on: https://code.wireshark.org/review/20555
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-dhcpv6.c')
| -rw-r--r-- | epan/dissectors/packet-dhcpv6.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c index 2a4de6d521..0ce53698cb 100644 --- a/epan/dissectors/packet-dhcpv6.c +++ b/epan/dissectors/packet-dhcpv6.c @@ -152,6 +152,7 @@ static int hf_mip6_hoa = -1; static int hf_nai = -1; static int hf_pd_exclude_pref_len = -1; static int hf_pd_exclude_subnet_id = -1; +static int hf_option_captive_portal = -1; static int hf_dhcpv6_hopcount = -1; static int hf_dhcpv6_xid = -1; static int hf_dhcpv6_peeraddr = -1; @@ -2175,6 +2176,12 @@ dhcpv6_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, proto_tree_add_item(subtree, hf_pd_exclude_pref_len, tvb, off, 1, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_pd_exclude_subnet_id , tvb, off+1, optlen-1, ENC_NA); break; + case OPTION_CAPTIVE_PORTAL:{ + proto_item *ti_cp; + ti_cp = proto_tree_add_item(subtree, hf_option_captive_portal, tvb, off, optlen, ENC_ASCII|ENC_NA); + PROTO_ITEM_SET_URL(ti_cp); + break; + } } return 4 + optlen; @@ -2522,6 +2529,8 @@ proto_register_dhcpv6(void) { "NTP Server Address", "dhcpv6.ntpserver.addr", FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL}}, { &hf_option_ntpserver_mc_addr, { "NTP Multicast Address", "dhcpv6.ntpserver.mc_addr", FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL}}, + { &hf_option_captive_portal, + { "Captive Portal", "dhcpv6.captive_portal", FT_STRING, BASE_NONE, NULL, 0x0, "The contact URI for the captive portal that the user should connect to", HFILL }}, { &hf_option_ntpserver_fqdn, { "NTP Server FQDN", "dhcpv6.ntpserver.fqdn", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_packetcable_ccc_suboption, |