diff options
Diffstat (limited to 'epan/dissectors/packet-ipnet.c')
| -rw-r--r-- | epan/dissectors/packet-ipnet.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/epan/dissectors/packet-ipnet.c b/epan/dissectors/packet-ipnet.c index 6e47db32..94cf5806 100644 --- a/epan/dissectors/packet-ipnet.c +++ b/epan/dissectors/packet-ipnet.c @@ -17,17 +17,17 @@ void proto_register_ipnet(void); void proto_reg_handoff_ipnet(void); -static int proto_ipnet = -1; -static int hf_version = -1; -static int hf_family = -1; -static int hf_htype = -1; -static int hf_pktlen = -1; -static int hf_ifindex = -1; -static int hf_grifindex = -1; -static int hf_zsrc = -1; -static int hf_zdst = -1; - -static gint ett_raw = -1; +static int proto_ipnet; +static int hf_version; +static int hf_family; +static int hf_htype; +static int hf_pktlen; +static int hf_ifindex; +static int hf_grifindex; +static int hf_zsrc; +static int hf_zdst; + +static int ett_raw; static dissector_handle_t ipnet_handle; static dissector_handle_t ip_handle; @@ -52,8 +52,8 @@ dissect_ipnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U proto_tree *fh_tree; proto_item *ti; tvbuff_t *next_tvb; - guint32 pktlen; - guint8 family; + uint32_t pktlen; + uint8_t family; /* load the top pane info. This should be overwritten by the next protocol in the stack */ @@ -78,7 +78,7 @@ dissect_ipnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U pktlen = tvb_get_ntohl(tvb, 4); next_tvb = tvb_new_subset_remaining(tvb, tvb_captured_length(tvb) - pktlen); - family = tvb_get_guint8(tvb, 1); + family = tvb_get_uint8(tvb, 1); switch (family) { case SOLARIS_AF_INET: call_dissector(ip_handle, next_tvb, pinfo, tree); @@ -120,7 +120,7 @@ proto_register_ipnet(void) { &hf_zdst, { "Destination Zone ID", "ipnet.zdst", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, }; - static gint *ett[] = { + static int *ett[] = { &ett_raw, }; |