From Mike Harvey: Support for WiMAX and the WiMAX M2M encapsulation protocol.

Add support for WiMAX and M2M to various makefiles and installer files.  Add
basic support for M2M to randpkt.


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

1 files changed, 20 insertions, 8 deletions

diff --git a/randpkt.c b/randpkt.c
index 650b9dadc7..ab88c2c907 100644
--- a/randpkt.c
+++ b/randpkt.c
@@ -53,24 +53,25 @@
 /* Types of produceable packets */
 enum {
 	PKT_ARP,
+	PKT_BGP,
+	PKT_BVLC,
 	PKT_DNS,
 	PKT_ETHERNET,
 	PKT_FDDI,
+	PKT_GIOP,
 	PKT_ICMP,
 	PKT_IP,
 	PKT_LLC,
+	PKT_M2M,
+	PKT_MEGACO,
 	PKT_NBNS,
+	PKT_NCP2222,
+	PKT_SCTP,
 	PKT_SYSLOG,
 	PKT_TCP,
-	PKT_TR,
-	PKT_UDP,
-	PKT_BVLC,
-	PKT_NCP2222,
-	PKT_GIOP,
-	PKT_BGP,
 	PKT_TDS,
-	PKT_SCTP,
-	PKT_MEGACO
+	PKT_TR,
+	PKT_UDP
 };
 
 typedef struct {
@@ -138,6 +139,14 @@ guint8 pkt_llc[] = {
 	0xc4, 0x67
 };
 
+/* Ethernet, indicating WiMAX M2M */
+guint8 pkt_m2m[] = {
+	0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x00, 0x00,
+	0x32, 0x25, 0x0f, 0xff,
+	0x08, 0xf0
+};
+
 /* Ethernet+IP+UDP, indicating NBNS */
 guint8 pkt_nbns[] = {
 	0xff, 0xff, 0xff, 0xff,
@@ -386,6 +395,9 @@ pkt_example examples[] = {
 	{ "llc", "Logical Link Control",
 		PKT_LLC,	pkt_llc,	WTAP_ENCAP_TOKEN_RING,	array_length(pkt_llc) },
 
+	{ "m2m", "WiMAX M2M Encapsulation Protocol",
+		PKT_M2M,	pkt_m2m,	WTAP_ENCAP_ETHERNET,	array_length(pkt_m2m) },
+
 	{ "megaco", "MEGACO",
 		PKT_MEGACO,	pkt_megaco,	WTAP_ENCAP_ETHERNET,	array_length(pkt_megaco) },