diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-09-11 18:03:31 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-09-17 18:49:37 +0000 |
| commit | 478fab5206bf30a639ec9ba71edff2fb6ec2cad4 (patch) | |
| tree | 4193cf3be89df709b902f38459c5f955c0efae1d /epan/geoip_db.c | |
| parent | f0b44117831a502027799cd01c4537422ed466b6 (diff) | |
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@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan/geoip_db.c')
| -rw-r--r-- | epan/geoip_db.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/geoip_db.c b/epan/geoip_db.c index 9d9c2ebe53..6aeba65f8a 100644 --- a/epan/geoip_db.c +++ b/epan/geoip_db.c @@ -362,7 +362,7 @@ geoip_db_lookup_ipv4(guint dbnum, guint32 addr, const char *not_found) { float lon; char *c; if(geoip_db_lookup_latlon4(addr, &lat, &lon) == 0) { - val = ep_strdup_printf("%f", lat); + val = ep_strdup_printf("%f", lon); c = strchr(val, ','); if (c != NULL) *c = '.'; ret = val; @@ -478,7 +478,7 @@ geoip_db_lookup_ipv6(guint dbnum, struct e_in6_addr addr, const char *not_found) float lon; char *c; if(geoip_db_lookup_latlon6(gaddr, &lat, &lon) == 0) { - val = ep_strdup_printf("%f", lat); + val = ep_strdup_printf("%f", lon); c = strchr(val, ','); if (c != NULL) *c = '.'; ret = val; |