Huge thanks to our Platinum Members Endace and LiveAction,
and our Silver Member Veeam, for supporting the Wireshark Foundation and project.

Wireshark-commits: [Wireshark-commits] master-2.6 c9daceb: text2pcap: make ethernet dummy header di

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Fri, 23 Nov 2018 04:12:33 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=c9daceb58a2752d0577b6f131abac1bbac03e06c
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark

Commits:

c9daceb by Jaap Keuter (jaap.keuter@xxxxxxxxx):

    text2pcap: make ethernet dummy header direction aware
    
    When giving the command line option '-D' and having 'I' and 'O' markers in
    the hexdump to import the IP addresses are adjusted, transport layer ports
    are adjusted, the TCP window information is adjusted, but still the frames
    originate from the same interface and go to the other interface.
    
    This changes makes it so that the Ethernet destination and source address
    is also adjusted with the direction indicated, to match the other adjusted
    addressing used.
    
    Bug: 15287
    Change-Id: I762f195ece206ed14e6bca1c1160055df7c4dac1
    Signed-off-by: Jaap Keuter <jaap.keuter@xxxxxxxxx>
    Reviewed-on: https://code.wireshark.org/review/30767
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    (cherry picked from commit 802d4c0121bff6ce0cb38dd15e20fa3238da183a)
    Reviewed-on: https://code.wireshark.org/review/30769
    

Actions performed:

    from  67c8c7e   Fix reassembly of larger TACACS+ accounting messages
     add  c9daceb   text2pcap: make ethernet dummy header direction aware


Summary of changes:
 text2pcap.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)