diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-02-08 17:20:26 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2018-03-06 18:02:21 +0000 |
| commit | a1da75c554881667dd92e11f098630f2d604872b (patch) | |
| tree | b1d6a60a663bf93f1eede809a0c383544508d6e2 /ui/traffic_table_ui.c | |
| parent | b2d3680558d19998c55b48e9807a26e145756eba (diff) | |
Transition from GeoIP Legacy to MaxMindDB.
MaxMind is discontinuing its legacy databases in April in favor of
GeoIP2, which use a newer database format (MaxMind DB). The reference C
library (libmaxminddb) is available under the Apache 2.0 license which
isn't quite compatible with ours.
Add mmdbresolve, a utility that reads IPv4 and IPv6 addresses on stdin
and prints resolved information on stdout. Place it under a liberal
license (MIT) so that we can keep libmaxminddb at arm's length. Add
epan/maxmind_db.[ch], which spawns mmdbresolve and communicates with it
via stdio.
Migrate the preferences and documentation to MaxMindDB.
Change the IPv4 and IPv6 asnum fields to FT_UINT32s. Change the
geographic coordinate fields to FT_DOUBLEs.
Bug: 10658
Change-Id: I24aeed637bea1b41d173270bda413af230f4425f
Reviewed-on: https://code.wireshark.org/review/26214
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/traffic_table_ui.c')
| -rw-r--r-- | ui/traffic_table_ui.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ui/traffic_table_ui.c b/ui/traffic_table_ui.c index 02c6d16a5c..0f41f238f4 100644 --- a/ui/traffic_table_ui.c +++ b/ui/traffic_table_ui.c @@ -35,7 +35,7 @@ const char *conv_conn_a_title = "Connection A"; const char *conv_conn_b_title = "Connection B"; const char *conv_abs_start_title = "Abs Start"; -const char *endp_column_titles[ENDP_NUM_COLUMNS] = { +const char *endp_column_titles[ENDP_NUM_GEO_COLUMNS] = { "Address", "Port", "Packets", @@ -43,7 +43,11 @@ const char *endp_column_titles[ENDP_NUM_COLUMNS] = { "Tx Packets", "Tx Bytes", "Rx Packets", - "Rx Bytes" + "Rx Bytes", + "Country", + "City", + "AS Number", + "AS Organization" }; const char *endp_conn_title = "Connection"; |