summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/vmt.c6
-rw-r--r--sys/net/pf.c26
-rw-r--r--sys/net/pf_ioctl.c6
-rw-r--r--sys/netinet/in_pcb.c6
-rw-r--r--sys/netinet/raw_ip.c4
5 files changed, 24 insertions, 24 deletions
diff --git a/sys/dev/vmt.c b/sys/dev/vmt.c
index b40bcc08995..d11263b8011 100644
--- a/sys/dev/vmt.c
+++ b/sys/dev/vmt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmt.c,v 1.3 2008/09/10 14:01:23 blambert Exp $ */
+/* $OpenBSD: vmt.c,v 1.4 2008/10/23 22:22:43 deraadt Exp $ */
/*
* Copyright (c) 2007 David Crawshaw <david@zentus.com>
@@ -202,7 +202,7 @@ vmt_attach(struct device *parent, struct device *self, void *aux)
len = snprintf(sc->sc_rpc_buf, VMT_RPC_BUFLEN, "tools.set.version %u ",
VM_VERSION_UNMANAGED);
-#if DIAGNOSTIC
+#ifdef DIAGNOSTIC
if (len > VMT_RPC_BUFLEN)
panic("vmt rpc buffer is too small");
#endif
@@ -295,7 +295,7 @@ vmt_tick(void *xarg)
len = snprintf(sc->sc_rpc_buf, VMT_RPC_BUFLEN,
"info-set guestinfo.ip %s ", "192.168.1.1");
-#if DIAGNOSTIC
+#ifdef DIAGNOSTIC
if (len > VMT_RPC_BUFLEN)
panic("vmt rpc buffer is too small");
#endif
diff --git a/sys/net/pf.c b/sys/net/pf.c
index c181f02d5c6..3313a204492 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf.c,v 1.623 2008/10/02 15:12:45 jsing Exp $ */
+/* $OpenBSD: pf.c,v 1.624 2008/10/23 22:22:43 deraadt Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -841,7 +841,7 @@ pf_state_insert(struct pfi_kif *kif, struct pf_state_key *skw,
pf_status.fcounters[FCNT_STATE_INSERT]++;
pf_status.states++;
pfi_kif_ref(kif, PFI_KIF_REF_STATE);
-#if NPFSYNC
+#if NPFSYNC > 0
pfsync_insert_state(s);
#endif
return (0);
@@ -1092,11 +1092,11 @@ pf_unlink_state(struct pf_state *cur)
TH_RST|TH_ACK, 0, 0, 0, 1, cur->tag, NULL, NULL);
}
RB_REMOVE(pf_state_tree_id, &tree_id, cur);
-#if NPFLOW
+#if NPFLOW > 0
if (cur->state_flags & PFSTATE_PFLOW)
export_pflow(cur);
#endif
-#if NPFSYNC
+#if NPFSYNC > 0
if (cur->creatorid == pf_status.hostid)
pfsync_delete_state(cur);
#endif
@@ -1110,7 +1110,7 @@ pf_unlink_state(struct pf_state *cur)
void
pf_free_state(struct pf_state *cur)
{
-#if NPFSYNC
+#if NPFSYNC > 0
if (pfsyncif != NULL &&
(pfsyncif->sc_bulk_send_next == cur ||
pfsyncif->sc_bulk_terminator == cur))
@@ -5733,7 +5733,7 @@ pf_test(int dir, struct ifnet *ifp, struct mbuf **m0,
action = pf_test_state_tcp(&s, dir, kif, m, off, h, &pd,
&reason);
if (action == PF_PASS) {
-#if NPFSYNC
+#if NPFSYNC > 0
pfsync_update_state(s);
#endif /* NPFSYNC */
r = s->rule.ptr;
@@ -5763,7 +5763,7 @@ pf_test(int dir, struct ifnet *ifp, struct mbuf **m0,
}
action = pf_test_state_udp(&s, dir, kif, m, off, h, &pd);
if (action == PF_PASS) {
-#if NPFSYNC
+#if NPFSYNC > 0
pfsync_update_state(s);
#endif /* NPFSYNC */
r = s->rule.ptr;
@@ -5787,7 +5787,7 @@ pf_test(int dir, struct ifnet *ifp, struct mbuf **m0,
action = pf_test_state_icmp(&s, dir, kif, m, off, h, &pd,
&reason);
if (action == PF_PASS) {
-#if NPFSYNC
+#if NPFSYNC > 0
pfsync_update_state(s);
#endif /* NPFSYNC */
r = s->rule.ptr;
@@ -5802,7 +5802,7 @@ pf_test(int dir, struct ifnet *ifp, struct mbuf **m0,
default:
action = pf_test_state_other(&s, dir, kif, m, &pd);
if (action == PF_PASS) {
-#if NPFSYNC
+#if NPFSYNC > 0
pfsync_update_state(s);
#endif /* NPFSYNC */
r = s->rule.ptr;
@@ -6106,7 +6106,7 @@ pf_test6(int dir, struct ifnet *ifp, struct mbuf **m0,
action = pf_test_state_tcp(&s, dir, kif, m, off, h, &pd,
&reason);
if (action == PF_PASS) {
-#if NPFSYNC
+#if NPFSYNC > 0
pfsync_update_state(s);
#endif /* NPFSYNC */
r = s->rule.ptr;
@@ -6136,7 +6136,7 @@ pf_test6(int dir, struct ifnet *ifp, struct mbuf **m0,
}
action = pf_test_state_udp(&s, dir, kif, m, off, h, &pd);
if (action == PF_PASS) {
-#if NPFSYNC
+#if NPFSYNC > 0
pfsync_update_state(s);
#endif /* NPFSYNC */
r = s->rule.ptr;
@@ -6160,7 +6160,7 @@ pf_test6(int dir, struct ifnet *ifp, struct mbuf **m0,
action = pf_test_state_icmp(&s, dir, kif,
m, off, h, &pd, &reason);
if (action == PF_PASS) {
-#if NPFSYNC
+#if NPFSYNC > 0
pfsync_update_state(s);
#endif /* NPFSYNC */
r = s->rule.ptr;
@@ -6175,7 +6175,7 @@ pf_test6(int dir, struct ifnet *ifp, struct mbuf **m0,
default:
action = pf_test_state_other(&s, dir, kif, m, &pd);
if (action == PF_PASS) {
-#if NPFSYNC
+#if NPFSYNC > 0
pfsync_update_state(s);
#endif /* NPFSYNC */
r = s->rule.ptr;
diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c
index 4c1e18c89d6..5f0c35be052 100644
--- a/sys/net/pf_ioctl.c
+++ b/sys/net/pf_ioctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf_ioctl.c,v 1.209 2008/06/29 08:42:15 mcbride Exp $ */
+/* $OpenBSD: pf_ioctl.c,v 1.210 2008/10/23 22:22:44 deraadt Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -1489,7 +1489,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
if (!psk->psk_ifname[0] || !strcmp(psk->psk_ifname,
s->kif->pfik_name)) {
-#if NPFSYNC
+#if NPFSYNC > 0
/* don't send out individual delete messages */
s->sync_flags = PFSTATE_NOSYNC;
#endif
@@ -1498,7 +1498,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
}
}
psk->psk_killed = killed;
-#if NPFSYNC
+#if NPFSYNC > 0
pfsync_clear_states(pf_status.hostid, psk->psk_ifname);
#endif
break;
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index c7339429059..7193c57f97a 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in_pcb.c,v 1.102 2008/07/29 21:46:27 deraadt Exp $ */
+/* $OpenBSD: in_pcb.c,v 1.103 2008/10/23 22:22:44 deraadt Exp $ */
/* $NetBSD: in_pcb.c,v 1.25 1996/02/13 23:41:53 christos Exp $ */
/*
@@ -1015,7 +1015,7 @@ in_pcblookup_listen(struct inpcbtable *table, struct in_addr laddr,
struct inpcb *inp;
u_int16_t lport = lport_arg;
-#if NPF
+#if NPF > 0
if (m && m->m_pkthdr.pf.flags & PF_TAG_DIVERTED) {
struct pf_divert *divert;
@@ -1085,7 +1085,7 @@ in6_pcblookup_listen(struct inpcbtable *table, struct in6_addr *laddr,
struct inpcb *inp;
u_int16_t lport = lport_arg;
-#if NPF
+#if NPF > 0
if (m && m->m_pkthdr.pf.flags & PF_TAG_DIVERTED) {
struct pf_divert *divert;
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c
index b625773d447..032b83e0a27 100644
--- a/sys/netinet/raw_ip.c
+++ b/sys/netinet/raw_ip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: raw_ip.c,v 1.45 2008/06/14 02:17:27 jsing Exp $ */
+/* $OpenBSD: raw_ip.c,v 1.46 2008/10/23 22:22:44 deraadt Exp $ */
/* $NetBSD: raw_ip.c,v 1.25 1996/02/18 18:58:33 christos Exp $ */
/*
@@ -134,7 +134,7 @@ rip_input(struct mbuf *m, ...)
#endif
if (inp->inp_ip.ip_p && inp->inp_ip.ip_p != ip->ip_p)
continue;
-#if NPF
+#if NPF > 0
if (m->m_pkthdr.pf.flags & PF_TAG_DIVERTED) {
struct pf_divert *divert;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 03:42:35 +0000