diff options
| author |   dlg <dlg@openbsd.org> | 2018-02-06 02:55:48 +0000 |
|---|---|---|
| committer | dlg <dlg@openbsd.org> | 2018-02-06 02:55:48 +0000 |
| commit | 2524a2d384ca145dabae884903d3a900772c1fbc (patch) | |
| tree | 4529611081062fb5c3de681525ab9374e93804c8 | |
| parent | Remove manual shutdown and close of the socket since in this case (diff) | |
| download | wireguard-openbsd-2524a2d384ca145dabae884903d3a900772c1fbc.tar.xz wireguard-openbsd-2524a2d384ca145dabae884903d3a900772c1fbc.zip | |
recognise DLT_PPP_SERIAL.
shlib version doesnt need a bump before no new symbols were added
or removed.
part of a larger diff that was ok sthen@
| -rw-r--r-- | lib/libpcap/gencode.c | 7 | ||||
| -rw-r--r-- | lib/libpcap/pcap.c | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lib/libpcap/gencode.c b/lib/libpcap/gencode.c index fed5811dd24..23057fdf410 100644 --- a/lib/libpcap/gencode.c +++ b/lib/libpcap/gencode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gencode.c,v 1.47 2018/02/03 13:39:48 mpi Exp $ */ +/* $OpenBSD: gencode.c,v 1.48 2018/02/06 02:55:48 dlg Exp $ */ /* * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998 @@ -707,6 +707,11 @@ init_linktype(type) off_nl = 4; return; + case DLT_PPP_SERIAL: + off_linktype = -1; + off_nl = 2; + return; + case DLT_PPP_ETHER: /* * This does not include the Ethernet header, and diff --git a/lib/libpcap/pcap.c b/lib/libpcap/pcap.c index fe6f4b88a19..4a31a043218 100644 --- a/lib/libpcap/pcap.c +++ b/lib/libpcap/pcap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcap.c,v 1.21 2018/02/03 13:39:48 mpi Exp $ */ +/* $OpenBSD: pcap.c,v 1.22 2018/02/06 02:55:48 dlg Exp $ */ /* * Copyright (c) 1993, 1994, 1995, 1996, 1997, 1998 @@ -313,6 +313,7 @@ DLT_CHOICE(DLT_IEEE802, "IEEE 802 Networks"), DLT_CHOICE(DLT_ARCNET, "ARCNET"), DLT_CHOICE(DLT_SLIP, "Serial Line IP"), DLT_CHOICE(DLT_PPP, "Point-to-point Protocol"), +DLT_CHOICE(DLT_PPP_SERIAL, "PPP over serial"), DLT_CHOICE(DLT_FDDI, "FDDI"), DLT_CHOICE(DLT_ATM_RFC1483, "LLC/SNAP encapsulated atm"), DLT_CHOICE(DLT_LOOP, "loopback type (af header)"), |