URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=ab74ebd958969072c8004fe5e197542f26bc5a58
Submitter: Jeff Morriss (jeff.morriss.ws@xxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark
Commits:
ab74ebd by Jeff Morriss (jeff.morriss.ws@xxxxxxxxx):
Fix Diameter reassembly when the captured tvb length is less than 5 bytes.
Since Diameter does heuristic checks before calling tcp_dissect_pdus() we
have to "manually" ask for more data if the tvb is too short for our
heuristics.
Bug: 11183
Change-Id: I14c36042306b532b53df80cc3971866b76094084
Reviewed-on: https://code.wireshark.org/review/8405
Reviewed-by: Evan Huus <eapache@xxxxxxxxx>
Petri-Dish: Jeff Morriss <jeff.morriss.ws@xxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@xxxxxxxxx>
(cherry picked from commit d1f78230c9dcc631659f3e5f0008bf01115c2d69)
Conflicts:
epan/dissectors/packet-diameter.c
Reviewed-on: https://code.wireshark.org/review/8428
Actions performed:
from 8b7f2c9 Mark an unused parameter as unused.
adds ab74ebd Fix Diameter reassembly when the captured tvb length is less than 5 bytes.
Summary of changes:
epan/dissectors/packet-diameter.c | 38 +++++++++++++++++++++++++------------
1 file changed, 26 insertions(+), 12 deletions(-)