Move the handling of the Network_Header for full FC frames into the FC

dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.

In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.

Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".

Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.

Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.

Use "%u", not "%d", to display unsigned values.

svn path=/trunk/; revision=6773

1 files changed, 4 insertions, 1 deletions

diff --git a/packet-llc.c b/packet-llc.c
index 2fb953a904..ec29413a01 100644
--- a/packet-llc.c
+++ b/packet-llc.c
@@ -2,7 +2,7 @@
  * Routines for IEEE 802.2 LLC layer
  * Gilbert Ramirez <gram@alumni.rice.edu>
  *
- * $Id: packet-llc.c,v 1.104 2002/12/08 22:01:20 guy Exp $
+ * $Id: packet-llc.c,v 1.105 2002/12/10 02:49:31 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -35,6 +35,7 @@
 #include "llcsaps.h"
 #include "bridged_pids.h"
 #include "ppptypes.h"
+#include "packet-fc.h"
 #include "packet-ip.h"
 #include "packet-ipx.h"
 #include "packet-netbios.h"
@@ -560,4 +561,6 @@ proto_reg_handoff_llc(void)
 	dissector_add("udp.port", UDP_PORT_LLC3, llc_handle);
 	dissector_add("udp.port", UDP_PORT_LLC4, llc_handle);
 	dissector_add("udp.port", UDP_PORT_LLC5, llc_handle);
+	/* IP-over-FC when we have the full FC frame */
+	dissector_add("fc.ftype", FC_FTYPE_IP, llc_handle);
 }