Wireshark-commits: [Wireshark-commits] master 4ee6bcb: websocket: avoid recursion, use tcp_dissect_
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Tue, 24 Feb 2015 06:47:59 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=4ee6bcbd2e03a25f1e6b0239558d9edeaf8040c0
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

4ee6bcb by Peter Wu (peter@xxxxxxxxxxxxx):

    websocket: avoid recursion, use tcp_dissect_pdus
    
    Use tcp_dissect_pdus to handle reassembly and avoid a recursion in
    dissect_websocket. The HTTP dissector is modified to preserve
    desegmentation functionality (tested with the capture from bug 8448).
    
    As tcp_dissect_pdus is used now, the workaround for bug 8448 can be
    removed and the actual frame dissection logic becomes simpler (the
    length is checked in get_websocket_frame_length).
    
    Bug: 10989
    Change-Id: I67af96a6c7be88c2a77e1c4138abe90bdb880774
    Reviewed-on: https://code.wireshark.org/review/7285
    Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  c466d40   NS Trace (NetScaler Trace) file format is not able to export specified packets
    adds  4ee6bcb   websocket: avoid recursion, use tcp_dissect_pdus


Summary of changes:
 epan/dissectors/packet-http.c      |    4 ++
 epan/dissectors/packet-websocket.c |  102 ++++++++++++++++++------------------
 2 files changed, 56 insertions(+), 50 deletions(-)