Drop proto_tree_add_unicode_string() from IP, IPv6, JSON dissectors.

Set .display to STR_UNICODE (instead of STR_ASCII).

svn path=/trunk/; revision=53827

1 files changed, 18 insertions, 18 deletions

diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c
index 3b858a0d55..d4ca29f884 100644
--- a/epan/dissectors/packet-ip.c
+++ b/epan/dissectors/packet-ip.c
@@ -589,10 +589,10 @@ add_geoip_info_entry(proto_item *geoip_info_item, tvbuff_t *tvb, gint offset, gu
         PROTO_ITEM_SET_GENERATED(item);
         PROTO_ITEM_SET_HIDDEN(item);
       } else {
-        item = proto_tree_add_unicode_string(geoip_info_tree, geoip_local_hf,
+        item = proto_tree_add_string(geoip_info_tree, geoip_local_hf,
           tvb, offset, 4, geoip_str);
         PROTO_ITEM_SET_GENERATED(item);
-        item = proto_tree_add_unicode_string(geoip_info_tree, geoip_hf,
+        item = proto_tree_add_string(geoip_info_tree, geoip_hf,
           tvb, offset, 4, geoip_str);
         PROTO_ITEM_SET_GENERATED(item);
         PROTO_ITEM_SET_HIDDEN(item);
@@ -2595,40 +2595,40 @@ proto_register_ip(void)
 #ifdef HAVE_GEOIP
     { &hf_geoip_country,
       { "Source or Destination GeoIP Country", "ip.geoip.country",
-        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_city,
       { "Source or Destination GeoIP City", "ip.geoip.city",
-        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_org,
       { "Source or Destination GeoIP Organization", "ip.geoip.org",
-        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_isp,
       { "Source or Destination GeoIP ISP", "ip.geoip.isp",
-        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_asnum,
       { "Source or Destination GeoIP AS Number", "ip.geoip.asnum",
-        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_lat,
       { "Source or Destination GeoIP Latitude", "ip.geoip.lat",
-        FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+        FT_DOUBLE, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_lon,
       { "Source or Destination GeoIP Longitude", "ip.geoip.lon",
         FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_src_country,
       { "Source GeoIP Country", "ip.geoip.src_country",
-        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_src_city,
       { "Source GeoIP City", "ip.geoip.src_city",
-        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_src_org,
       { "Source GeoIP Organization", "ip.geoip.src_org",
-        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_src_isp,
       { "Source GeoIP ISP", "ip.geoip.src_isp",
-        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_src_asnum,
       { "Source GeoIP AS Number", "ip.geoip.src_asnum",
-        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_src_lat,
       { "Source GeoIP Latitude", "ip.geoip.src_lat",
         FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
@@ -2637,19 +2637,19 @@ proto_register_ip(void)
         FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_dst_country,
       { "Destination GeoIP Country", "ip.geoip.dst_country",
-        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_dst_city,
       { "Destination GeoIP City", "ip.geoip.dst_city",
-        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_dst_org,
       { "Destination GeoIP Organization", "ip.geoip.dst_org",
-        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_dst_isp,
       { "Destination GeoIP ISP", "ip.geoip.dst_isp",
-        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_dst_asnum,
       { "Destination GeoIP AS Number", "ip.geoip.dst_asnum",
-        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
     { &hf_geoip_dst_lat,
       { "Destination GeoIP Latitude", "ip.geoip.dst_lat",
         FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL }},