diff options
-rw-r--r-- | epan/dissectors/packet-ip.c | 16 | ||||
-rw-r--r-- | epan/dissectors/packet-ip.h | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-ipv6.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-stt.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-tapa.c | 2 | ||||
-rw-r--r-- | ui/cli/tap-comparestat.c | 2 | ||||
-rw-r--r-- | ui/gtk/compare_stat.c | 2 |
7 files changed, 14 insertions, 14 deletions
diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index 373e4beedc..1590d13cb2 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -1974,7 +1974,7 @@ ip_try_dissect(gboolean heur_first, tvbuff_t *tvb, packet_info *pinfo, return TRUE; } - if (dissector_try_uint_new(ip_dissector_table, iph->ip_p, tvb, pinfo, + if (dissector_try_uint_new(ip_dissector_table, iph->ip_nxt, tvb, pinfo, tree, TRUE, iph)) { return TRUE; } @@ -2192,7 +2192,7 @@ dissect_ip_v4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* ttl_item = NULL; } - iph->ip_p = tvb_get_guint8(tvb, offset + 9); + iph->ip_nxt = tvb_get_guint8(tvb, offset + 9); if (tree) { proto_tree_add_item(ip_tree, hf_ip_proto, tvb, offset + 9, 1, ENC_BIG_ENDIAN); } @@ -2337,8 +2337,8 @@ dissect_ip_v4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* } else if (!is_a_multicast_addr(dst32) && /* At least BGP should appear here as well */ iph->ip_ttl < 5 && - iph->ip_p != IP_PROTO_PIM && - iph->ip_p != IP_PROTO_OSPF) { + iph->ip_nxt != IP_PROTO_PIM && + iph->ip_nxt != IP_PROTO_OSPF) { expert_add_info_format(pinfo, ttl_item, &ei_ip_ttl_too_small, "\"Time To Live\" only %u", iph->ip_ttl); } @@ -2397,7 +2397,7 @@ dissect_ip_v4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* IPOPT_EOOL, &IP_OPT_TYPES, &ei_ip_opt_len_invalid, pinfo, field_tree, tf, iph); } - p_add_proto_data(pinfo->pool, pinfo, proto_ip, pinfo->curr_layer_num, GUINT_TO_POINTER((guint)iph->ip_p)); + p_add_proto_data(pinfo->pool, pinfo, proto_ip, pinfo->curr_layer_num, GUINT_TO_POINTER((guint)iph->ip_nxt)); tap_queue_packet(ip_tap, pinfo, iph); /* Skip over header + options */ @@ -2413,7 +2413,7 @@ dissect_ip_v4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* ipsum == 0) { ipfd_head = fragment_add_check(&ip_reassembly_table, tvb, offset, pinfo, - iph->ip_p ^ iph->ip_id ^ src32 ^ dst32 ^ pinfo->vlan_id, + iph->ip_nxt ^ iph->ip_id ^ src32 ^ dst32 ^ pinfo->vlan_id, NULL, (iph->ip_off & IP_OFFSET) * 8, iph->ip_len - hlen, @@ -2452,7 +2452,7 @@ dissect_ip_v4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* /* Just show this as a fragment. */ col_add_fstr(pinfo->cinfo, COL_INFO, "Fragmented IP protocol (proto=%s %u, off=%u, ID=%04x)", - ipprotostr(iph->ip_p), iph->ip_p, + ipprotostr(iph->ip_nxt), iph->ip_nxt, (iph->ip_off & IP_OFFSET) * 8, iph->ip_id); if ( ipfd_head && ipfd_head->reassembled_in != pinfo->num ) { col_append_fstr(pinfo->cinfo, COL_INFO, " [Reassembled in #%u]", @@ -2477,7 +2477,7 @@ dissect_ip_v4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* /* Unknown protocol */ if (update_col_info) { col_add_fstr(pinfo->cinfo, COL_INFO, "%s (%u)", - ipprotostr(iph->ip_p), iph->ip_p); + ipprotostr(iph->ip_nxt), iph->ip_nxt); } call_data_dissector(next_tvb, pinfo, parent_tree); } diff --git a/epan/dissectors/packet-ip.h b/epan/dissectors/packet-ip.h index 13cff4f117..299fcffff3 100644 --- a/epan/dissectors/packet-ip.h +++ b/epan/dissectors/packet-ip.h @@ -36,7 +36,7 @@ typedef struct _ws_ip guint16 ip_id; guint16 ip_off; guint8 ip_ttl; - guint8 ip_p; + guint8 ip_nxt; /* IPv4: protocol; IPv6: next header */ guint16 ip_sum; address ip_src; address ip_dst; diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index 1a31ddc0dd..f7b5597cb6 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -2214,7 +2214,7 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ if (!ipv6_exthdr_under_root) { proto_item_set_len (ipv6_item, offset); } - iph.ip_p = nxt; + iph.ip_nxt = nxt; /* collect packet info */ p_add_proto_data(pinfo->pool, pinfo, proto_ipv6, (pinfo->curr_layer_num<<8) | IPV6_PROTO_VALUE, GUINT_TO_POINTER((guint)nxt)); diff --git a/epan/dissectors/packet-stt.c b/epan/dissectors/packet-stt.c index 04311a531d..d4775826c6 100644 --- a/epan/dissectors/packet-stt.c +++ b/epan/dissectors/packet-stt.c @@ -585,7 +585,7 @@ dissect_stt_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ws_ip *iph = (ws_ip*)data; /* Make sure we at least have a TCP header */ - if (iph->ip_p != IP_PROTO_TCP || + if (iph->ip_nxt != IP_PROTO_TCP || tvb_captured_length(tvb) < STT_TCP_HDR_LEN) { return FALSE; } diff --git a/epan/dissectors/packet-tapa.c b/epan/dissectors/packet-tapa.c index 2ac33ebae4..d419f870e2 100644 --- a/epan/dissectors/packet-tapa.c +++ b/epan/dissectors/packet-tapa.c @@ -469,7 +469,7 @@ dissect_tapa_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat ws_ip *iph = (ws_ip*)data; /* The TAPA protocol also uses IP protocol number 4 but it isn't really IPIP */ - if (iph && (iph->ip_p == IP_PROTO_IPIP) && ((tvb_get_guint8(tvb, 0) & 0xF0) != 0x40) && + if (iph && (iph->ip_nxt == IP_PROTO_IPIP) && ((tvb_get_guint8(tvb, 0) & 0xF0) != 0x40) && (tvb_get_ntohs(tvb, 2)) < 20) { dissect_tapa_static(tvb, pinfo, tree, data); return TRUE; diff --git a/ui/cli/tap-comparestat.c b/ui/cli/tap-comparestat.c index 286310103a..3d3fbdee82 100644 --- a/ui/cli/tap-comparestat.c +++ b/ui/cli/tap-comparestat.c @@ -127,7 +127,7 @@ comparestat_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const cksum_vec[0].ptr = &ci->ip_v_hl; cksum_vec[0].len = BYTES; /* skip TTL */ - cksum_vec[1].ptr = &ci->ip_p; + cksum_vec[1].ptr = &ci->ip_nxt; cksum_vec[1].len = 1; /* skip header checksum and ip's (because of NAT)*/ cksum_vec[2].ptr = (const guint8 *)ci->ip_dst.data; diff --git a/ui/gtk/compare_stat.c b/ui/gtk/compare_stat.c index 7239d5bace..83442978e9 100644 --- a/ui/gtk/compare_stat.c +++ b/ui/gtk/compare_stat.c @@ -188,7 +188,7 @@ comparestat_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const cksum_vec[0].ptr=&ci->ip_v_hl; cksum_vec[0].len=BYTES; /* skip TTL */ - cksum_vec[1].ptr=&ci->ip_p; + cksum_vec[1].ptr=&ci->ip_nxt; cksum_vec[1].len=1; /* skip header checksum and ip's (because of NAT)*/ cksum_vec[2].ptr=(const guint8 *)ci->ip_dst.data; |