aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-bootp.c
diff options
context:
space:
mode:
authorMartin Kaiser <wireshark@kaiser.cx>2016-09-18 13:41:47 +0200
committerAnders Broman <a.broman58@gmail.com>2016-09-18 20:32:33 +0000
commitb914ec30ce281680241de73ad3de8ad099dc7295 (patch)
tree3aa238db5fdb5160bfb51f031cf1e1a51ad5a9f2 /epan/dissectors/packet-bootp.c
parent763f7510e37c907e57c53b0dce1b6072ae4a0759 (diff)
bootp: dissect option 82, sub-option 12 (Relay Agent Identifier)
as defined in RFC6925 Bug: 12907 Change-Id: I546d243f4b188025d8c96a1eaa0798b70a847a25 Reviewed-on: https://code.wireshark.org/review/17775 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-bootp.c')
-rw-r--r--epan/dissectors/packet-bootp.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c
index 5dd35d5846..62788961da 100644
--- a/epan/dissectors/packet-bootp.c
+++ b/epan/dissectors/packet-bootp.c
@@ -404,6 +404,7 @@ static int hf_bootp_option82_vi_cl_docsis_version = -1;
/* 82:9 suboptions end */
static int hf_bootp_option82_flags = -1; /* 82:10 */
static int hf_bootp_option82_server_id_override = -1; /* 82:11 */
+static int hf_bootp_option82_relay_agent_id = -1; /* 82:12 */
static int hf_bootp_option82_link_selection_cisco = -1; /* 82:150 */
static int hf_bootp_option82_vrf_name_vpn_id = -1; /* 82:151 */
/* 82:151 suboptions */
@@ -3020,6 +3021,7 @@ static const value_string option82_suboption_vals[] = {
{ 9, "Vendor-Specific Information" },
{ 10, "Flags" },
{ 11, "Server ID Override" },
+ { 12, "Relay Agent Identifier" },
{ 150, "Link selection (Cisco proprietary)" },
{ 151, "VRF name/VPN ID" },
{ 152, "Server ID Override (Cisco proprietary)" },
@@ -3069,6 +3071,7 @@ bootp_dhcp_decode_agent_info(packet_info *pinfo, proto_item *v_ti, proto_tree *v
{9, {"Vendor-Specific Information", special, &hf_bootp_option82_vi}}, /* [RFC 4243] */
{10, {"Flags", val_u_byte, &hf_bootp_option82_flags}}, /* [RFC5010] */
{11, {"Server ID Override", ipv4, &hf_bootp_option82_server_id_override}}, /* [RFC 5107] */
+ {12, {"Relay Agent Identifier", bytes, &hf_bootp_option82_relay_agent_id}}, /* [RFC 6925] */
{150, {"Link selection (Cisco proprietary)", ipv4, &hf_bootp_option82_link_selection_cisco}}, /* [RFC3527] */
{151, {"VRF name/VPN ID", special, &hf_bootp_option82_vrf_name_vpn_id}}, /* [RFC2685] */
{152, {"Server ID Override (Cisco proprietary)", ipv4, &hf_bootp_option82_server_id_override_cisco}} /* [RFC 5107] */
@@ -7727,6 +7730,11 @@ proto_register_bootp(void)
FT_IPv4, BASE_NONE, NULL, 0x00,
"Option 82:11 Server ID Override", HFILL }},
+ { &hf_bootp_option82_relay_agent_id,
+ { "Relay Agent Identifier", "bootp.option.agent_information_option.relay_agent_id",
+ FT_BYTES, BASE_NONE, NULL, 0x00,
+ "Option 82:12 Relay Agent Identifier", HFILL }},
+
{ &hf_bootp_option82_link_selection_cisco,
{ "Link selection (Cisco proprietary)", "bootp.option.agent_information_option.link_selection_cisco",
FT_IPv4, BASE_NONE, NULL, 0x00,