Remove proto_tree_add_ax25
There isn't a legitimate use for the API, all cases can be covered with proto_tree_add_item. As a bonus, a few more tvb_get_ptr calls can be removed. Change-Id: I3bb86ba8f05ef3363407bcfe9b059ee27ebc135d Reviewed-on: https://code.wireshark.org/review/6429 Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Michael Mann
parent
ecaa1f8d21
commit
67b1593921
|
|
@ -1177,9 +1177,6 @@ protocol or field labels to the proto_tree:
|
|||
proto_tree_add_ipv6_format_value(tree, id, tvb, start, length,
|
||||
value_ptr, format, ...);
|
||||
|
||||
proto_item *
|
||||
proto_tree_add_ax25(tree, id, tvb, start, length, value);
|
||||
|
||||
proto_item *
|
||||
proto_tree_add_ether(tree, id, tvb, start, length, value_ptr);
|
||||
|
||||
|
|
|
|||
|
|
@ -136,9 +136,6 @@ dissect_ax25( tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree )
|
|||
/* char v2cmdresp; */
|
||||
const char *ax25_version;
|
||||
int is_response;
|
||||
const guint8 *src_addr;
|
||||
const guint8 *dst_addr;
|
||||
const guint8 *via_addr;
|
||||
guint8 control;
|
||||
guint8 pid = AX25_P_NO_L3;
|
||||
guint8 src_ssid;
|
||||
|
|
@ -158,20 +155,18 @@ dissect_ax25( tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree )
|
|||
ti = proto_tree_add_protocol_format( parent_tree, proto_ax25, tvb, offset, -1, "AX.25");
|
||||
ax25_tree = proto_item_add_subtree( ti, ett_ax25 );
|
||||
|
||||
dst_addr = tvb_get_ptr( tvb, offset, AX25_ADDR_LEN );
|
||||
proto_tree_add_ax25( ax25_tree, hf_ax25_dst, tvb, offset, AX25_ADDR_LEN, dst_addr );
|
||||
proto_tree_add_item( ax25_tree, hf_ax25_dst, tvb, offset, AX25_ADDR_LEN, ENC_NA);
|
||||
TVB_SET_ADDRESS( &pinfo->dl_dst, AT_AX25, tvb, offset, AX25_ADDR_LEN );
|
||||
TVB_SET_ADDRESS( &pinfo->dst, AT_AX25, tvb, offset, AX25_ADDR_LEN );
|
||||
dst_ssid = *(dst_addr + 6);
|
||||
dst_ssid = tvb_get_guint8(tvb, offset+6);
|
||||
|
||||
/* step over dst addr point at src addr */
|
||||
offset += AX25_ADDR_LEN;
|
||||
|
||||
src_addr = tvb_get_ptr( tvb, offset, AX25_ADDR_LEN );
|
||||
proto_tree_add_ax25( ax25_tree, hf_ax25_src, tvb, offset, AX25_ADDR_LEN, src_addr );
|
||||
proto_tree_add_item( ax25_tree, hf_ax25_src, tvb, offset, AX25_ADDR_LEN, ENC_NA);
|
||||
TVB_SET_ADDRESS( &pinfo->dl_src, AT_AX25, tvb, offset, AX25_ADDR_LEN );
|
||||
TVB_SET_ADDRESS( &pinfo->src, AT_AX25, tvb, offset, AX25_ADDR_LEN );
|
||||
src_ssid = *(src_addr + 6);
|
||||
src_ssid = tvb_get_guint8(tvb, offset+6);
|
||||
|
||||
/* step over src addr point at either 1st via addr or control byte */
|
||||
offset += AX25_ADDR_LEN;
|
||||
|
|
@ -208,8 +203,7 @@ dissect_ax25( tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree )
|
|||
{
|
||||
if ( via_index < AX25_MAX_DIGIS )
|
||||
{
|
||||
via_addr = tvb_get_ptr( tvb, offset, AX25_ADDR_LEN );
|
||||
proto_tree_add_ax25( ax25_tree, hf_ax25_via[ via_index ], tvb, offset, AX25_ADDR_LEN, via_addr );
|
||||
proto_tree_add_item( ax25_tree, hf_ax25_via[ via_index ], tvb, offset, AX25_ADDR_LEN, ENC_NA);
|
||||
via_index++;
|
||||
}
|
||||
/* step over a via addr */
|
||||
|
|
|
|||
|
|
@ -191,10 +191,6 @@ dissect_netrom_proto(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
proto_item *ti;
|
||||
proto_tree *netrom_tree;
|
||||
int offset;
|
||||
const guint8 *src_addr;
|
||||
const guint8 *dst_addr;
|
||||
const guint8 *user_addr;
|
||||
const guint8 *node_addr;
|
||||
#if 0
|
||||
guint8 src_ssid;
|
||||
guint8 dst_ssid;
|
||||
|
|
@ -210,17 +206,15 @@ dissect_netrom_proto(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
offset = 0;
|
||||
|
||||
/* source */
|
||||
src_addr = tvb_get_ptr( tvb, offset, AX25_ADDR_LEN );
|
||||
TVB_SET_ADDRESS(&pinfo->dl_src, AT_AX25, tvb, offset, AX25_ADDR_LEN);
|
||||
TVB_SET_ADDRESS(&pinfo->src, AT_AX25, tvb, offset, AX25_ADDR_LEN);
|
||||
/* src_ssid = *(src_addr + 6); */
|
||||
/* src_ssid = tvb_get_guint8(tvb, offset+6); */
|
||||
offset += AX25_ADDR_LEN; /* step over src addr */
|
||||
|
||||
/* destination */
|
||||
dst_addr = tvb_get_ptr( tvb, offset, AX25_ADDR_LEN );
|
||||
TVB_SET_ADDRESS(&pinfo->dl_dst, AT_AX25, tvb, offset, AX25_ADDR_LEN);
|
||||
TVB_SET_ADDRESS(&pinfo->dst, AT_AX25, tvb, offset, AX25_ADDR_LEN);
|
||||
/* dst_ssid = *(dst_addr + 6); */
|
||||
/* dst_ssid = tvb_get_guint8(tvb, offset+6); */
|
||||
offset += AX25_ADDR_LEN; /* step over dst addr */
|
||||
|
||||
offset += 1; /* step over ttl */
|
||||
|
|
@ -251,11 +245,11 @@ dissect_netrom_proto(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
offset = 0;
|
||||
|
||||
/* source */
|
||||
proto_tree_add_ax25( netrom_tree, hf_netrom_src, tvb, offset, AX25_ADDR_LEN, src_addr );
|
||||
proto_tree_add_item( netrom_tree, hf_netrom_src, tvb, offset, AX25_ADDR_LEN, ENC_NA );
|
||||
offset += AX25_ADDR_LEN;
|
||||
|
||||
/* destination */
|
||||
proto_tree_add_ax25( netrom_tree, hf_netrom_dst, tvb, offset, AX25_ADDR_LEN, dst_addr );
|
||||
proto_tree_add_item( netrom_tree, hf_netrom_dst, tvb, offset, AX25_ADDR_LEN, ENC_NA );
|
||||
offset += AX25_ADDR_LEN;
|
||||
|
||||
/* ttl */
|
||||
|
|
@ -409,12 +403,10 @@ dissect_netrom_proto(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
proto_tree_add_item( netrom_tree, hf_netrom_pwindow, tvb, offset, 1, ENC_BIG_ENDIAN );
|
||||
offset += 1;
|
||||
|
||||
user_addr = tvb_get_ptr( tvb, offset, AX25_ADDR_LEN );
|
||||
proto_tree_add_ax25( netrom_tree, hf_netrom_user, tvb, offset, AX25_ADDR_LEN, user_addr );
|
||||
proto_tree_add_item( netrom_tree, hf_netrom_user, tvb, offset, AX25_ADDR_LEN, ENC_NA );
|
||||
offset += AX25_ADDR_LEN;
|
||||
|
||||
node_addr = tvb_get_ptr( tvb, offset, AX25_ADDR_LEN );
|
||||
proto_tree_add_ax25( netrom_tree, hf_netrom_node, tvb, offset, AX25_ADDR_LEN, node_addr );
|
||||
proto_tree_add_item( netrom_tree, hf_netrom_node, tvb, offset, AX25_ADDR_LEN, ENC_NA );
|
||||
offset += AX25_ADDR_LEN;
|
||||
|
||||
break;
|
||||
|
|
|
|||
19
epan/proto.c
19
epan/proto.c
|
|
@ -3164,25 +3164,6 @@ proto_tree_set_string_tvb(field_info *fi, tvbuff_t *tvb, gint start, gint length
|
|||
proto_tree_set_string(fi, string);
|
||||
}
|
||||
|
||||
|
||||
/* Add a FT_AX25 to a proto_tree */
|
||||
proto_item *
|
||||
proto_tree_add_ax25(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start, gint length,
|
||||
const guint8* value)
|
||||
{
|
||||
proto_item *pi;
|
||||
header_field_info *hfinfo;
|
||||
|
||||
TRY_TO_FAKE_THIS_ITEM(tree, hfindex, hfinfo);
|
||||
|
||||
DISSECTOR_ASSERT_FIELD_TYPE(hfinfo, FT_AX25);
|
||||
|
||||
pi = proto_tree_add_pi(tree, hfinfo, tvb, start, &length);
|
||||
proto_tree_set_ax25(PNODE_FINFO(pi), value);
|
||||
|
||||
return pi;
|
||||
}
|
||||
|
||||
/* Set the FT_AX25 value */
|
||||
static void
|
||||
proto_tree_set_ax25(field_info *fi, const guint8* value)
|
||||
|
|
|
|||
12
epan/proto.h
12
epan/proto.h
|
|
@ -1346,18 +1346,6 @@ WS_DLL_PUBLIC proto_item *
|
|||
proto_tree_add_ipv6_format(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
|
||||
gint length, const guint8* value_ptr, const char *format, ...) G_GNUC_PRINTF(7,8);
|
||||
|
||||
/** Add a FT_AX25 to a proto_tree.
|
||||
@param tree the tree to append this item to
|
||||
@param hfindex field index
|
||||
@param tvb the tv buffer of the current data
|
||||
@param start start of data in tvb
|
||||
@param length length of data in tvb
|
||||
@param value data to display
|
||||
@return the newly created item */
|
||||
extern proto_item *
|
||||
proto_tree_add_ax25(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
|
||||
gint length, const guint8* value);
|
||||
|
||||
/** Add a FT_ETHER to a proto_tree.
|
||||
@param tree the tree to append this item to
|
||||
@param hfindex field index
|
||||
|
|
|
|||
Loading…
Reference in New Issue