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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=f95348b08bf8ae88d09b24ddfcba32978b2c7d4b
Submitter: Pascal Quantin (pascal.quantin@xxxxxxxxx)
Changed: branch: master-1.10
Repository: wireshark

Commits:

f95348b by Matthieu Coudron (mattator@xxxxxxxxx):

    TCP: fix wrongly set base_seq when ISN is 0 and tcp_relative_seq is
    enabled
    
    tcp_analysis::base_seq could be set several times when the
    TCP ISN was set to 0, thus inducing some undesired wraps such as 0-1
    
    Bug: 10713
    Change-Id: I69a0dfe677e93bf51015bf7a39ebf888631b12a4
    Reviewed-on: https://code.wireshark.org/review/5387
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Evan Huus <eapache@xxxxxxxxx>
    (cherry picked from commit 4f8a6ec8669fe0b9b2ac642ab99cc853498e4721)
    Reviewed-on: https://code.wireshark.org/review/7698
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    

Actions performed:

    from  61f7545   SRVLOC: always intialize prot before calling sscanf
    adds  f95348b   TCP: fix wrongly set base_seq when ISN is 0 and tcp_relative_seq is enabled


Summary of changes:
 epan/dissectors/packet-tcp.c |    8 +++++---
 epan/dissectors/packet-tcp.h |    5 ++---
 2 files changed, 7 insertions(+), 6 deletions(-)