diff options
Diffstat (limited to 'epan/dissectors/packet-fcct.c')
| -rw-r--r-- | epan/dissectors/packet-fcct.c | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/epan/dissectors/packet-fcct.c b/epan/dissectors/packet-fcct.c index 21499a26..9c690c9a 100644 --- a/epan/dissectors/packet-fcct.c +++ b/epan/dissectors/packet-fcct.c @@ -22,26 +22,26 @@ void proto_reg_handoff_fcct(void); static dissector_handle_t fcct_handle; /* Initialize the protocol and registered fields */ -static int proto_fcct = -1; -static int hf_fcct_revision = -1; -static int hf_fcct_inid = -1; -static int hf_fcct_gstype = -1; -static int hf_fcct_gssubtype = -1; -static int hf_fcct_options = -1; -static int hf_fcct_server = -1; /* derived field */ +static int proto_fcct; +static int hf_fcct_revision; +static int hf_fcct_inid; +static int hf_fcct_gstype; +static int hf_fcct_gssubtype; +static int hf_fcct_options; +static int hf_fcct_server; /* derived field */ /* Extended preamble fields */ #if 0 -static int hf_fcct_ext_said = -1; -static int hf_fcct_ext_tid = -1; -static int hf_fcct_ext_reqname = -1; -static int hf_fcct_ext_tstamp = -1; -static int hf_fcct_ext_authblk = -1; +static int hf_fcct_ext_said; +static int hf_fcct_ext_tid; +static int hf_fcct_ext_reqname; +static int hf_fcct_ext_tstamp; +static int hf_fcct_ext_authblk; #endif /* Initialize the subtree pointers */ -static gint ett_fcct = -1; -static gint ett_fcct_ext = -1; /* for the extended header */ +static int ett_fcct; +static int ett_fcct_ext; /* for the extended header */ const value_string fc_ct_rjt_code_vals [] = { {FCCT_RJT_INVCMDCODE, "Invalid Cmd Code"}, @@ -81,8 +81,8 @@ const value_string fc_ct_gsserver_vals[] = { static dissector_table_t fcct_gserver_table; -guint8 -get_gs_server (guint8 gstype, guint8 gssubtype) +uint8_t +get_gs_server (uint8_t gstype, uint8_t gssubtype) { switch (gstype) { case FCCT_GSTYPE_KEYSVC: @@ -129,7 +129,7 @@ dissect_fcct (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) tvbuff_t *next_tvb; int in_id, offset = 0; - guint8 server; + uint8_t server; fc_ct_preamble cthdr; address addr; @@ -137,15 +137,15 @@ dissect_fcct (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) col_set_str(pinfo->cinfo, COL_PROTOCOL, "FC_CT"); /* - cthdr.revision = tvb_get_guint8 (tvb, offset++); + cthdr.revision = tvb_get_uint8 (tvb, offset++); cthdr.in_id = tvb_get_ntoh24 (tvb, offset); offset += 3; - cthdr.gstype = tvb_get_guint8 (tvb, offset++); - cthdr.options = tvb_get_guint8 (tvb, offset++); + cthdr.gstype = tvb_get_uint8 (tvb, offset++); + cthdr.options = tvb_get_uint8 (tvb, offset++); */ - tvb_memcpy (tvb, (guint8 *)&cthdr, offset, FCCT_PRMBL_SIZE); - cthdr.revision = tvb_get_guint8 (tvb, offset++); + tvb_memcpy (tvb, (uint8_t *)&cthdr, offset, FCCT_PRMBL_SIZE); + cthdr.revision = tvb_get_uint8 (tvb, offset++); cthdr.in_id = tvb_get_ntoh24 (tvb, offset); cthdr.opcode = g_ntohs (cthdr.opcode); cthdr.maxres_size = g_ntohs (cthdr.maxres_size); @@ -177,20 +177,20 @@ dissect_fcct (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) fcct_tree = proto_item_add_subtree (ti, ett_fcct); proto_tree_add_item (fcct_tree, hf_fcct_revision, tvb, offset++, - sizeof (guint8), ENC_BIG_ENDIAN); + sizeof (uint8_t), ENC_BIG_ENDIAN); set_address(&addr, AT_FC, 3, &in_id); proto_tree_add_string (fcct_tree, hf_fcct_inid, tvb, offset, 3, address_to_str(pinfo->pool, &addr)); offset += 3; /* sizeof FC address */ proto_tree_add_item (fcct_tree, hf_fcct_gstype, tvb, offset++, - sizeof (guint8), ENC_BIG_ENDIAN); + sizeof (uint8_t), ENC_BIG_ENDIAN); proto_tree_add_item (fcct_tree, hf_fcct_gssubtype, tvb, offset, - sizeof (guint8), ENC_BIG_ENDIAN); + sizeof (uint8_t), ENC_BIG_ENDIAN); proto_tree_add_uint (fcct_tree, hf_fcct_server, tvb, offset++, 1, server); proto_tree_add_item (fcct_tree, hf_fcct_options, tvb, offset++, - sizeof (guint8), ENC_BIG_ENDIAN); + sizeof (uint8_t), ENC_BIG_ENDIAN); } /* We do not change the starting offset for the next protocol in the @@ -199,7 +199,7 @@ dissect_fcct (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) */ next_tvb = tvb_new_subset_remaining (tvb, 0); if (!dissector_try_uint_new(fcct_gserver_table, server, next_tvb, pinfo, - tree, TRUE, data)) { + tree, true, data)) { call_data_dissector(next_tvb, pinfo, tree); } @@ -251,7 +251,7 @@ proto_register_fcct(void) }; /* Setup protocol subtree array */ - static gint *ett[] = { + static int *ett[] = { &ett_fcct, &ett_fcct_ext, }; |