fc74a9f93a
struct ifnet or the layer 2 common structure it was embedded in have been replaced with a struct ifnet pointer to be filled by a call to the new function, if_alloc(). The layer 2 common structure is also allocated via if_alloc() based on the interface type. It is hung off the new struct ifnet member, if_l2com. This change removes the size of these structures from the kernel ABI and will allow us to better manage them as interfaces come and go. Other changes of note: - Struct arpcom is no longer referenced in normal interface code. Instead the Ethernet address is accessed via the IFP2ENADDR() macro. To enforce this ac_enaddr has been renamed to _ac_enaddr. - The second argument to ether_ifattach is now always the mac address from driver private storage rather than sometimes being ac_enaddr. Reviewed by: sobomax, sam
80 lines
2.5 KiB
C
80 lines
2.5 KiB
C
/* $FreeBSD$ */
|
|
/* $OpenBSD: if_pflog.h,v 1.11 2004/05/19 17:50:51 dhartmei Exp $ */
|
|
|
|
/*
|
|
* Copyright 2001 Niels Provos <provos@citi.umich.edu>
|
|
* All rights reserved.
|
|
*
|
|
* 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.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
|
|
*/
|
|
|
|
#ifndef _NET_IF_PFLOG_H_
|
|
#define _NET_IF_PFLOG_H_
|
|
|
|
struct pflog_softc {
|
|
#ifdef __FreeBSD__
|
|
struct ifnet *sc_ifp; /* the interface */
|
|
LIST_ENTRY(pflog_softc) sc_next;
|
|
#else
|
|
struct ifnet sc_if; /* the interface */
|
|
#endif
|
|
};
|
|
|
|
#define PFLOG_RULESET_NAME_SIZE 16
|
|
|
|
struct pfloghdr {
|
|
u_int8_t length;
|
|
sa_family_t af;
|
|
u_int8_t action;
|
|
u_int8_t reason;
|
|
char ifname[IFNAMSIZ];
|
|
char ruleset[PFLOG_RULESET_NAME_SIZE];
|
|
u_int32_t rulenr;
|
|
u_int32_t subrulenr;
|
|
u_int8_t dir;
|
|
u_int8_t pad[3];
|
|
};
|
|
|
|
#define PFLOG_HDRLEN sizeof(struct pfloghdr)
|
|
/* minus pad, also used as a signature */
|
|
#define PFLOG_REAL_HDRLEN offsetof(struct pfloghdr, pad)
|
|
|
|
/* XXX remove later when old format logs are no longer needed */
|
|
struct old_pfloghdr {
|
|
u_int32_t af;
|
|
char ifname[IFNAMSIZ];
|
|
short rnr;
|
|
u_short reason;
|
|
u_short action;
|
|
u_short dir;
|
|
};
|
|
#define OLD_PFLOG_HDRLEN sizeof(struct old_pfloghdr)
|
|
|
|
#ifdef _KERNEL
|
|
|
|
#if NPFLOG > 0
|
|
#define PFLOG_PACKET(i,x,a,b,c,d,e,f,g) pflog_packet(i,a,b,c,d,e,f,g)
|
|
#else
|
|
#define PFLOG_PACKET(i,x,a,b,c,d,e,f,g) ((void)0)
|
|
#endif /* NPFLOG > 0 */
|
|
#endif /* _KERNEL */
|
|
#endif /* _NET_IF_PFLOG_H_ */
|