diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-10-11 17:57:09 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-10-11 17:57:09 +0000 |
| commit | 6e0750e875f5530c6db2b51ff5edce5bd7088cb1 (patch) | |
| tree | 55a5c3e8a2a34c79e5112763e9d2e7c1348f4685 /epan/dissectors/packet-ipv6.c | |
| parent | 983f61899ce9f0960181f700796675b85a02bed4 (diff) | |
Enable GeoIP lookups by default. Don't add GeoIP subtrees if we didn't
find any databases.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39363 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-ipv6.c')
| -rw-r--r-- | epan/dissectors/packet-ipv6.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index 84570660b5..e1e1ec2910 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -285,7 +285,7 @@ static gboolean ipv6_summary_in_tree = TRUE; #ifdef HAVE_GEOIP_V6 /* Look up addresses in GeoIP */ -static gboolean ipv6_use_geoip = FALSE; +static gboolean ipv6_use_geoip = TRUE; #endif /* HAVE_GEOIP_V6 */ #ifndef offsetof @@ -412,6 +412,7 @@ add_geoip_info(proto_tree *tree, tvbuff_t *tvb, gint offset, struct e_in6_addr s guint item_cnt; num_dbs = geoip_db_num_dbs(); + if (num_dbs < 1) return; geoip_info_item = proto_tree_add_text(tree, tvb, offset + IP6H_SRC, 16, "Source GeoIP: "); geoip_info_tree = proto_item_add_subtree(geoip_info_item, ett_geoip_info); |