Merge libpcap 0.7.1

MFC after:	2 weeks

1 files changed, 32 insertions, 22 deletions

diff --git a/contrib/libpcap/gencode.h b/contrib/libpcap/gencode.h
index 21eeecb..c790547 100644
--- a/contrib/libpcap/gencode.h
+++ b/contrib/libpcap/gencode.h
@@ -18,8 +18,9 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
+ * @(#) $Header: /tcpdump/master/libpcap/gencode.h,v 1.53 2001/05/10 14:48:02 fenner Exp $ (LBL)
+ *
  * $FreeBSD$
- * @(#) $Header: /tcpdump/master/libpcap/gencode.h,v 1.47 2000/11/04 10:09:55 guy Exp $ (LBL)
  */
 
 /* Address qualifiers. */
@@ -37,34 +38,42 @@
 #define Q_IP		2
 #define Q_ARP		3
 #define Q_RARP		4
-#define Q_TCP		5
-#define Q_UDP		6
-#define Q_ICMP		7
-#define Q_IGMP		8
-#define Q_IGRP		9
+#define Q_SCTP		5
+#define Q_TCP		6
+#define Q_UDP		7
+#define Q_ICMP		8
+#define Q_IGMP		9
+#define Q_IGRP		10
+
+
+#define	Q_ATALK		11
+#define	Q_DECNET	12
+#define	Q_LAT		13
+#define Q_SCA		14
+#define	Q_MOPRC		15
+#define	Q_MOPDL		16
+
 
+#define Q_IPV6		17
+#define Q_ICMPV6	18
+#define Q_AH		19
+#define Q_ESP		20
 
-#define	Q_ATALK		10
-#define	Q_DECNET	11
-#define	Q_LAT		12
-#define Q_SCA		13
-#define	Q_MOPRC		14
-#define	Q_MOPDL		15
+#define Q_PIM		21
+#define Q_VRRP		22
 
+#define Q_AARP		23
 
-#define Q_IPV6		16
-#define Q_ICMPV6	17
-#define Q_AH		18
-#define Q_ESP		19
+#define Q_ISO		24
+#define Q_ESIS		25
+#define Q_ISIS		26
+#define Q_CLNP		27
 
-#define Q_PIM		20
+#define Q_STP		28
 
-#define	Q_AARP		21
+#define Q_IPX		29
 
-#define Q_ISO		22
-#define Q_ESIS		23
-#define Q_ISIS		24
-#define Q_CLNP		25
+#define Q_NETBEUI	30
 
 /* Directional qualifiers. */
 
@@ -167,6 +176,7 @@ void gen_not(struct block *);
 
 struct block *gen_scode(const char *, struct qual);
 struct block *gen_ecode(const u_char *, struct qual);
+struct block *gen_acode(const u_char *, struct qual);
 struct block *gen_mcode(const char *, const char *, int, struct qual);
 #ifdef INET6
 struct block *gen_mcode6(const char *, const char *, int, struct qual);