[Midnightbsd-cvs] src: pf/net: Add __MidnightBSD__ os checks
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Dec 12 22:53:12 EST 2008
Log Message:
-----------
Add __MidnightBSD__ os checks
Modified Files:
--------------
src/sys/contrib/pf/net:
if_pflog.c (r1.3 -> r1.4)
if_pflog.h (r1.3 -> r1.4)
if_pfsync.c (r1.2 -> r1.3)
if_pfsync.h (r1.2 -> r1.3)
pf_ruleset.c (r1.1 -> r1.2)
-------------- next part --------------
Index: if_pflog.c
===================================================================
RCS file: /home/cvs/src/sys/contrib/pf/net/if_pflog.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -L sys/contrib/pf/net/if_pflog.c -L sys/contrib/pf/net/if_pflog.c -u -r1.3 -r1.4
--- sys/contrib/pf/net/if_pflog.c
+++ sys/contrib/pf/net/if_pflog.c
@@ -33,7 +33,7 @@
* PURPOSE.
*/
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
#include "opt_inet.h"
#include "opt_inet6.h"
#include "opt_bpf.h"
@@ -64,7 +64,7 @@
#include <sys/mbuf.h>
#include <sys/proc.h>
#include <sys/socket.h>
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
#include <sys/kernel.h>
#include <sys/limits.h>
#include <sys/malloc.h>
@@ -75,7 +75,7 @@
#endif
#include <net/if.h>
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
#include <net/if_clone.h>
#endif
#include <net/if_types.h>
@@ -99,7 +99,7 @@
#include <net/pfvar.h>
#include <net/if_pflog.h>
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
#include <machine/in_cksum.h>
#endif
@@ -116,7 +116,7 @@
struct rtentry *);
int pflogioctl(struct ifnet *, u_long, caddr_t);
void pflogstart(struct ifnet *);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
static int pflog_clone_create(struct if_clone *, int, caddr_t);
static void pflog_clone_destroy(struct ifnet *);
#else
@@ -125,7 +125,7 @@
#endif
LIST_HEAD(, pflog_softc) pflogif_list;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
IFC_SIMPLE_DECLARE(pflog, 1);
#else
struct if_clone pflog_cloner =
@@ -135,8 +135,10 @@
struct ifnet *pflogifs[PFLOGIFS_MAX]; /* for fast access */
#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
extern int ifqmaxlen;
#endif
+#endif
void
pflogattach(int npflog)
@@ -146,12 +148,14 @@
for (i = 0; i < PFLOGIFS_MAX; i++)
pflogifs[i] = NULL;
#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
(void) pflog_clone_create(&pflog_cloner, 0);
#endif
+#endif
if_clone_attach(&pflog_cloner);
}
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
static int
pflog_clone_create(struct if_clone *ifc, int unit, caddr_t param)
#else
@@ -171,7 +175,7 @@
bzero(pflogif, sizeof(*pflogif));
pflogif->sc_unit = unit;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
ifp = pflogif->sc_ifp = if_alloc(IFT_PFLOG);
if (ifp == NULL) {
free(pflogif, M_DEVBUF);
@@ -188,17 +192,21 @@
ifp->if_output = pflogoutput;
ifp->if_start = pflogstart;
#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
ifp->if_type = IFT_PFLOG;
#endif
+#endif
ifp->if_snd.ifq_maxlen = ifqmaxlen;
ifp->if_hdrlen = PFLOG_HDRLEN;
if_attach(ifp);
#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
if_alloc_sadl(ifp);
#endif
+#endif
#if NBPFILTER > 0
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
bpfattach(ifp, DLT_PFLOG, PFLOG_HDRLEN);
#else
bpfattach(&pflogif->sc_if.if_bpf, ifp, DLT_PFLOG, PFLOG_HDRLEN);
@@ -206,12 +214,12 @@
#endif
s = splnet();
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_LOCK();
#endif
LIST_INSERT_HEAD(&pflogif_list, pflogif, sc_list);
pflogifs[unit] = ifp;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_UNLOCK();
#endif
splx(s);
@@ -219,7 +227,7 @@
return (0);
}
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
static void
pflog_clone_destroy(struct ifnet *ifp)
#else
@@ -231,12 +239,12 @@
int s;
s = splnet();
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_LOCK();
#endif
pflogifs[pflogif->sc_unit] = NULL;
LIST_REMOVE(pflogif, sc_list);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_UNLOCK();
#endif
splx(s);
@@ -245,13 +253,15 @@
bpfdetach(ifp);
#endif
if_detach(ifp);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
if_free(ifp);
#endif
free(pflogif, M_DEVBUF);
#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
return (0);
#endif
+#endif
}
/*
@@ -262,11 +272,13 @@
{
struct mbuf *m;
#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
int s;
#endif
+#endif
for (;;) {
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
IF_LOCK(&ifp->if_snd);
_IF_DROP(&ifp->if_snd);
_IF_DEQUEUE(&ifp->if_snd, m);
@@ -302,7 +314,7 @@
case SIOCAIFADDR:
case SIOCSIFDSTADDR:
case SIOCSIFFLAGS:
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
if (ifp->if_flags & IFF_UP)
ifp->if_drv_flags |= IFF_DRV_RUNNING;
else
@@ -354,7 +366,7 @@
sizeof(hdr.ruleset));
}
if (rm->log & PF_LOG_SOCKET_LOOKUP && !pd->lookup.done)
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
/*
* XXX: This should not happen as we force an early lookup
* via debug.pfugidhack
@@ -386,7 +398,7 @@
ifn->if_opackets++;
ifn->if_obytes += m->m_pkthdr.len;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
BPF_MTAP2(ifn, &hdr, PFLOG_HDRLEN, m);
#else
bpf_mtap_hdr(ifn->if_bpf, (char *)&hdr, PFLOG_HDRLEN, m,
@@ -397,7 +409,7 @@
return (0);
}
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
static int
pflog_modevent(module_t mod, int type, void *data)
{
Index: if_pflog.h
===================================================================
RCS file: /home/cvs/src/sys/contrib/pf/net/if_pflog.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -L sys/contrib/pf/net/if_pflog.h -L sys/contrib/pf/net/if_pflog.h -u -r1.3 -r1.4
--- sys/contrib/pf/net/if_pflog.h
+++ sys/contrib/pf/net/if_pflog.h
@@ -32,7 +32,7 @@
#ifdef _KERNEL
struct pflog_softc {
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
struct ifnet *sc_ifp; /* the interface pointer */
#else
struct ifnet sc_if; /* the interface */
@@ -78,7 +78,7 @@
#ifdef _KERNEL
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
struct pf_rule;
struct pf_ruleset;
struct pfi_kif;
Index: if_pfsync.h
===================================================================
RCS file: /home/cvs/src/sys/contrib/pf/net/if_pfsync.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sys/contrib/pf/net/if_pfsync.h -L sys/contrib/pf/net/if_pfsync.h -u -r1.2 -r1.3
--- sys/contrib/pf/net/if_pfsync.h
+++ sys/contrib/pf/net/if_pfsync.h
@@ -165,7 +165,7 @@
extern int pfsync_sync_ok;
struct pfsync_softc {
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
struct ifnet *sc_ifp;
#else
struct ifnet sc_if;
@@ -173,7 +173,7 @@
struct ifnet *sc_sync_ifp;
struct ip_moptions sc_imo;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
struct callout sc_tmo;
#ifdef PFSYNC_TDB
struct callout sc_tdb_tmo;
@@ -193,7 +193,7 @@
#ifdef PFSYNC_TDB
struct mbuf *sc_mbuf_tdb; /* dito for TDB updates */
#endif
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
struct ifqueue sc_ifq;
struct task sc_send_task;
#endif
@@ -209,7 +209,7 @@
int sc_bulk_tries;
int sc_maxcount; /* number of states in mtu */
int sc_maxupdates; /* number of updates/state */
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
eventhandler_tag sc_detachtag;
#endif
};
@@ -279,7 +279,7 @@
int pfsyncr_authlevel;
};
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
#define SIOCSETPFSYNC _IOW('i', 247, struct ifreq)
#define SIOCGETPFSYNC _IOWR('i', 248, struct ifreq)
#endif
@@ -340,7 +340,7 @@
} while (0)
#ifdef _KERNEL
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
void pfsync_input(struct mbuf *, __unused int);
#else
void pfsync_input(struct mbuf *, ...);
Index: pf_ruleset.c
===================================================================
RCS file: /home/cvs/src/sys/contrib/pf/net/pf_ruleset.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -L sys/contrib/pf/net/pf_ruleset.c -L sys/contrib/pf/net/pf_ruleset.c -u -r1.1 -r1.2
--- sys/contrib/pf/net/pf_ruleset.c
+++ sys/contrib/pf/net/pf_ruleset.c
@@ -35,7 +35,7 @@
*
*/
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ruleset.c,v 1.2 2007/07/03 12:16:07 mlaier Exp $");
#endif
@@ -64,7 +64,7 @@
# define DPFPRINTF(format, x...) \
if (pf_status.debug >= PF_DEBUG_NOISY) \
printf(format , ##x)
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
#define rs_malloc(x) malloc(x, M_TEMP, M_NOWAIT)
#else
#define rs_malloc(x) malloc(x, M_TEMP, M_WAITOK)
@@ -95,6 +95,7 @@
struct pf_anchor pf_main_anchor;
#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
/* XXX: hum? */
int pf_get_ruleset_number(u_int8_t);
void pf_init_ruleset(struct pf_ruleset *);
@@ -104,6 +105,7 @@
const struct pf_rule *, struct pfioc_rule *);
void pf_anchor_remove(struct pf_rule *);
#endif
+#endif
static __inline int pf_anchor_compare(struct pf_anchor *, struct pf_anchor *);
@@ -196,7 +198,7 @@
{
char *p, *q, *r;
struct pf_ruleset *ruleset;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
struct pf_anchor *anchor = NULL, *dup, *parent = NULL;
#else
struct pf_anchor *anchor, *dup, *parent = NULL;
Index: if_pfsync.c
===================================================================
RCS file: /home/cvs/src/sys/contrib/pf/net/if_pfsync.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sys/contrib/pf/net/if_pfsync.c -L sys/contrib/pf/net/if_pfsync.c -u -r1.2 -r1.3
--- sys/contrib/pf/net/if_pfsync.c
+++ sys/contrib/pf/net/if_pfsync.c
@@ -26,7 +26,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
#include "opt_inet.h"
#include "opt_inet6.h"
#include "opt_carp.h"
@@ -56,7 +56,7 @@
#endif /* __FreeBSD__ */
#include <sys/param.h>
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
#include <sys/priv.h>
#endif
#include <sys/proc.h>
@@ -64,7 +64,7 @@
#include <sys/time.h>
#include <sys/mbuf.h>
#include <sys/socket.h>
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
#include <sys/endian.h>
#include <sys/malloc.h>
#include <sys/module.h>
@@ -80,7 +80,7 @@
#include <sys/kernel.h>
#include <net/if.h>
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
#include <net/if_clone.h>
#endif
#include <net/if_types.h>
@@ -103,8 +103,10 @@
#endif /* INET6 */
#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
#include "carp.h"
#endif
+#endif
#if NCARP > 0
#include <netinet/ip_carp.h>
#endif
@@ -113,9 +115,11 @@
#include <net/if_pfsync.h>
#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
#include "bpfilter.h"
#include "pfsync.h"
#endif
+#endif
#define PFSYNC_MINMTU \
(sizeof(struct pfsync_header) + sizeof(struct pf_state))
@@ -129,7 +133,7 @@
struct pfsync_softc *pfsyncif = NULL;
struct pfsyncstats pfsyncstats;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
SYSCTL_DECL(_net_inet_pfsync);
SYSCTL_STRUCT(_net_inet_pfsync, 0, stats, CTLFLAG_RW,
&pfsyncstats, pfsyncstats,
@@ -137,7 +141,7 @@
#endif
void pfsyncattach(int);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
int pfsync_clone_create(struct if_clone *, int, caddr_t);
void pfsync_clone_destroy(struct ifnet *);
#else
@@ -171,7 +175,7 @@
void pfsync_bulk_update(void *);
void pfsync_bulkfail(void *);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
void pfsync_ifdetach(void *, struct ifnet *);
void pfsync_senddef(void *, int);
@@ -182,10 +186,12 @@
int pfsync_sync_ok;
#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
extern int ifqmaxlen;
#endif
+#endif
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
IFC_SIMPLE_DECLARE(pfsync, 1);
#else
struct if_clone pfsync_cloner =
@@ -199,7 +205,7 @@
}
int
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
pfsync_clone_create(struct if_clone *ifc, int unit, caddr_t param)
#else
pfsync_clone_create(struct if_clone *ifc, int unit)
@@ -214,7 +220,7 @@
if ((pfsyncif = malloc(sizeof(*pfsyncif), M_DEVBUF, M_NOWAIT)) == NULL)
return (ENOMEM);
bzero(pfsyncif, sizeof(*pfsyncif));
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
if ((pfsyncif->sc_imo.imo_membership = (struct in_multi **)malloc(
(sizeof(struct in_multi *) * IP_MIN_MEMBERSHIPS), M_DEVBUF,
M_NOWAIT)) == NULL) {
@@ -258,7 +264,7 @@
pfsyncif->sc_statep_tdb.t = NULL;
#endif
pfsyncif->sc_maxupdates = 128;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
pfsyncif->sc_sync_peer.s_addr = htonl(INADDR_PFSYNC_GROUP);
pfsyncif->sc_sendaddr.s_addr = htonl(INADDR_PFSYNC_GROUP);
#else
@@ -270,9 +276,11 @@
pfsyncif->sc_bulk_send_next = NULL;
pfsyncif->sc_bulk_terminator = NULL;
#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
ifp = &pfsyncif->sc_if;
snprintf(ifp->if_xname, sizeof ifp->if_xname, "pfsync%d", unit);
#endif
+#endif
ifp->if_softc = pfsyncif;
ifp->if_ioctl = pfsyncioctl;
ifp->if_output = pfsyncoutput;
@@ -281,7 +289,7 @@
ifp->if_snd.ifq_maxlen = ifqmaxlen;
ifp->if_hdrlen = PFSYNC_HDRLEN;
pfsync_setmtu(pfsyncif, ETHERMTU);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
callout_init(&pfsyncif->sc_tmo, CALLOUT_MPSAFE);
#ifdef PFSYNC_TDB
callout_init(&pfsyncif->sc_tdb_tmo, CALLOUT_MPSAFE);
@@ -296,15 +304,17 @@
#endif
if_attach(ifp);
#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
if_alloc_sadl(ifp);
#endif
+#endif
#if NCARP > 0
if_addgroup(ifp, "carp");
#endif
#if NBPFILTER > 0
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
bpfattach(ifp, DLT_PFSYNC, PFSYNC_HDRLEN);
#else
bpfattach(&pfsyncif->sc_if.if_bpf, ifp, DLT_PFSYNC, PFSYNC_HDRLEN);
@@ -314,14 +324,14 @@
return (0);
}
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
void
#else
int
#endif
pfsync_clone_destroy(struct ifnet *ifp)
{
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
EVENTHANDLER_DEREGISTER(ifnet_departure_event, pfsyncif->sc_detachtag);
callout_stop(&pfsyncif->sc_tmo);
#ifdef PFSYNC_TDB
@@ -336,15 +346,17 @@
bpfdetach(ifp);
#endif
if_detach(ifp);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
if_free(ifp);
free(pfsyncif->sc_imo.imo_membership, M_DEVBUF);
#endif
free(pfsyncif, M_DEVBUF);
pfsyncif = NULL;
#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
return (0);
#endif
+#endif
}
/*
@@ -355,11 +367,13 @@
{
struct mbuf *m;
#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
int s;
#endif
+#endif
for (;;) {
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
IF_LOCK(&ifp->if_snd);
_IF_DROP(&ifp->if_snd);
_IF_DEQUEUE(&ifp->if_snd, m);
@@ -487,7 +501,7 @@
}
void
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
pfsync_input(struct mbuf *m, __unused int off)
#else
pfsync_input(struct mbuf *m, ...)
@@ -581,7 +595,7 @@
creatorid = cp->creatorid;
s = splsoftnet();
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_LOCK();
#endif
if (cp->ifname[0] == '\0') {
@@ -595,7 +609,7 @@
}
} else {
if ((kif = pfi_kif_get(cp->ifname)) == NULL) {
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_UNLOCK();
#endif
splx(s);
@@ -611,7 +625,7 @@
}
}
}
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_UNLOCK();
#endif
splx(s);
@@ -626,7 +640,7 @@
}
s = splsoftnet();
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_LOCK();
#endif
for (i = 0, sp = (struct pfsync_state *)(mp->m_data + offp);
@@ -647,7 +661,7 @@
if ((error = pfsync_insert_net_state(sp,
chksum_flag))) {
if (error == ENOMEM) {
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_UNLOCK();
#endif
splx(s);
@@ -656,7 +670,7 @@
continue;
}
}
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_UNLOCK();
#endif
splx(s);
@@ -669,7 +683,7 @@
}
s = splsoftnet();
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_LOCK();
#endif
for (i = 0, sp = (struct pfsync_state *)(mp->m_data + offp);
@@ -765,7 +779,7 @@
}
if (stale && sc->sc_mbuf != NULL)
pfsync_sendout(sc);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_UNLOCK();
#endif
splx(s);
@@ -782,7 +796,7 @@
}
s = splsoftnet();
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_LOCK();
#endif
for (i = 0, sp = (struct pfsync_state *)(mp->m_data + offp);
@@ -798,7 +812,7 @@
st->sync_flags |= PFSTATE_FROMSYNC;
pf_unlink_state(st);
}
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_UNLOCK();
#endif
splx(s);
@@ -813,7 +827,7 @@
}
s = splsoftnet();
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_LOCK();
#endif
for (i = 0, up = (struct pfsync_state_upd *)(mp->m_data + offp);
@@ -838,7 +852,7 @@
/* We don't have this state. Ask for it. */
error = pfsync_request_update(up, &src);
if (error == ENOMEM) {
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_UNLOCK();
#endif
splx(s);
@@ -906,7 +920,7 @@
}
if ((update_requested || stale) && sc->sc_mbuf)
pfsync_sendout(sc);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_UNLOCK();
#endif
splx(s);
@@ -920,7 +934,7 @@
}
s = splsoftnet();
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_LOCK();
#endif
for (i = 0, dp = (struct pfsync_state_del *)(mp->m_data + offp);
@@ -936,7 +950,7 @@
st->sync_flags |= PFSTATE_FROMSYNC;
pf_unlink_state(st);
}
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_UNLOCK();
#endif
splx(s);
@@ -953,7 +967,7 @@
}
s = splsoftnet();
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_LOCK();
#endif
if (sc->sc_mbuf != NULL)
@@ -974,7 +988,7 @@
printf("pfsync: received "
"bulk update request\n");
pfsync_send_bus(sc, PFSYNC_BUS_START);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
callout_reset(&sc->sc_bulk_tmo, 1 * hz,
pfsync_bulk_update, pfsyncif);
#else
@@ -993,7 +1007,7 @@
}
if (sc->sc_mbuf != NULL)
pfsync_sendout(sc);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_UNLOCK();
#endif
splx(s);
@@ -1011,7 +1025,7 @@
bus = (struct pfsync_state_bus *)(mp->m_data + offp);
switch (bus->status) {
case PFSYNC_BUS_START:
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
callout_reset(&sc->sc_bulkfail_tmo,
pf_pool_limits[PF_LIMIT_STATES].limit /
(PFSYNC_BULKPACKETS * sc->sc_maxcount),
@@ -1034,7 +1048,7 @@
timeout_del(&sc->sc_bulkfail_tmo);
#if NCARP > 0
if (!pfsync_sync_ok)
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
#ifdef CARP_ADVANCED
carp_group_demote_adj(sc->sc_ifp, -1);
#endif
@@ -1062,13 +1076,13 @@
return;
}
s = splsoftnet();
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_LOCK();
#endif
for (i = 0, pt = (struct pfsync_tdb *)(mp->m_data + offp);
i < count; i++, pt++)
pfsync_update_net_tdb(pt);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_UNLOCK();
#endif
splx(s);
@@ -1094,8 +1108,10 @@
pfsyncioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
{
#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
struct proc *p = curproc;
#endif
+#endif
struct pfsync_softc *sc = ifp->if_softc;
struct ifreq *ifr = (struct ifreq *)data;
struct ip_moptions *imo = &sc->sc_imo;
@@ -1108,7 +1124,7 @@
case SIOCAIFADDR:
case SIOCSIFDSTADDR:
case SIOCSIFFLAGS:
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
if (ifp->if_flags & IFF_UP)
ifp->if_drv_flags |= IFF_DRV_RUNNING;
else
@@ -1126,13 +1142,13 @@
if (ifr->ifr_mtu > MCLBYTES)
ifr->ifr_mtu = MCLBYTES;
s = splnet();
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_LOCK();
#endif
if (ifr->ifr_mtu < ifp->if_mtu)
pfsync_sendout(sc);
pfsync_setmtu(sc, ifr->ifr_mtu);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_UNLOCK();
#endif
splx(s);
@@ -1148,7 +1164,7 @@
return (error);
break;
case SIOCSETPFSYNC:
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
if ((error = priv_check(curthread, PRIV_NETINET_PF)) != 0)
#else
if ((error = suser(p, p->p_acflag)) != 0)
@@ -1157,11 +1173,11 @@
if ((error = copyin(ifr->ifr_data, &pfsyncr, sizeof(pfsyncr))))
return (error);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_LOCK();
#endif
if (pfsyncr.pfsyncr_syncpeer.s_addr == 0)
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
sc->sc_sync_peer.s_addr = htonl(INADDR_PFSYNC_GROUP);
#else
sc->sc_sync_peer.s_addr = INADDR_PFSYNC_GROUP;
@@ -1171,12 +1187,12 @@
pfsyncr.pfsyncr_syncpeer.s_addr;
if (pfsyncr.pfsyncr_maxupdates > 255)
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
{
PF_UNLOCK();
#endif
return (EINVAL);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
}
#endif
sc->sc_maxupdates = pfsyncr.pfsyncr_maxupdates;
@@ -1191,7 +1207,7 @@
sc->sc_statep_net.s = NULL;
splx(s);
}
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_UNLOCK();
#endif
if (imo->imo_num_memberships > 0) {
@@ -1201,17 +1217,17 @@
break;
}
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_UNLOCK();
#endif
if ((sifp = ifunit(pfsyncr.pfsyncr_syncdev)) == NULL)
return (EINVAL);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_LOCK();
#endif
s = splnet();
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
if (sifp->if_mtu < sc->sc_ifp->if_mtu ||
#else
if (sifp->if_mtu < sc->sc_if.if_mtu ||
@@ -1222,25 +1238,25 @@
pfsync_sendout(sc);
sc->sc_sync_ifp = sifp;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
pfsync_setmtu(sc, sc->sc_ifp->if_mtu);
#else
pfsync_setmtu(sc, sc->sc_if.if_mtu);
#endif
if (imo->imo_num_memberships > 0) {
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_UNLOCK();
#endif
in_delmulti(imo->imo_membership[--imo->imo_num_memberships]);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_LOCK();
#endif
imo->imo_multicast_ifp = NULL;
}
if (sc->sc_sync_ifp &&
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
sc->sc_sync_peer.s_addr == htonl(INADDR_PFSYNC_GROUP)) {
#else
sc->sc_sync_peer.s_addr == INADDR_PFSYNC_GROUP) {
@@ -1249,20 +1265,20 @@
if (!(sc->sc_sync_ifp->if_flags & IFF_MULTICAST)) {
sc->sc_sync_ifp = NULL;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_UNLOCK();
#endif
splx(s);
return (EADDRNOTAVAIL);
}
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
addr.s_addr = htonl(INADDR_PFSYNC_GROUP);
#else
addr.s_addr = INADDR_PFSYNC_GROUP;
#endif
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_UNLOCK();
#endif
if ((imo->imo_membership[0] =
@@ -1271,7 +1287,7 @@
splx(s);
return (ENOBUFS);
}
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_LOCK();
#endif
imo->imo_num_memberships++;
@@ -1281,7 +1297,7 @@
}
if (sc->sc_sync_ifp ||
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
sc->sc_sendaddr.s_addr != htonl(INADDR_PFSYNC_GROUP)) {
#else
sc->sc_sendaddr.s_addr != INADDR_PFSYNC_GROUP) {
@@ -1290,7 +1306,7 @@
sc->sc_ureq_sent = time_uptime;
#if NCARP > 0
if (pfsync_sync_ok)
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
#ifdef CARP_ADVANCED
carp_group_demote_adj(sc->sc_ifp, 1);
#endif
@@ -1301,7 +1317,7 @@
pfsync_sync_ok = 0;
if (pf_status.debug >= PF_DEBUG_MISC)
printf("pfsync: requesting bulk update\n");
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
callout_reset(&sc->sc_bulkfail_tmo, 5 * hz,
pfsync_bulkfail, pfsyncif);
#else
@@ -1309,7 +1325,7 @@
#endif
error = pfsync_request_update(NULL, NULL);
if (error == ENOMEM) {
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_UNLOCK();
#endif
splx(s);
@@ -1317,7 +1333,7 @@
}
pfsync_sendout(sc);
}
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_UNLOCK();
#endif
splx(s);
@@ -1345,7 +1361,7 @@
sizeof(struct pfsync_state);
if (sc->sc_maxcount > 254)
sc->sc_maxcount = 254;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
sc->sc_ifp->if_mtu = sizeof(struct pfsync_header) +
#else
sc->sc_if.if_mtu = sizeof(struct pfsync_header) +
@@ -1362,7 +1378,7 @@
MGETHDR(m, M_DONTWAIT, MT_DATA);
if (m == NULL) {
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
sc->sc_ifp->if_oerrors++;
#else
sc->sc_if.if_oerrors++;
@@ -1407,7 +1423,7 @@
MCLGET(m, M_DONTWAIT);
if ((m->m_flags & M_EXT) == 0) {
m_free(m);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
sc->sc_ifp->if_oerrors++;
#else
sc->sc_if.if_oerrors++;
@@ -1434,7 +1450,7 @@
*sp = (void *)((char *)h + PFSYNC_HDRLEN);
#ifdef PFSYNC_TDB
if (action == PFSYNC_ACT_TDB_UPD)
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
callout_reset(&sc->sc_tdb_tmo, hz, pfsync_tdb_timeout,
pfsyncif);
#else
@@ -1442,7 +1458,7 @@
#endif
else
#endif
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
callout_reset(&sc->sc_tmo, hz, pfsync_timeout, pfsyncif);
#else
timeout_add(&sc->sc_tmo, hz);
@@ -1466,7 +1482,7 @@
if (sc == NULL)
return (0);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
ifp = sc->sc_ifp;
#else
ifp = &sc->sc_if;
@@ -1477,7 +1493,7 @@
* hear, does it make a sound?
*/
if (ifp->if_bpf == NULL && sc->sc_sync_ifp == NULL &&
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
sc->sc_sync_peer.s_addr == htonl(INADDR_PFSYNC_GROUP)) {
#else
sc->sc_sync_peer.s_addr == INADDR_PFSYNC_GROUP) {
@@ -1495,7 +1511,7 @@
return (EINVAL);
s = splnet();
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_ASSERT(MA_OWNED);
#endif
if (sc->sc_mbuf == NULL) {
@@ -1673,7 +1689,7 @@
if (sc == NULL)
return (0);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
ifp = sc->sc_ifp;
#else
ifp = &sc->sc_if;
@@ -1722,12 +1738,12 @@
if (sc == NULL)
return (0);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
ifp = sc->sc_ifp;
#else
ifp = &sc->sc_if;
#endif
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_ASSERT(MA_OWNED);
#endif
s = splnet();
@@ -1756,11 +1772,11 @@
int s;
s = splnet();
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_LOCK();
#endif
pfsync_sendout(sc);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_UNLOCK();
#endif
splx(s);
@@ -1774,11 +1790,11 @@
int s;
s = splnet();
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_LOCK();
#endif
pfsync_tdb_sendout(sc);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_UNLOCK();
#endif
splx(s);
@@ -1791,7 +1807,7 @@
{
struct pfsync_state_bus *bus;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_ASSERT(MA_OWNED);
#endif
if (sc->sc_mbuf != NULL)
@@ -1817,7 +1833,7 @@
struct pf_state *state;
s = splnet();
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_LOCK();
#endif
if (sc->sc_mbuf != NULL)
@@ -1858,7 +1874,7 @@
printf("pfsync: bulk update complete\n");
} else {
/* look again for more in a bit */
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
callout_reset(&sc->sc_bulk_tmo, 1, pfsync_bulk_update,
pfsyncif);
#else
@@ -1869,7 +1885,7 @@
if (sc->sc_mbuf != NULL)
pfsync_sendout(sc);
splx(s);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_UNLOCK();
#endif
}
@@ -1880,12 +1896,12 @@
struct pfsync_softc *sc = v;
int s, error;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_LOCK();
#endif
if (sc->sc_bulk_tries++ < PFSYNC_MAX_BULKTRIES) {
/* Try again in a bit */
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
callout_reset(&sc->sc_bulkfail_tmo, 5 * hz, pfsync_bulkfail,
pfsyncif);
#else
@@ -1906,7 +1922,7 @@
sc->sc_bulk_tries = 0;
#if NCARP > 0
if (!pfsync_sync_ok)
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
#ifdef CARP_ADVANCED
carp_group_demote_adj(sc->sc_ifp, -1);
#endif
@@ -1920,7 +1936,7 @@
"bulk update status\n");
timeout_del(&sc->sc_bulkfail_tmo);
}
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_UNLOCK();
#endif
}
@@ -1930,7 +1946,7 @@
pfsync_sendout(struct pfsync_softc *sc)
{
#if NBPFILTER > 0
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
struct ifnet *ifp = sc->sc_ifp;
#else
struct ifnet *ifp = &sc->sc_if;
@@ -1938,7 +1954,7 @@
#endif
struct mbuf *m;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_ASSERT(MA_OWNED);
#endif
timeout_del(&sc->sc_tmo);
@@ -1951,7 +1967,7 @@
#if NBPFILTER > 0
if (ifp->if_bpf)
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
BPF_MTAP(ifp, m);
#else
bpf_mtap(ifp->if_bpf, m, BPF_DIRECTION_OUT);
@@ -1973,7 +1989,7 @@
pfsync_tdb_sendout(struct pfsync_softc *sc)
{
#if NBPFILTER > 0
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
struct ifnet *ifp = sc->sc_ifp;
#else
struct ifnet *ifp = &sc->sc_if;
@@ -1981,7 +1997,7 @@
#endif
struct mbuf *m;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_ASSERT(MA_OWNED);
#endif
timeout_del(&sc->sc_tdb_tmo);
@@ -1994,7 +2010,7 @@
#if NBPFILTER > 0
if (ifp->if_bpf)
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
BPF_MTAP(ifp, m);
#else
bpf_mtap(ifp->if_bpf, m, BPF_DIRECTION_OUT);
@@ -2011,11 +2027,11 @@
struct sockaddr sa;
struct ip *ip;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_ASSERT(MA_OWNED);
#endif
if (sc->sc_sync_ifp ||
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
sc->sc_sync_peer.s_addr != htonl(INADDR_PFSYNC_GROUP)) {
#else
sc->sc_sync_peer.s_addr != INADDR_PFSYNC_GROUP) {
@@ -2029,13 +2045,13 @@
ip->ip_v = IPVERSION;
ip->ip_hl = sizeof(*ip) >> 2;
ip->ip_tos = IPTOS_LOWDELAY;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
ip->ip_len = m->m_pkthdr.len;
#else
ip->ip_len = htons(m->m_pkthdr.len);
#endif
ip->ip_id = htons(ip_randomid());
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
ip->ip_off = IP_DF;
#else
ip->ip_off = htons(IP_DF);
@@ -2047,7 +2063,7 @@
bzero(&sa, sizeof(sa));
ip->ip_src.s_addr = INADDR_ANY;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
if (sc->sc_sendaddr.s_addr == htonl(INADDR_PFSYNC_GROUP))
#else
if (sc->sc_sendaddr.s_addr == INADDR_PFSYNC_GROUP)
@@ -2058,7 +2074,7 @@
pfsyncstats.pfsyncs_opackets++;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
if (!IF_HANDOFF(&sc->sc_ifq, m, NULL))
pfsyncstats.pfsyncs_oerrors++;
taskqueue_enqueue(taskqueue_thread, &pfsyncif->sc_send_task);
@@ -2126,13 +2142,13 @@
if (sc == NULL)
return (0);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
ifp = sc->sc_ifp;
#else
ifp = &sc->sc_if;
#endif
if (ifp->if_bpf == NULL && sc->sc_sync_ifp == NULL &&
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
sc->sc_sync_peer.s_addr == htonl(INADDR_PFSYNC_GROUP)) {
#else
sc->sc_sync_peer.s_addr == INADDR_PFSYNC_GROUP) {
@@ -2146,7 +2162,7 @@
return (0);
}
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
PF_ASSERT(MA_OWNED);
#endif
s = splnet();
@@ -2236,7 +2252,7 @@
}
#endif /* PFSYNC_TDB */
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
void
pfsync_ifdetach(void *arg, struct ifnet *ifp)
{
More information about the Midnightbsd-cvs
mailing list