osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Get rid of "fsf_conn_flag_vals[]" - the connection usage flags are bit 

flags, not part of a field where each value means something special.

Put in ID names for some current FCIP drafts.

Note fields that should arguably show their individual bits.

svn path=/trunk/; revision=8423
This commit is contained in:
Guy Harris 2003-09-09 05:02:35 +00:00
parent ba400ac5fe
commit 3fbf8da883
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packet-fcip.c
View File

@ -2,7 +2,7 @@
* Routines for FCIP dissection
* Copyright 2001, Dinesh G Dutt (ddutt@cisco.com)
*
* $Id: packet-fcip.c,v 1.6 2003/09/03 20:58:08 guy Exp $
* $Id: packet-fcip.c,v 1.7 2003/09/09 05:02:35 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -36,6 +36,14 @@
#include <epan/packet.h>
#include "prefs.h"
/*
* See:
*
* draft-ietf-ips-fcovertcpip-12
*
* draft-ietf-ips-fcencapsulation-08
*/
#define FCIP_ENCAP_HEADER_LEN 28
#define FCIP_MIN_HEADER_LEN 16 /* upto frame len field */
#define FCIP_ENCAP_PROTO_VER 0xFEFE0101
@ -98,10 +106,6 @@ static const value_string fcencap_proto_vals[] = {
{FCENCAP_PROTO_iFCP, "iFCP"},
};
static const value_string fsf_conn_flag_vals[] = {
{0, NULL},
};
static guint fcip_header_2_bytes[2] = {FCIP_ENCAP_PROTO_VER,
FCIP_ENCAP_PROTO_VER};
@ -340,12 +344,14 @@ dissect_fcencap_header (tvbuff_t *tvb, proto_tree *tree, gint offset)
proto_tree_add_item (tree, hf_fcip_pflags_c, tvb, offset+10, 1, 0);
}
/* XXX - break out CRCV flag. */
proto_tree_add_item (tree, hf_fcip_flags, tvb, offset+12, 1, 0);
proto_tree_add_item (tree, hf_fcip_framelen, tvb, offset+12, 2, 0);
proto_tree_add_item (tree, hf_fcip_flags_c, tvb, offset+14, 1, 0);
proto_tree_add_item (tree, hf_fcip_framelen_c, tvb, offset+14, 2, 0);
proto_tree_add_item (tree, hf_fcip_tsec, tvb, offset+16, 4, 0);
proto_tree_add_item (tree, hf_fcip_tusec, tvb, offset+20, 4, 0);
/* XXX - check CRC if CRCV is set? */
proto_tree_add_item (tree, hf_fcip_encap_crc, tvb, offset+24, 4, 0);
}
}
@ -360,6 +366,7 @@ dissect_fcip_sf (tvbuff_t *tvb, proto_tree *tree, gint offset)
tvb_get_ptr (tvb, offset+8, 8));
proto_tree_add_bytes (tree, hf_fcip_conn_nonce, tvb, offset+16, 8,
tvb_get_ptr (tvb, offset+16, 8));
/* XXX - break out these flags */
proto_tree_add_item (tree, hf_fcip_conn_flags, tvb, offset+24, 1, 0);
proto_tree_add_item (tree, hf_fcip_conn_code, tvb, offset+26, 2, 0);
proto_tree_add_string (tree, hf_fcip_dst_wwn, tvb, offset+30, 8,