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

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

Commits:

5600ae1 by Peter Wu (peter@xxxxxxxxxxxxx):

    http: Fix src/dest mapping for proxied connections
    
    Using value_is_in_range is making quite some assumptions, namely (1) the
    proxy server is always run on a registered HTTP port, and (2) the
    source (client) port is always not HTTP. The former is quite a strong
    assertion which fails to hold when using a custom port (8008) that got
    detected through heuristics.
    
    Fix this by recording the source address and port pair for the server
    and then check this against the current packet.
    
    This fixes detection of a SSL conversation where two conversations got
    detected instead of one. Example: 8008 is proxy, 443 is target server.
    Now the proxied conversation got detected as 443 --> "client port"
    (server to client, ok) and 443 --> 8008 (client to server, not ok,
    should be "client port" --> 443).
    
    bug:7717
    Change-Id: I05113ec2aca6c9296184759a8a62eb32cbfcbb4f
    Reviewed-on: https://code.wireshark.org/review/1380
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    

Actions performed:

    from  338269f   ssl/dtls: add keyfile support to dtls
    adds  5600ae1   http: Fix src/dest mapping for proxied connections


Summary of changes:
 epan/dissectors/packet-http.c |    8 ++++++--
 epan/dissectors/packet-http.h |    3 +++
 2 files changed, 9 insertions(+), 2 deletions(-)