diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2008-10-27 18:01:48 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2008-10-27 18:01:48 +0000 |
| commit | 0470fff9fe574a7fb6604853ff67cb17e9563786 (patch) | |
| tree | ab77694271e30f36c7bc943671c97e6a1fbaeda4 /version_info.c | |
| parent | 9676190af1140a687b075f844e6f55368d728483 (diff) | |
Added info about GeoIP. Only dump info about ADNS if without c-ares.
svn path=/trunk/; revision=26578
Diffstat (limited to 'version_info.c')
| -rw-r--r-- | version_info.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/version_info.c b/version_info.c index 31b90ecd26..3480b7e86d 100644 --- a/version_info.c +++ b/version_info.c @@ -87,6 +87,10 @@ # include <sys/capability.h> #endif +#ifdef HAVE_GEOIP +#include <epan/geoip.h> +#endif + #ifdef SVNVERSION const char *wireshark_svnversion = " (" SVNVERSION ")"; #else @@ -214,8 +218,7 @@ get_epan_compiled_version_info(GString *str) /* SNMP */ g_string_append(str, ", "); #ifdef HAVE_LIBSMI - g_string_append(str, "with SMI "); - g_string_append(str, SMI_VERSION_STRING); + g_string_append(str, "with SMI " SMI_VERSION_STRING); #else /* no SNMP library */ g_string_append(str, "without SMI"); #endif /* _SMI_H */ @@ -223,19 +226,18 @@ get_epan_compiled_version_info(GString *str) /* c-ares */ g_string_append(str, ", "); #ifdef HAVE_C_ARES - g_string_append(str, "with c-ares "); - g_string_append(str, ARES_VERSION_STR); + g_string_append(str, "with c-ares " ARES_VERSION_STR); #else g_string_append(str, "without c-ares"); -#endif /* HAVE_C_ARES */ - /* ADNS */ + /* ADNS - only add if no c-ares */ g_string_append(str, ", "); #ifdef HAVE_GNU_ADNS g_string_append(str, "with ADNS"); #else g_string_append(str, "without ADNS"); #endif /* HAVE_GNU_ADNS */ +#endif /* HAVE_C_ARES */ /* LUA */ g_string_append(str, ", "); @@ -275,6 +277,15 @@ get_epan_compiled_version_info(GString *str) #else g_string_append(str, "without Kerberos"); #endif /* HAVE_KERBEROS */ + + /* GeoIP */ + g_string_append(str, ", "); +#ifdef HAVE_GEOIP + g_string_append(str, "with GeoIP"); +#else + g_string_append(str, "without GeoIP"); +#endif /* HAVE_GEOIP */ + } /* |