[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=e2793f5d6f931133235cdaf82f9e38dd8d6849b3
Submitter: Alexis La Goutte (alexis.lagoutte@xxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

e2793f5 by Pascal Quantin (pascal.quantin@xxxxxxxxx):

    HiSLIP: disable heuristic dissector by default
    
    It is too weak (just checking that the 2 first bytes of TCP segment are "HS") to be always activated
    
    Change-Id: Iffda96046cc687004f403dd4d8e735375790b07b
    Reviewed-on: https://code.wireshark.org/review/5789
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    (cherry picked from commit ad299df70a8e59f051db33c57daff316cbb0b6ac)
    Conflicts:
    	epan/dissectors/packet-hislip.c
    Reviewed-on: https://code.wireshark.org/review/5820
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    

Actions performed:

    from  c034118   This code is used in Wireshark, not TShark; fix messages.
    adds  e2793f5   HiSLIP: disable heuristic dissector by default


Summary of changes:
 epan/dissectors/packet-hislip.c |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)