From 2a54cd2a769fa9a1a1ea6f44429669a69415fc86 Mon Sep 17 00:00:00 2001
From: Guy Harris <guy@alum.mit.edu>
Date: Tue, 22 Oct 2002 09:11:13 +0000
Subject: Add a Wiretap encapsulation type for RFC 2625 IP-over-Fibre Channel,
 and map libpcap's DLT_IP_OVER_FC to it.

svn path=/trunk/; revision=6473
---
 wiretap/libpcap.c | 3 ++-
 wiretap/wtap.c    | 5 ++++-
 wiretap/wtap.h    | 5 +++--
 3 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'wiretap')

diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c
index c37aa31534..eb33f061d7 100644
--- a/wiretap/libpcap.c
+++ b/wiretap/libpcap.c
@@ -1,6 +1,6 @@
 /* libpcap.c
  *
- * $Id: libpcap.c,v 1.82 2002/08/28 20:30:44 jmayer Exp $
+ * $Id: libpcap.c,v 1.83 2002/10/22 09:11:13 guy Exp $
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -238,6 +238,7 @@ static const struct {
 	{ 118,		WTAP_ENCAP_CISCO_IOS },
 	{ 119,		WTAP_ENCAP_PRISM_HEADER }, /* Prism monitor mode hdr */
 	{ 121,		WTAP_ENCAP_HHDLC },	/* HiPath HDLC */
+	{ 122,		WTAP_ENCAP_IP_OVER_FC },   /* RFC 2625 IP-over-FC */
 	{ 123,		WTAP_ENCAP_ATM_SNIFFER }, /* SunATM */
 
 	/*
diff --git a/wiretap/wtap.c b/wiretap/wtap.c
index 5e51c305ee..836712ec33 100644
--- a/wiretap/wtap.c
+++ b/wiretap/wtap.c
@@ -1,6 +1,6 @@
 /* wtap.c
  *
- * $Id: wtap.c,v 1.71 2002/08/28 20:30:45 jmayer Exp $
+ * $Id: wtap.c,v 1.72 2002/10/22 09:11:13 guy Exp $
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -148,6 +148,9 @@ static const struct encap_type_info {
 
 	/* WTAP_ENCAP_COSINE */
 	{ "CoSine L2 debug log", "cosine" },
+
+	/* WTAP_ENCAP_IP_OVER_FC */
+	{ "RFC 2625 IP-over-Fibre Channel", "ip-over-fc" },
 };
 
 /* Name that should be somewhat descriptive. */
diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index a37a7a6c0e..3969739d2f 100644
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -1,6 +1,6 @@
 /* wtap.h
  *
- * $Id: wtap.h,v 1.122 2002/08/28 20:30:45 jmayer Exp $
+ * $Id: wtap.h,v 1.123 2002/10/22 09:11:13 guy Exp $
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -119,9 +119,10 @@
 #define WTAP_ENCAP_HHDLC			27
 #define WTAP_ENCAP_DOCSIS			28
 #define WTAP_ENCAP_COSINE			29
+#define WTAP_ENCAP_IP_OVER_FC			30
 
 /* last WTAP_ENCAP_ value + 1 */
-#define WTAP_NUM_ENCAP_TYPES			30
+#define WTAP_NUM_ENCAP_TYPES			31
 
 /* File types that can be read by wiretap.
    We support writing some many of these file types, too, so we
-- 
cgit v1.2.1