summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico G. Schwindt <fgsch@cvs.openbsd.org>2004-01-26 02:20:25 +0000
committerFederico G. Schwindt <fgsch@cvs.openbsd.org>2004-01-26 02:20:25 +0000
commit8b734c360a6bb25033a75fa6a1698a0d08c932f6 (patch)
tree3943a382e3ffc048cb32f667c0ffb35cc9aa91ae
parentc4d1d2770e5415ed116669e98bd0faf6ddc221a1 (diff)
add DLT_IEEE802_11 support; from NetBSD. bump minor.
deraadt@ ok.
-rw-r--r--lib/libpcap/gencode.c9
-rw-r--r--lib/libpcap/shlib_version2
2 files changed, 8 insertions, 3 deletions
diff --git a/lib/libpcap/gencode.c b/lib/libpcap/gencode.c
index db36a64e072..9885922957e 100644
--- a/lib/libpcap/gencode.c
+++ b/lib/libpcap/gencode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gencode.c,v 1.19 2003/05/14 08:50:37 canacar Exp $ */
+/* $OpenBSD: gencode.c,v 1.20 2004/01/26 02:20:24 fgsch Exp $ */
/*
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998
@@ -22,7 +22,7 @@
*/
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /cvs/OpenBSD/src/lib/libpcap/gencode.c,v 1.19 2003/05/14 08:50:37 canacar Exp $ (LBL)";
+ "@(#) $Header: /cvs/OpenBSD/src/lib/libpcap/gencode.c,v 1.20 2004/01/26 02:20:24 fgsch Exp $ (LBL)";
#endif
#include <sys/types.h>
@@ -601,6 +601,11 @@ init_linktype(type)
off_nl = 22;
return;
+ case DLT_IEEE802_11:
+ off_linktype = 30; /* XXX variable */
+ off_nl = 32;
+ return;
+
case DLT_ATM_RFC1483:
/*
* assume routed, non-ISO PDUs
diff --git a/lib/libpcap/shlib_version b/lib/libpcap/shlib_version
index b52599a164f..c6e3f4d3fc0 100644
--- a/lib/libpcap/shlib_version
+++ b/lib/libpcap/shlib_version
@@ -1,2 +1,2 @@
major=2
-minor=0
+minor=1