Add a pcap/ipnet.h file with IPNET definitions; use the right AF_ values.
This commit is contained in:
parent
add31c2e28
commit
2d78729d0f
|
@ -99,6 +99,7 @@ PUBHDR = \
|
||||||
pcap-namedb.h \
|
pcap-namedb.h \
|
||||||
pcap/bpf.h \
|
pcap/bpf.h \
|
||||||
pcap/bluetooth.h \
|
pcap/bluetooth.h \
|
||||||
|
pcap/ipnet.h \
|
||||||
pcap/namedb.h \
|
pcap/namedb.h \
|
||||||
pcap/pcap.h \
|
pcap/pcap.h \
|
||||||
pcap/sll.h \
|
pcap/sll.h \
|
||||||
|
|
|
@ -74,6 +74,7 @@ static const char rcsid[] _U_ =
|
||||||
#include "sunatmpos.h"
|
#include "sunatmpos.h"
|
||||||
#include "ppp.h"
|
#include "ppp.h"
|
||||||
#include "pcap/sll.h"
|
#include "pcap/sll.h"
|
||||||
|
#include "pcap/ipnet.h"
|
||||||
#include "arcnet.h"
|
#include "arcnet.h"
|
||||||
#ifdef HAVE_NET_PFVAR_H
|
#ifdef HAVE_NET_PFVAR_H
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
|
@ -2021,16 +2022,18 @@ gen_ipnet_linktype(proto)
|
||||||
register int proto;
|
register int proto;
|
||||||
{
|
{
|
||||||
switch (proto) {
|
switch (proto) {
|
||||||
|
|
||||||
case ETHERTYPE_IP:
|
case ETHERTYPE_IP:
|
||||||
return gen_cmp(OR_LINK, off_linktype, BPF_B,
|
return gen_cmp(OR_LINK, off_linktype, BPF_B,
|
||||||
(bpf_int32)AF_INET);
|
(bpf_int32)IPH_AF_INET);
|
||||||
/* NOTREACHED */
|
/* NOTREACHED */
|
||||||
|
|
||||||
case ETHERTYPE_IPV6:
|
case ETHERTYPE_IPV6:
|
||||||
return gen_cmp(OR_LINK, off_linktype, BPF_B,
|
return gen_cmp(OR_LINK, off_linktype, BPF_B,
|
||||||
(bpf_int32)AF_INET6);
|
(bpf_int32)IPH_AF_INET6);
|
||||||
/* NOTREACHED */
|
/* NOTREACHED */
|
||||||
default :
|
|
||||||
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -960,12 +960,6 @@ struct bpf_version {
|
||||||
#define DLT_IPV4 228
|
#define DLT_IPV4 228
|
||||||
#define DLT_IPV6 229
|
#define DLT_IPV6 229
|
||||||
|
|
||||||
/*
|
|
||||||
* IPNET
|
|
||||||
*/
|
|
||||||
#define IPNET_OUTBOUND 1
|
|
||||||
#define IPNET_INBOUND 2
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* DLT and savefile link type values are split into a class and
|
* DLT and savefile link type values are split into a class and
|
||||||
* a member of that class. A class value of 0 indicates a regular
|
* a member of that class. A class value of 0 indicates a regular
|
||||||
|
|
|
@ -0,0 +1,43 @@
|
||||||
|
/*-
|
||||||
|
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
|
||||||
|
* The Regents of the University of California. All rights reserved.
|
||||||
|
*
|
||||||
|
* This code is derived from the Stanford/CMU enet packet filter,
|
||||||
|
* (net/enet.c) distributed as part of 4.3BSD, and code contributed
|
||||||
|
* to Berkeley by Steven McCanne and Van Jacobson both of Lawrence
|
||||||
|
* Berkeley Laboratory.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions
|
||||||
|
* are met:
|
||||||
|
* 1. Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
|
* documentation and/or other materials provided with the distribution.
|
||||||
|
* 3. All advertising materials mentioning features or use of this software
|
||||||
|
* must display the following acknowledgement:
|
||||||
|
* This product includes software developed by the University of
|
||||||
|
* California, Berkeley and its contributors.
|
||||||
|
* 4. Neither the name of the University nor the names of its contributors
|
||||||
|
* may be used to endorse or promote products derived from this software
|
||||||
|
* without specific prior written permission.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
||||||
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||||
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
||||||
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||||
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||||
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||||
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||||
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||||
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||||
|
* SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define IPH_AF_INET 2 /* Matches Solaris's AF_INET */
|
||||||
|
#define IPH_AF_INET6 26 /* Matches Solaris's AF_INET6 */
|
||||||
|
|
||||||
|
#define IPNET_OUTBOUND 1
|
||||||
|
#define IPNET_INBOUND 2
|
Reference in New Issue