Add a new Wiretap encapsulation type for Cisco HDLC. Map the NetBSD

DLT_HDLC to it.

Make a separate dissector for Cisco HDLC, and add a dissector for Cisco
SLARP.  Have the PPP dissector call the Cisco HDLC dissector if the
address field is the Cisco HDLC unicast or multicast address.  Use the
Cisco HDLC dissector for the Cisco HDLC Wiretap encapsulation type.

Add a new dissector table "chdlctype", for Cisco HDLC packet types
(they're *almost* the same as Ethernet types, but 0x8035 is SLARP, not
Reverse ARP, and 0x2000 is the Cisco Discovery protocol, for example),
replacing "fr.chdlc".

Have a "chdlctype()" routine, similar to "ethertype()", used both by the
Cisco HDLC and Frame Relay dissectors.  Have a "chdlc_vals[]"
"value_string" table for Cisco HDLC types and protocol names.  Split the
packet type field in the Frame Relay dissector into separate SNAP and
Cisco HDLC fields, and give them the Ethernet type and Cisco HDLC type
"value_string" tables, respectively.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3133 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 1 insertions, 40 deletions

diff --git a/ppptypes.h b/ppptypes.h
index 9268a123d2..0e09b7f30b 100644
--- a/ppptypes.h
+++ b/ppptypes.h
@@ -1,7 +1,7 @@
 /* ppptypes.h
  * Defines PPP packet types.
  *
- * $Id: ppptypes.h,v 1.5 2001/01/14 08:25:14 guy Exp $
+ * $Id: ppptypes.h,v 1.6 2001/03/15 09:11:01 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -54,43 +54,4 @@
 #define PPP_CHAP	0xc223	/* Cryptographic Handshake Auth. Protocol */
 #define PPP_CBCP	0xc029	/* Callback Control Protocol */
 
-/*
- * Address and control field for Cisco HDLC.
- * RFC 1547, "Requirements for an Internet Standard Point-to-Point Protocol",
- * section 4.3.1 "Cisco Systems point-to-point protocols", says
- *
- *	The Cisco Systems gateway supports both asynchronous links using SLIP
- *	and synchronous links using either simple HDLC framing, X.25 LAPB or
- *	full X.25.  The HDLC framing procedure includes a four byte header.
- *	The first octet (address) is either 0x0F (unicast intent) or 0x8F  
- *	(multicast intent).  The second octet (control byte) is left zero and
- *	is not checked on reception.  The third and fourth octets contain a 
- *	standard 16 bit Ethernet protocol type code.
- *
- * This is the first two octets for unicast intent frames.
- */
-#define CISCO_HDLC_ADDR_CTRL	0x0F00	/* Internet Protocol */
-
-/*
- * Protocol types for the Cisco HDLC format.
- *
- * As per the above, according to RFC 1547, these are "standard 16 bit
- * Ethernet protocol type code[s]", but 0x8035 is Reverse ARP, and
- * that is (at least according to the Linux ISDN code) not the
- * same as Cisco SLARP.
- *
- * In addition, 0x2000 is apparently the Cisco Discovery Protocol, but
- * on Ethernet those are encapsulated inside SNAP with an OUI of
- * OUI_CISCO, not OUI_ENCAP_ETHER.
- *
- * Perhaps we should set up a protocol table for those protocols
- * that differ between Ethernet and Cisco HDLC, and have the PPP
- * code first try that table and, if it finds nothing in that
- * table, call "ethertype()".  (Unfortunately, that means that -
- * assuming we had a Cisco SLARP dissector - said dissector were
- * disabled, SLARP packets would be dissected as Reverse ARP
- * packets, not as data.
- */
-#define CISCO_SLARP	0x8035	/* Cisco SLARP protocol */
-
 #endif /* ppptypes.h */