diff options
| author | Uli Heilmeier <uh@heilmeier.eu> | 2018-09-25 21:04:12 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-09-26 03:55:27 +0000 |
| commit | 1768252ef2c0aa7b7b0e728e752bb8422db2d323 (patch) | |
| tree | 5cfa1ba6b8fdb134259ddb626a722caa059793c0 /epan/dissectors/packet-nat-pmp.c | |
| parent | 9795af44889352a25037cffc35317a295f77f27d (diff) | |
PCP: Add padding for option
RFC 6887 states that options have to be padded to a multiple
of 4 octets. This commit adds missing padding.
Bug: 14950
Change-Id: I68a0631ecdd2f30e24e83b1a6e8dfc55856c9c94
Reviewed-on: https://code.wireshark.org/review/29832
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-nat-pmp.c')
| -rw-r--r-- | epan/dissectors/packet-nat-pmp.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/epan/dissectors/packet-nat-pmp.c b/epan/dissectors/packet-nat-pmp.c index bc774e1c64..ac813e9273 100644 --- a/epan/dissectors/packet-nat-pmp.c +++ b/epan/dissectors/packet-nat-pmp.c @@ -123,6 +123,7 @@ static int hf_option_p64_suffix = -1; static int hf_option_p64_ipv4_prefix_count = -1; static int hf_option_p64_ipv4_prefix_length = -1; static int hf_option_p64_ipv4_address = -1; +static int hf_option_padding = -1; static gint ett_pcp = -1; static gint ett_opcode = -1; @@ -290,6 +291,8 @@ dissect_portcontrol_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui gint offset = 0, start_offset, start_opcode_offset, start_option_offset; guint8 ropcode, option; guint16 option_length; + gint mod_option_length = 0; + gint option_padding_length = 0; gboolean is_response; const gchar* op_str; @@ -458,7 +461,13 @@ dissect_portcontrol_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui option_length = tvb_get_ntohs(tvb, offset); offset+=2; - proto_item_set_len(suboption_ti, option_length+4); + mod_option_length = option_length % 4; + if( mod_option_length != 0 ) + { + option_padding_length = 4 - mod_option_length; + } + + proto_item_set_len(suboption_ti, option_length+4+option_padding_length); if(option_length > 0) { @@ -555,6 +564,12 @@ dissect_portcontrol_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui } offset+=option_length; + + if( option_padding_length > 0 ) + { + proto_tree_add_item(option_sub_tree, hf_option_padding, tvb, offset, option_padding_length, ENC_NA); + offset+=option_padding_length; + } } proto_item_set_len(option_ti, offset-start_option_offset); @@ -766,6 +781,9 @@ void proto_register_nat_pmp(void) { &hf_option_p64_ipv4_address, { "IPv4 Address", "portcontrol.option.p64.ipv4_address", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL } }, + { &hf_option_padding, + { "Padding", "portcontrol.option.padding", FT_BYTES, BASE_NONE, + NULL, 0x0, NULL, HFILL } }, }; static gint *pcp_ett[] = { |