Wireshark-commits: [Wireshark-commits] master 478fab5: Qt: Remove duplicate GeoIP columns.
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Wed, 17 Sep 2014 18:49:40 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=478fab5206bf30a639ec9ba71edff2fb6ec2cad4
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

478fab5 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Qt: Remove duplicate GeoIP columns.
    
    Different GeoIP databases have the same column name, e.g. "City"
    currently matches two revisions each for IPv4 and IPv6. Map each
    uniquely named column to a list of databases and populate
    EndpointTreeWidgetItem columns based on the first database match.
    
    Fix a copy/pasteo introduced in g30f3d52: Make sure
    geoip_db_lookup_ipv[46] returns longitude instead of latitude.
    
    Change-Id: Idd31f976dfd1cb011cfa7b5aec14b7031ee0e25e
    Reviewed-on: https://code.wireshark.org/review/4157
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  f0b4411   Revert "packet-infiniband: added support for RoCE-v2 (RRocE)"
    adds  478fab5   Qt: Remove duplicate GeoIP columns.


Summary of changes:
 epan/geoip_db.c           |    4 ++--
 ui/qt/endpoint_dialog.cpp |   45 +++++++++++++++++++++++++++++----------------
 ui/qt/endpoint_dialog.h   |    9 ++++++++-
 3 files changed, 39 insertions(+), 19 deletions(-)