diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-01-16 20:51:21 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-01-16 20:51:21 +0000 |
| commit | 8d32d2066a22a6e3b3970961af9fb9a2a64c2ae6 (patch) | |
| tree | 420d5401a47ed145c8aba98c7891e5f098f86e19 /epan/dissectors/packet-netbios.c | |
| parent | c04dd5fda9af1d2fdac3eb2d16b7e6de757558a9 (diff) | |
There's no need to pass the result of tvb_get_ptr() as the 'value' in
proto_tree_add_*(): just use proto_tree_add_item().
Replace some tvb_get_ptr()s with tvb_get_ephemeral_string() or
tvb_get_const_stringz().
Use tvb_memeql() & tvb_memcmp().
svn path=/trunk/; revision=35558
Diffstat (limited to 'epan/dissectors/packet-netbios.c')
| -rw-r--r-- | epan/dissectors/packet-netbios.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-netbios.c b/epan/dissectors/packet-netbios.c index c793990785..600f082da6 100644 --- a/epan/dissectors/packet-netbios.c +++ b/epan/dissectors/packet-netbios.c @@ -683,7 +683,7 @@ dissect_netb_datagram( tvbuff_t *tvb, int offset, proto_tree *tree) /* Weird. In some datagrams, this is 10 octets of 0, followed by a MAC address.... */ - if (memcmp( tvb_get_ptr( tvb,offset + NB_SENDER_NAME, 10), zeroes, 10) == 0) { + if (tvb_memeql(tvb, offset + NB_SENDER_NAME, zeroes, 10) == 0) { proto_tree_add_text( tree, tvb, offset + NB_SENDER_NAME + 10, 6, "Sender's MAC Address: %s", ether_to_str( tvb_get_ptr( tvb,offset + NB_SENDER_NAME + 10, 6))); @@ -702,7 +702,7 @@ dissect_netb_datagram_bcast( tvbuff_t *tvb, int offset, proto_tree *tree) {/* Handle the DATAGRAM BROADCAST command */ /* We assume the same weirdness can happen here.... */ - if ( memcmp( tvb_get_ptr( tvb,offset + NB_SENDER_NAME + 10, 6), zeroes, 10) == 0) { + if (tvb_memeql(tvb, offset + NB_SENDER_NAME, zeroes, 10) == 0) { proto_tree_add_text( tree, tvb, offset + NB_SENDER_NAME + 10, 6, "Sender's Node Address: %s", ether_to_str( tvb_get_ptr( tvb,offset + NB_SENDER_NAME + 10, 6))); @@ -1141,7 +1141,7 @@ dissect_netbios(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; default: - col_add_str( pinfo->cinfo, COL_INFO, + col_add_str( pinfo->cinfo, COL_INFO, command_name); break; } |