4587 snoop misdecodes DHCPv6 DHCPV6_DUID_LL identifiers

@@ -21,24 +21,26 @@
 /*
  * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident   "%Z%%M% %I%     %E% SMI"
-
 #include <sys/types.h>
 #include <sys/errno.h>
 #include <setjmp.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/socket.h>
 #include <net/if.h>
 #include <net/if_arp.h>
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/if_ether.h>
 #include <netdb.h>
 #include <net/if_types.h>
+#include <arpa/inet.h>
 
 #include "snoop.h"
 
 extern char *dlc_header;
 extern jmp_buf xdr_err;

@@ -217,11 +219,11 @@
 {
         switch (t) {
         case ARPHRD_ETHER:
                 return ("Ethernet (10Mb)");
         case 2:
-                return ("Experimental Ethernet (3MB)");
+                return ("Experimental Ethernet (3Mb)");
         case 3:
                 return ("Amateur Radio AX.25");
         case 4:
                 return ("Proteon ProNET Token Ring");
         case 5:

@@ -252,10 +254,12 @@
                 return ("HDLC");
         case ARPHRD_FC:
                 return ("Fibre Channel");
         case ARPHRD_IPATM:
                 return ("IP-ATM");
+        case ARPHRD_METRICOM:
+                return ("Metricom");
         case ARPHRD_TUNNEL:
                 return ("Tunnel");
         case ARPHRD_IB:
                 return ("IPIB");
         };