osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fix some of the Errors/warnings detected by checkapi. 

svn path=/trunk/; revision=25308
This commit is contained in:
Bill Meier 2008-05-15 13:22:06 +00:00
parent b3aa52f573
commit b42aec2948
5 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/dissectors/packet-socks.c
View File

@ -456,6 +456,7 @@ display_socks_v4(tvbuff_t *tvb, int offset, packet_info *pinfo,
/* so messy. */
proto_item *hidden_item;
guint command;
unsigned char ipaddr[4];
guint username_len, domainname_len;
@ -513,7 +514,8 @@ display_socks_v4(tvbuff_t *tvb, int offset, packet_info *pinfo,
++offset;
/* Do results code */
proto_tree_add_item( tree, hf_socks_results_4, tvb, offset, 1, FALSE);
proto_tree_add_item_hidden(tree, hf_socks_results, tvb, offset, 1, FALSE);
hidden_item = proto_tree_add_item(tree, hf_socks_results, tvb, offset, 1, FALSE);
PROTO_ITEM_SET_HIDDEN(hidden_item);
++offset;
@ -623,8 +625,10 @@ display_socks_v5(tvbuff_t *tvb, int offset, packet_info *pinfo,
command);
else {
proto_item *hidden_item;
proto_tree_add_item( tree, hf_socks_results_5, tvb, offset, 1, FALSE);
proto_tree_add_item_hidden(tree, hf_socks_results, tvb, offset, 1, FALSE);
hidden_item = proto_tree_add_item(tree, hf_socks_results, tvb, offset, 1, FALSE);
PROTO_ITEM_SET_HIDDEN(hidden_item);
}
++offset;

8
epan/dissectors/packet-tcp.c
View File

@ -2551,7 +2551,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
guint16 th_sum;
guint16 th_urp;
proto_tree *tcp_tree = NULL, *field_tree = NULL;
proto_item *ti = NULL, *tf;
proto_item *ti = NULL, *tf, *hidden_item;
int offset = 0;
gchar *flags = "<None>";
const gchar *fstr[] = {"FIN", "SYN", "RST", "PSH", "ACK", "URG", "ECN", "CWR" };
@ -2611,8 +2611,10 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
"Source port: %s (%u)", get_tcp_port(tcph->th_sport), tcph->th_sport);
proto_tree_add_uint_format(tcp_tree, hf_tcp_dstport, tvb, offset + 2, 2, tcph->th_dport,
"Destination port: %s (%u)", get_tcp_port(tcph->th_dport), tcph->th_dport);
proto_tree_add_uint_hidden(tcp_tree, hf_tcp_port, tvb, offset, 2, tcph->th_sport);
proto_tree_add_uint_hidden(tcp_tree, hf_tcp_port, tvb, offset + 2, 2, tcph->th_dport);
hidden_item = proto_tree_add_uint(tcp_tree, hf_tcp_port, tvb, offset, 2, tcph->th_sport);
PROTO_ITEM_SET_HIDDEN(hidden_item);
hidden_item = proto_tree_add_uint(tcp_tree, hf_tcp_port, tvb, offset + 2, 2, tcph->th_dport);
PROTO_ITEM_SET_HIDDEN(hidden_item);
/* If we're dissecting the headers of a TCP packet in an ICMP packet
* then go ahead and put the sequence numbers in the tree now (because

21
epan/dissectors/packet-tr.c
View File

@ -325,7 +325,7 @@ static void
dissect_tr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
proto_tree *tr_tree, *bf_tree;
proto_item *ti;
proto_item *ti, *hidden_item;
int frame_type;
guint8 rcf1, rcf2;
tvbuff_t *next_tvb;
@ -520,13 +520,16 @@ dissect_tr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_uint(bf_tree, hf_tr_fc_pcf, tr_tvb, 1, 1, trh->fc);
proto_tree_add_ether(tr_tree, hf_tr_dst, tr_tvb, 2, 6, trh->dst.data);
proto_tree_add_ether(tr_tree, hf_tr_src, tr_tvb, 8, 6, trh->src.data);
proto_tree_add_ether_hidden(tr_tree, hf_tr_addr, tr_tvb, 2, 6, trh->dst.data);
proto_tree_add_ether_hidden(tr_tree, hf_tr_addr, tr_tvb, 8, 6, trh->src.data);
hidden_item = proto_tree_add_ether(tr_tree, hf_tr_addr, tr_tvb, 2, 6, trh->dst.data);
PROTO_ITEM_SET_HIDDEN(hidden_item);
hidden_item = proto_tree_add_ether(tr_tree, hf_tr_addr, tr_tvb, 8, 6, trh->src.data);
PROTO_ITEM_SET_HIDDEN(hidden_item);
proto_tree_add_boolean(tr_tree, hf_tr_sr, tr_tvb, 8, 1, source_routed);
/* non-source-routed version of src addr */
proto_tree_add_ether_hidden(tr_tree, hf_tr_src, tr_tvb, 8, 6, trn_shost_nonsr);
hidden_item = proto_tree_add_ether(tr_tree, hf_tr_src, tr_tvb, 8, 6, trn_shost_nonsr);
PROTO_ITEM_SET_HIDDEN(hidden_item);
if (source_routed) {
/* RCF Byte 1 */
@ -590,6 +593,7 @@ ring-bridge pairs in the /proc/net/tr_rif virtual file. */
static void
add_ring_bridge_pairs(int rcf_len, tvbuff_t *tvb, proto_tree *tree)
{
proto_item *hidden_item;
int j, size;
int segment, brdgnmb, unprocessed_rif;
int buff_offset=0;
@ -614,15 +618,18 @@ add_ring_bridge_pairs(int rcf_len, tvbuff_t *tvb, proto_tree *tree)
segment = tvb_get_ntohs(tvb, RIF_OFFSET) >> 4;
size = g_snprintf(buffer, MAX_BUF_LEN, "%03X",segment);
size = MIN(size, MAX_BUF_LEN - 1);
proto_tree_add_uint_hidden(tree, hf_tr_rif_ring, tvb, TR_MIN_HEADER_LEN + 2, 2, segment);
hidden_item = proto_tree_add_uint(tree, hf_tr_rif_ring, tvb, TR_MIN_HEADER_LEN + 2, 2, segment);
PROTO_ITEM_SET_HIDDEN(hidden_item);
buff_offset += size;
}
segment = tvb_get_ntohs(tvb, RIF_OFFSET + 1 + j) >> 4;
brdgnmb = tvb_get_guint8(tvb, RIF_OFFSET + j) & 0x0f;
size = g_snprintf(buffer+buff_offset, MAX_BUF_LEN-buff_offset, "-%01X-%03X",brdgnmb,segment);
size = MIN(size, MAX_BUF_LEN-buff_offset-1);
proto_tree_add_uint_hidden(tree, hf_tr_rif_ring, tvb, TR_MIN_HEADER_LEN + 3 + j, 2, segment);
proto_tree_add_uint_hidden(tree, hf_tr_rif_bridge, tvb, TR_MIN_HEADER_LEN + 2 + j, 1, brdgnmb);
hidden_item = proto_tree_add_uint(tree, hf_tr_rif_ring, tvb, TR_MIN_HEADER_LEN + 3 + j, 2, segment);
PROTO_ITEM_SET_HIDDEN(hidden_item);
hidden_item = proto_tree_add_uint(tree, hf_tr_rif_bridge, tvb, TR_MIN_HEADER_LEN + 2 + j, 1, brdgnmb);
PROTO_ITEM_SET_HIDDEN(hidden_item);
buff_offset += size;
}
proto_tree_add_string(tree, hf_tr_rif, tvb, TR_MIN_HEADER_LEN + 2, rcf_len, buffer);

5
epan/dissectors/packet-trmac.c
View File

@ -110,7 +110,7 @@ sv_text(tvbuff_t *tvb, int svoff, proto_tree *tree)
};
proto_tree *sv_tree;
proto_item *ti;
proto_item *ti, *hidden_item;
guchar errors[6]; /* isolating or non-isolating */
@ -127,7 +127,8 @@ sv_text(tvbuff_t *tvb, int svoff, proto_tree *tree)
proto_tree_add_text(tree, tvb, svoff, 1,
"Subvector Length: %d bytes", sv_length);*/
proto_tree_add_uint_hidden(tree, hf_trmac_sv, tvb, svoff+1, 1, tvb_get_guint8(tvb, svoff+1));
hidden_item = proto_tree_add_uint(tree, hf_trmac_sv, tvb, svoff+1, 1, tvb_get_guint8(tvb, svoff+1));
PROTO_ITEM_SET_HIDDEN(hidden_item);
switch(tvb_get_guint8(tvb, svoff+1)) {
case 0x01: /* Beacon Type */

5
epan/dissectors/packet-wsp.c
View File

@ -1740,7 +1740,7 @@ add_headers (proto_tree *tree, tvbuff_t *tvb, int hf, packet_info *pinfo)
gint32 val_len, val_start;
gchar *hdr_str, *val_str;
proto_tree *wsp_headers;
proto_item *ti;
proto_item *ti, *hidden_item;
guint8 ok;
guint32 val = 0;
nstime_t tv;
@ -1828,8 +1828,9 @@ add_headers (proto_tree *tree, tvbuff_t *tvb, int hf, packet_info *pinfo)
offset = tvb_len;
}
tvb_ensure_bytes_exist(tvb, hdr_start, offset - hdr_start);
proto_tree_add_string_hidden(wsp_headers, hf_hdr_name,
hidden_item = proto_tree_add_string(wsp_headers, hf_hdr_name,
tvb, hdr_start, offset - hdr_start, hdr_str);
PROTO_ITEM_SET_HIDDEN(hidden_item);
} else if (hdr_id > 0) { /* Shorthand HCP switch */
codepage = hdr_id;
proto_tree_add_uint (wsp_headers, hf_wsp_header_shift_code,