aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ip.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-ip.c')
-rw-r--r--epan/dissectors/packet-ip.c78
1 files changed, 39 insertions, 39 deletions
diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c
index 4dc7623f04..b7008393d6 100644
--- a/epan/dissectors/packet-ip.c
+++ b/epan/dissectors/packet-ip.c
@@ -599,7 +599,7 @@ add_geoip_info_entry(proto_tree *tree, tvbuff_t *tvb, gint offset, ws_in4_addr i
int addr_offset = offset + isdst ? IPH_DST : IPH_SRC;
int dir_hf = isdst ? hf_geoip_dst_summary : hf_geoip_src_summary;
proto_item *geoip_info_item = proto_tree_add_string(tree, dir_hf, tvb, addr_offset, 4, wmem_strbuf_finalize(summary));
- PROTO_ITEM_SET_GENERATED(geoip_info_item);
+ proto_item_set_generated(geoip_info_item);
proto_tree *geoip_info_tree = proto_item_add_subtree(geoip_info_item, ett_geoip_info);
proto_item *item;
@@ -607,57 +607,57 @@ add_geoip_info_entry(proto_tree *tree, tvbuff_t *tvb, gint offset, ws_in4_addr i
if (lookup->city) {
dir_hf = isdst ? hf_geoip_dst_city : hf_geoip_src_city;
item = proto_tree_add_string(geoip_info_tree, dir_hf, tvb, addr_offset, 4, lookup->city);
- PROTO_ITEM_SET_GENERATED(item);
+ proto_item_set_generated(item);
item = proto_tree_add_string(geoip_info_tree, hf_geoip_city, tvb, addr_offset, 4, lookup->city);
- PROTO_ITEM_SET_GENERATED(item);
+ proto_item_set_generated(item);
}
if (lookup->country) {
dir_hf = isdst ? hf_geoip_dst_country : hf_geoip_src_country;
item = proto_tree_add_string(geoip_info_tree, dir_hf, tvb, addr_offset, 4, lookup->country);
- PROTO_ITEM_SET_GENERATED(item);
+ proto_item_set_generated(item);
item = proto_tree_add_string(geoip_info_tree, hf_geoip_country, tvb, addr_offset, 4, lookup->country);
- PROTO_ITEM_SET_GENERATED(item);
+ proto_item_set_generated(item);
}
if (lookup->country_iso) {
dir_hf = isdst ? hf_geoip_dst_country_iso : hf_geoip_src_country_iso;
item = proto_tree_add_string(geoip_info_tree, dir_hf, tvb, addr_offset, 4, lookup->country_iso);
- PROTO_ITEM_SET_GENERATED(item);
+ proto_item_set_generated(item);
item = proto_tree_add_string(geoip_info_tree, hf_geoip_country_iso, tvb, addr_offset, 4, lookup->country_iso);
- PROTO_ITEM_SET_GENERATED(item);
+ proto_item_set_generated(item);
}
if (lookup->as_number > 0) {
dir_hf = isdst ? hf_geoip_dst_as_number : hf_geoip_src_as_number;
item = proto_tree_add_uint(geoip_info_tree, dir_hf, tvb, addr_offset, 4, lookup->as_number);
- PROTO_ITEM_SET_GENERATED(item);
+ proto_item_set_generated(item);
item = proto_tree_add_uint(geoip_info_tree, hf_geoip_as_number, tvb, addr_offset, 4, lookup->as_number);
- PROTO_ITEM_SET_GENERATED(item);
+ proto_item_set_generated(item);
}
if (lookup->as_org) {
dir_hf = isdst ? hf_geoip_dst_as_org : hf_geoip_src_as_org;
item = proto_tree_add_string(geoip_info_tree, dir_hf, tvb, addr_offset, 4, lookup->as_org);
- PROTO_ITEM_SET_GENERATED(item);
+ proto_item_set_generated(item);
item = proto_tree_add_string(geoip_info_tree, hf_geoip_as_org, tvb, addr_offset, 4, lookup->as_org);
- PROTO_ITEM_SET_GENERATED(item);
+ proto_item_set_generated(item);
}
if (lookup->latitude >= -90.0 && lookup->latitude <= 90.0) {
dir_hf = isdst ? hf_geoip_dst_latitude : hf_geoip_src_latitude;
item = proto_tree_add_double(geoip_info_tree, dir_hf, tvb, addr_offset, 4, lookup->latitude);
- PROTO_ITEM_SET_GENERATED(item);
+ proto_item_set_generated(item);
item = proto_tree_add_double(geoip_info_tree, hf_geoip_latitude, tvb, addr_offset, 4, lookup->latitude);
- PROTO_ITEM_SET_GENERATED(item);
+ proto_item_set_generated(item);
}
if (lookup->longitude >= -180.0 && lookup->longitude <= 180.0) {
dir_hf = isdst ? hf_geoip_dst_longitude : hf_geoip_src_longitude;
item = proto_tree_add_double(geoip_info_tree, dir_hf, tvb, addr_offset, 4, lookup->longitude);
- PROTO_ITEM_SET_GENERATED(item);
+ proto_item_set_generated(item);
item = proto_tree_add_double(geoip_info_tree, hf_geoip_longitude, tvb, addr_offset, 4, lookup->longitude);
- PROTO_ITEM_SET_GENERATED(item);
+ proto_item_set_generated(item);
}
}
@@ -1146,8 +1146,8 @@ dissect_option_route(proto_tree *tree, tvbuff_t *tvb, int offset, int hf,
else
proto_tree_add_ipv4(tree, hf, tvb, offset, 4, route);
ti = proto_tree_add_string(tree, hf_host, tvb, offset, 4, get_hostname(route));
- PROTO_ITEM_SET_GENERATED(ti);
- PROTO_ITEM_SET_HIDDEN(ti);
+ proto_item_set_generated(ti);
+ proto_item_set_hidden(ti);
}
static int
@@ -1198,15 +1198,15 @@ dissect_ipopt_route(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int pro
offset + optoffset, 4, addr);
item = proto_tree_add_ipv4(field_tree, hf_ip_addr, tvb,
offset + optoffset, 4, addr);
- PROTO_ITEM_SET_HIDDEN(item);
+ proto_item_set_hidden(item);
item = proto_tree_add_string(field_tree, hf_ip_dst_host, tvb,
offset + optoffset, 4, dst_host);
- PROTO_ITEM_SET_GENERATED(item);
- PROTO_ITEM_SET_HIDDEN(item);
+ proto_item_set_generated(item);
+ proto_item_set_hidden(item);
item = proto_tree_add_string(field_tree, hf_ip_host, tvb,
offset + optoffset, 4, dst_host);
- PROTO_ITEM_SET_GENERATED(item);
- PROTO_ITEM_SET_HIDDEN(item);
+ proto_item_set_generated(item);
+ proto_item_set_hidden(item);
} else if ((optoffset + 1) < ptr) {
/* This is also a recorded route */
dissect_option_route(field_tree, tvb, offset + optoffset, hf_ip_rec_rt,
@@ -1514,7 +1514,7 @@ dissect_ipopt_qs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * dat
ttl_diff = (iph->ip_ttl - tvb_get_guint8(tvb, offset + 1) % 256);
ti = proto_tree_add_uint(field_tree, hf_ip_opt_qs_ttl_diff,
tvb, offset + 1, 1, ttl_diff);
- PROTO_ITEM_SET_GENERATED(ti);
+ proto_item_set_generated(ti);
proto_item_append_text(tf, ", %s, QS TTL %u, QS TTL diff %u",
val_to_str_ext(rate, &qs_rate_vals_ext, "Unknown (%u)"),
tvb_get_guint8(tvb, offset + 1), ttl_diff);
@@ -1986,7 +1986,7 @@ dissect_ip_v4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
iph->ip_len,
"%u bytes (reported as 0, presumed to be because of \"TCP segmentation offload\" (TSO))",
iph->ip_len);
- PROTO_ITEM_SET_GENERATED(tf);
+ proto_item_set_generated(tf);
}
} else {
/* TSO support not enabled, or non-zero length, so treat it as an error. */
@@ -2070,13 +2070,13 @@ dissect_ip_v4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
may have a legitimate reason for wanting it filtered */
item = proto_tree_add_uint(ip_tree, hf_ip_checksum_calculated, tvb,
offset + 10, 2, iph->ip_sum);
- PROTO_ITEM_SET_GENERATED(item);
+ proto_item_set_generated(item);
} else {
proto_item_append_text(item, "(may be caused by \"IP checksum offload\"?)");
item = proto_tree_add_uint(ip_tree, hf_ip_checksum_calculated, tvb,
offset + 10, 2, in_cksum_shouldbe(iph->ip_sum, ipsum));
- PROTO_ITEM_SET_GENERATED(item);
+ proto_item_set_generated(item);
}
} else {
ipsum = 0;
@@ -2089,7 +2089,7 @@ dissect_ip_v4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
"validation disabled");
item = proto_tree_add_uint(ip_tree, hf_ip_checksum_status, tvb,
offset + 10, 0, PROTO_CHECKSUM_E_UNVERIFIED);
- PROTO_ITEM_SET_GENERATED(item);
+ proto_item_set_generated(item);
}
src32 = tvb_get_ntohl(tvb, offset + IPH_SRC);
set_address_tvb(&pinfo->net_src, AT_IPv4, 4, tvb, offset + IPH_SRC);
@@ -2105,15 +2105,15 @@ dissect_ip_v4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
}
proto_tree_add_ipv4(ip_tree, hf_ip_src, tvb, offset + 12, 4, addr);
item = proto_tree_add_ipv4(ip_tree, hf_ip_addr, tvb, offset + 12, 4, addr);
- PROTO_ITEM_SET_HIDDEN(item);
+ proto_item_set_hidden(item);
item = proto_tree_add_string(ip_tree, hf_ip_src_host, tvb, offset + 12, 4,
src_host);
- PROTO_ITEM_SET_GENERATED(item);
- PROTO_ITEM_SET_HIDDEN(item);
+ proto_item_set_generated(item);
+ proto_item_set_hidden(item);
item = proto_tree_add_string(ip_tree, hf_ip_host, tvb, offset + 12, 4,
src_host);
- PROTO_ITEM_SET_GENERATED(item);
- PROTO_ITEM_SET_HIDDEN(item);
+ proto_item_set_generated(item);
+ proto_item_set_hidden(item);
}
/* If there's an IP strict or loose source routing option, then the final
@@ -2180,22 +2180,22 @@ dissect_ip_v4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
proto_tree_add_ipv4(ip_tree, hf_ip_cur_rt, tvb, offset + 16, 4, cur_rt);
item = proto_tree_add_string(ip_tree, hf_ip_cur_rt_host, tvb,
offset + 16, 4, get_hostname(cur_rt));
- PROTO_ITEM_SET_GENERATED(item);
- PROTO_ITEM_SET_HIDDEN(item);
+ proto_item_set_generated(item);
+ proto_item_set_hidden(item);
}
else {
proto_tree_add_ipv4(ip_tree, hf_ip_dst, tvb, offset + 16, 4, addr);
item = proto_tree_add_ipv4(ip_tree, hf_ip_addr, tvb, offset + 16, 4,
addr);
- PROTO_ITEM_SET_HIDDEN(item);
+ proto_item_set_hidden(item);
item = proto_tree_add_string(ip_tree, hf_ip_dst_host, tvb, offset + 16,
4, dst_host);
- PROTO_ITEM_SET_GENERATED(item);
- PROTO_ITEM_SET_HIDDEN(item);
+ proto_item_set_generated(item);
+ proto_item_set_hidden(item);
item = proto_tree_add_string(ip_tree, hf_ip_host, tvb,
offset + 16 + dst_off, 4, dst_host);
- PROTO_ITEM_SET_GENERATED(item);
- PROTO_ITEM_SET_HIDDEN(item);
+ proto_item_set_generated(item);
+ proto_item_set_hidden(item);
}
if (ip_use_geoip) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 09:12:36 +0000