forked from osmocom/wireshark
geoip_db_get_paths() is exported from libwireshark, so it has to exist
regardless of whether we have GeoIP or not. However, regardless of whether it's exported from GeoIP or not, it should return a g_mallocated string. svn path=/trunk/; revision=46798
This commit is contained in:
parent
5c2a86ebc8
commit
ab638bb6fc
|
@ -596,6 +596,11 @@ geoip_db_lookup_ipv6(guint dbnum _U_, guint32 addr _U_, const char *not_found) {
|
||||||
return not_found;
|
return not_found;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gchar *
|
||||||
|
geoip_db_get_paths(void) {
|
||||||
|
return g_strdup("");
|
||||||
|
}
|
||||||
|
|
||||||
#endif /* HAVE_GEOIP */
|
#endif /* HAVE_GEOIP */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -84,8 +84,6 @@ extern const char *geoip_db_lookup_ipv4(guint dbnum, guint32 addr, const char *n
|
||||||
*/
|
*/
|
||||||
extern const char *geoip_db_lookup_ipv6(guint dbnum, struct e_in6_addr addr, const char *not_found);
|
extern const char *geoip_db_lookup_ipv6(guint dbnum, struct e_in6_addr addr, const char *not_found);
|
||||||
|
|
||||||
#ifdef HAVE_GEOIP
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get all configured paths
|
* Get all configured paths
|
||||||
*
|
*
|
||||||
|
@ -93,6 +91,4 @@ extern const char *geoip_db_lookup_ipv6(guint dbnum, struct e_in6_addr addr, con
|
||||||
*/
|
*/
|
||||||
extern gchar *geoip_db_get_paths(void);
|
extern gchar *geoip_db_get_paths(void);
|
||||||
|
|
||||||
#endif /* HAVE_GEOIP */
|
|
||||||
|
|
||||||
#endif /* __GEOIP_DB_H__ */
|
#endif /* __GEOIP_DB_H__ */
|
||||||
|
|
Loading…
Reference in New Issue