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

Use "tvb_memeql()" to check whether specified bytes in a packet have a 

specified value.

Make a constant array "const".

svn path=/trunk/; revision=12895
This commit is contained in:
Guy Harris 2004-12-31 02:48:53 +00:00
parent 9d9687dd5a
commit 29c1d25ddc
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
epan/dissectors/packet-fcip.c
View File

@ -107,8 +107,8 @@ static const value_string fcencap_proto_vals[] = {
{0, NULL},
};
static guint fcip_header_2_bytes[2] = {FCIP_ENCAP_PROTO_VER,
FCIP_ENCAP_PROTO_VER};
static const guint fcip_header_2_bytes[2] = {FCIP_ENCAP_PROTO_VER,
FCIP_ENCAP_PROTO_VER};
static int proto_fcip = -1;
@ -216,8 +216,8 @@ NXT_BYTE: while (bytes_remaining) {
/*
* Tests a, b and c
*/
if (memcmp ((void *)tvb_get_ptr (tvb, offset, 8),
(void *)fcip_header_2_bytes, 8) != 0) {
if (tvb_memeql(tvb, offset, (const guint8 *)fcip_header_2_bytes,
8) != 0) {
offset++;
bytes_remaining--;
goto NXT_BYTE;
@ -287,8 +287,8 @@ NXT_BYTE: while (bytes_remaining) {
if (bytes_remaining >= (frame_len)) {
if (tvb_bytes_exist (tvb, offset+frame_len, 8)) {
/* The start of the next header matches what we wish to see */
if (memcmp ((void *)tvb_get_ptr (tvb, offset+frame_len, 8),
(void *)fcip_header_2_bytes, 8) == 0) {
if (tvb_memeql (tvb, offset+frame_len,
(const guint8 *)fcip_header_2_bytes, 8) == 0) {
return (offset);
}
else {