Wireshark-commits: [Wireshark-commits] master dcf6d44: Apply refactored "conversation" (tap) data t
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Wed, 30 Jul 2014 16:12:57 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=dcf6d44b7f5e69e08be8ccd452b87733326053cc
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

dcf6d44 by Michael Mann (mmann78@xxxxxxxxxxxx):

    Apply refactored "conversation" (tap) data to TShark.
    
    I intentionally left the fields displayed alone (so they don't exactly match Wireshark GUI), because as Guy points out in bug 6310, not sure its A Bug or A Feature.  But at least all types of conversations allowed are in sync with Wireshark GUI.
    
    Bug:6310
    Change-Id: I722837df510a39dadc1f9a07a99275509516698c
    Reviewed-on: https://code.wireshark.org/review/3212
    Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  54777bf   Fix cmake build for portaudio V18
    adds  dcf6d44   Apply refactored "conversation" (tap) data to TShark.


Summary of changes:
 epan/conversation_table.c                          |    9 +-
 epan/conversation_table.h                          |   10 +-
 epan/dissectors/packet-eth.c                       |    2 +-
 epan/dissectors/packet-fc.c                        |    2 +-
 epan/dissectors/packet-fddi.c                      |    2 +-
 epan/dissectors/packet-ieee80211.c                 |    2 +-
 epan/dissectors/packet-ip.c                        |    2 +-
 epan/dissectors/packet-ipv6.c                      |    2 +-
 epan/dissectors/packet-ipx.c                       |    2 +-
 epan/dissectors/packet-jxta.c                      |    2 +-
 epan/dissectors/packet-ncp.c                       |    2 +-
 epan/dissectors/packet-rsvp.c                      |    2 +-
 epan/dissectors/packet-sctp.c                      |    2 +-
 epan/dissectors/packet-tcp.c                       |    2 +-
 epan/dissectors/packet-tr.c                        |    2 +-
 epan/dissectors/packet-udp.c                       |    2 +-
 epan/dissectors/packet-usb.c                       |    2 +-
 epan/stat_cmd_args.c                               |    2 +-
 tshark.c                                           |    3 +-
 ui/cli/tap-iousers.c                               |  525 ++------------------
 .../packet-cms-template.h => ui/cli/tshark-tap.h   |   15 +-
 21 files changed, 84 insertions(+), 510 deletions(-)
 copy asn1/cms/packet-cms-template.h => ui/cli/tshark-tap.h (78%)