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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=30f3d524411445c26418c757ac9deb0940afc409
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

30f3d52 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Qt: Refactor ConversationDialog for endpoints.
    
    Create a TrafficTableDialog (for lack of a better name) parent class
    from the general parts of ConversationDialog. Use it to create
    EndpointsDialog.
    
    Move the contents of conversation_tree_widget.{cpp,h} to
    conversation_dialog.{cpp,h} to match endpoint_dialog and
    traffic_table_dialog.
    
    Fill in GeoIP columns dynamically instead of using a hard-coded limit.
    
    Use "endp_" and "ENDP_" prefixes for a lot of endpoint variables and
    defines.
    
    Try to make geoip_db_lookup_ipv4 and geoip_db_lookup_ipv6 more robust.
    
    Clean up some includes. Fix a shadowed variable.
    
    Change-Id: I23054816ac7f8c6edb3b1f01c8536db37ba4122d
    Reviewed-on: https://code.wireshark.org/review/3462
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  382815d   packet-netflow.c: Update "Information Elements" dissected based upon 08/13/2014 IANA IPFIX assignments document
    adds  30f3d52   Qt: Refactor ConversationDialog for endpoints.


Summary of changes:
 epan/conversation_table.h                          |    2 +-
 epan/geoip_db.c                                    |   69 +--
 epan/geoip_db.h                                    |    6 +-
 ui/CMakeLists.txt                                  |    2 +-
 ui/Makefile.common                                 |    4 +-
 ui/cli/tap-iousers.c                               |    2 +-
 ui/gtk/conversations_table.c                       |    6 +-
 ui/gtk/conversations_table.h                       |    2 +-
 ui/gtk/hostlist_table.c                            |  181 +++---
 ui/gtk/hostlist_table.h                            |   56 +-
 ui/qt/CMakeLists.txt                               |    8 +-
 ui/qt/Makefile.am                                  |    4 +-
 ui/qt/Makefile.common                              |   14 +-
 ui/qt/Wireshark.pro                                |    8 +-
 ui/qt/conversation_dialog.cpp                      |  607 ++++++++++++++------
 ui/qt/conversation_dialog.h                        |   46 +-
 ui/qt/conversation_tree_widget.cpp                 |  487 ----------------
 ui/qt/conversation_tree_widget.h                   |  112 ----
 ui/qt/endpoint_dialog.cpp                          |  545 ++++++++++++++++++
 ui/qt/endpoint_dialog.h                            |   88 +++
 ui/qt/filter_action.cpp                            |   11 +-
 ui/qt/filter_action.h                              |    3 +-
 ui/qt/main.cpp                                     |    3 +-
 ui/qt/main_window.h                                |    4 +-
 ui/qt/main_window.ui                               |   11 +-
 ui/qt/main_window_slots.cpp                        |   24 +-
 ui/qt/traffic_table_dialog.cpp                     |  347 +++++++++++
 ui/qt/traffic_table_dialog.h                       |  168 ++++++
 ...versation_dialog.ui => traffic_table_dialog.ui} |   18 +-
 ui/recent.c                                        |   11 +-
 ui/recent.h                                        |    1 +
 ui/{conversation_ui.c => traffic_table_ui.c}       |   21 +-
 ui/{conversation_ui.h => traffic_table_ui.h}       |   26 +-
 33 files changed, 1861 insertions(+), 1036 deletions(-)
 delete mode 100644 ui/qt/conversation_tree_widget.cpp
 delete mode 100644 ui/qt/conversation_tree_widget.h
 create mode 100644 ui/qt/endpoint_dialog.cpp
 create mode 100644 ui/qt/endpoint_dialog.h
 create mode 100644 ui/qt/traffic_table_dialog.cpp
 create mode 100644 ui/qt/traffic_table_dialog.h
 rename ui/qt/{conversation_dialog.ui => traffic_table_dialog.ui} (86%)
 rename ui/{conversation_ui.c => traffic_table_ui.c} (75%)
 rename ui/{conversation_ui.h => traffic_table_ui.h} (77%)