diff options
Diffstat (limited to 'epan/dissectors/packet-trdp.c')
| -rw-r--r-- | epan/dissectors/packet-trdp.c | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/epan/dissectors/packet-trdp.c b/epan/dissectors/packet-trdp.c index 116a4423..f3838d81 100644 --- a/epan/dissectors/packet-trdp.c +++ b/epan/dissectors/packet-trdp.c @@ -24,24 +24,24 @@ void proto_reg_handoff_trdp(void); void proto_register_trdp(void); /* Initialize the protocol and registered fields */ -static int proto_trdp = -1; -static int hf_trdp_seq = -1; -static int hf_trdp_ver = -1; -static int hf_trdp_msgtype = -1; -static int hf_trdp_comid = -1; -static int hf_trdp_etb_topo = -1; -static int hf_trdp_oper_topo = -1; -static int hf_trdp_len = -1; -static int hf_trdp_res = -1; -static int hf_trdp_reply_comid = -1; -static int hf_trdp_reply_ipaddr = -1; -static int hf_trdp_header_fcs = -1; -static int hf_trdp_padding = -1; -static int hf_trdp_reply_status = -1; -static int hf_trdp_session_id = -1; -static int hf_trdp_reply_timeout = -1; -static int hf_trdp_source_uri = -1; -static int hf_trdp_dest_uri = -1; +static int proto_trdp; +static int hf_trdp_seq; +static int hf_trdp_ver; +static int hf_trdp_msgtype; +static int hf_trdp_comid; +static int hf_trdp_etb_topo; +static int hf_trdp_oper_topo; +static int hf_trdp_len; +static int hf_trdp_res; +static int hf_trdp_reply_comid; +static int hf_trdp_reply_ipaddr; +static int hf_trdp_header_fcs; +static int hf_trdp_padding; +static int hf_trdp_reply_status; +static int hf_trdp_session_id; +static int hf_trdp_reply_timeout; +static int hf_trdp_source_uri; +static int hf_trdp_dest_uri; #define TRDP_PD_UDP_PORT 17224 #define TRDP_MD_TCP_UDP_PORT 17225 @@ -49,7 +49,7 @@ static int hf_trdp_dest_uri = -1; #define TRDP_MD_HEADER_LEN 116 /* Initialize the subtree pointers */ -static gint ett_trdp = -1; +static int ett_trdp; /* Initialize dissector table */ static dissector_table_t trdp_dissector_table; @@ -118,7 +118,7 @@ static const value_string reply_status_names[] = { { 0, NULL } }; -static inline int is_pd(guint16 msgtype) +static inline int is_pd(uint16_t msgtype) { return (msgtype & 0xff00) == 0x5000; // 'P' } @@ -127,8 +127,8 @@ static int dissect_trdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi { proto_item *ti; proto_tree *trdp_tree; - guint16 ver; - guint32 remaining, datalen, seq, comid, etb_topo, opr_topo, msgtype, header_len; + uint16_t ver; + uint32_t remaining, datalen, seq, comid, etb_topo, opr_topo, msgtype, header_len; tvbuff_t *next_tvb; if (tvb_reported_length(tvb) < TRDP_PD_HEADER_LEN) @@ -137,7 +137,7 @@ static int dissect_trdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi col_set_str(pinfo->cinfo, COL_PROTOCOL, "TRDP"); col_clear(pinfo->cinfo, COL_INFO); - header_len = is_pd(tvb_get_guint16(tvb, 6, ENC_BIG_ENDIAN)) ? TRDP_PD_HEADER_LEN : TRDP_MD_HEADER_LEN; + header_len = is_pd(tvb_get_uint16(tvb, 6, ENC_BIG_ENDIAN)) ? TRDP_PD_HEADER_LEN : TRDP_MD_HEADER_LEN; /* Create display subtree for the protocol */ ti = proto_tree_add_item(tree, proto_trdp, tvb, 0, header_len, ENC_NA); @@ -145,7 +145,7 @@ static int dissect_trdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi /* Add items to the subtree */ proto_tree_add_item_ret_uint(trdp_tree, hf_trdp_seq, tvb, 0, 4, ENC_BIG_ENDIAN, &seq); - ver = tvb_get_guint16(tvb, 4, ENC_BIG_ENDIAN); + ver = tvb_get_uint16(tvb, 4, ENC_BIG_ENDIAN); proto_tree_add_uint_format_value(trdp_tree, hf_trdp_ver, tvb, 4, 2, 0, "%d.%d", ver >> 8, ver & 0xff); proto_tree_add_item_ret_uint(trdp_tree, hf_trdp_msgtype, tvb, 6, 2, ENC_BIG_ENDIAN, &msgtype); proto_tree_add_item_ret_uint(trdp_tree, hf_trdp_comid, tvb, 8, 4, ENC_BIG_ENDIAN, &comid); @@ -161,7 +161,7 @@ static int dissect_trdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi } else { proto_tree_add_item(trdp_tree, hf_trdp_reply_status, tvb, 24, 4, ENC_BIG_ENDIAN); proto_tree_add_item(trdp_tree, hf_trdp_session_id, tvb, 28, 16, ENC_BIG_ENDIAN); - guint32 reply_timeout = tvb_get_guint32(tvb, 44, ENC_BIG_ENDIAN); + uint32_t reply_timeout = tvb_get_uint32(tvb, 44, ENC_BIG_ENDIAN); proto_tree_add_uint_format_value(trdp_tree, hf_trdp_reply_timeout, tvb, 44, 4, 0, "%d usec", reply_timeout); proto_tree_add_item(trdp_tree, hf_trdp_source_uri, tvb, 48, 32, ENC_ASCII); proto_tree_add_item(trdp_tree, hf_trdp_dest_uri, tvb, 80, 32, ENC_ASCII); @@ -253,7 +253,7 @@ void proto_register_trdp(void) }; /* Setup protocol subtree array */ - static gint *ett[] = { + static int *ett[] = { &ett_trdp }; |