diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-12-19 23:49:03 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-12-19 23:49:03 +0000 |
| commit | 99ecc0dc24d5177b219e32d150b66f7ea8503979 (patch) | |
| tree | a7873b88f53d9a7db8509a12e299a82b3ef9001b /epan/Makefile.common | |
| parent | 4a1aa4a214410eb8a5f529961d69bf18cbc770aa (diff) | |
Rename geoip.[ch] to geoip_db.[ch] so we don't collide with GeoIP.h. Rename
some functions to match.
Add GeoIP lookups to the IP dissector. Add a preference for GeoIP lookups,
which is disabled by default.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27063 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/Makefile.common')
| -rw-r--r-- | epan/Makefile.common | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/Makefile.common b/epan/Makefile.common index 6529e792fc..371c2dcca7 100644 --- a/epan/Makefile.common +++ b/epan/Makefile.common @@ -56,7 +56,7 @@ LIBWIRESHARK_SRC = \ frequency-utils.c \ funnel.c \ gcp.c \ - geoip.c \ + geoip_db.c \ golay.c \ guid-utils.c \ h225-persistentdata.c \ @@ -173,7 +173,7 @@ LIBWIRESHARK_INCLUDES = \ funnel.h \ garrayfix.h \ gcp.h \ - geoip.h \ + geoip_db.h \ golay.h \ gnuc_format_check.h \ greproto.h \ |