diff options
| author | Matt Texier <matthieu@texier.tv> | 2016-06-29 17:33:21 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-07-02 14:15:17 +0000 |
| commit | 1f28e683f929b25db7dd08abf3fad646cc6191e7 (patch) | |
| tree | 9250fc535166dae7d6c60eef91977887c0acbcb9 | |
| parent | 94e97e45cf614c7bb8fe90c23df52910246b2c95 (diff) | |
BGP: Fixed an side effect of length coding on offset
Bug: 12568
Change-Id: Ibf063293041d749664f6e6ecd2455024ea3fd4ed
Reviewed-on: https://code.wireshark.org/review/16237
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | epan/dissectors/packet-bgp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c index 6437e324c2..2b324d6c63 100644 --- a/epan/dissectors/packet-bgp.c +++ b/epan/dissectors/packet-bgp.c @@ -2676,7 +2676,7 @@ decode_flowspec_nlri(proto_tree *tree, tvbuff_t *tvb, gint offset, guint16 afi, break; proto_item_set_len(filter_item,filter_len+1); } - return(tot_flow_len); + return(tot_flow_len+offset_len-1); } /* @@ -7996,7 +7996,7 @@ proto_register_bgp(void) { "Filter type", "bgp.flowspec_nlri.filter_type", FT_UINT8, BASE_DEC, VALS(flowspec_nlri_opvaluepair_type), 0x0, NULL, HFILL }}, { &hf_bgp_flowspec_nlri_length, - { "NRLI length", "bgp.flowspec_nlri.length", FT_UINT32, BASE_DEC, + { "NRLI length", "bgp.flowspec_nlri.length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_bgp_flowspec_nlri_op_flags, { "Operator flags", "bgp.flowspec_nlri.opflags", FT_UINT8, BASE_HEX, |