summaryrefslogtreecommitdiff
path: root/epan/epan.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2008-10-27 04:50:57 +0000
committerGerald Combs <gerald@wireshark.org>2008-10-27 04:50:57 +0000
commit1b7064bb6a8176e979595c3a0e5d9b96778b4fc8 (patch)
treeb4ba1971ac1b9ea228540dd609718d57fd5b7b62 /epan/epan.c
parent09bf9e694629b37f201467b988589573f5c3acf9 (diff)
downloadwireshark-1b7064bb6a8176e979595c3a0e5d9b96778b4fc8.tar.gz
Add support for the GeoIP library. Using different database files,
GeoIP can map IP addresses to Countries, Cities, AS numbers, ISPs, etc. If any library paths are defined AND any database files are found, corresponding columns are added to the endpoint tables in the GUI. To do: - Add columns to the conversation list - Add GeoIP info to "-z conv,..." - Create a default UAT file. svn path=/trunk/; revision=26571
Diffstat (limited to 'epan/epan.c')
-rw-r--r--epan/epan.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/epan/epan.c b/epan/epan.c
index 336530fa19..22f3940aff 100644
--- a/epan/epan.c
+++ b/epan/epan.c
@@ -59,6 +59,10 @@
int wslua_init(void*);
#endif
+#ifdef HAVE_GEOIP
+#include "geoip.h"
+#endif
+
gchar*
epan_get_version(void) {
return VERSION;
@@ -102,6 +106,9 @@ epan_init(void (*register_all_protocols_func)(register_cb cb, gpointer client_da
#ifdef HAVE_LUA_5_1
wslua_init(NULL);
#endif
+#ifdef HAVE_GEOIP
+ geoip_init();
+#endif
}