diff options
| -rw-r--r-- | sys/net/pf.c | 9 | ||||
| -rw-r--r-- | sys/net/pf_ioctl.c | 8 | ||||
| -rw-r--r-- | sys/net/pfvar.h | 4 |
3 files changed, 11 insertions, 10 deletions
diff --git a/sys/net/pf.c b/sys/net/pf.c index 2e6176a8447..8f9119458ff 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.577 2008/05/29 01:00:53 mcbride Exp $ */ +/* $OpenBSD: pf.c,v 1.578 2008/05/30 14:22:48 henning Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -2945,7 +2945,8 @@ pf_tcp_iss(struct pf_pdesc *pd) if (pf_tcp_secret_init == 0) { arc4random_bytes(pf_tcp_secret, sizeof(pf_tcp_secret)); MD5Init(&pf_tcp_secret_ctx); - MD5Update(&pf_tcp_secret_ctx, pf_tcp_secret, sizeof(pf_tcp_secret)); + MD5Update(&pf_tcp_secret_ctx, pf_tcp_secret, + sizeof(pf_tcp_secret)); pf_tcp_secret_init = 1; } ctx = pf_tcp_secret_ctx; @@ -5147,13 +5148,13 @@ pf_route(struct mbuf **m, struct pf_rule *r, int dir, struct ifnet *oifp, if (!(ifp->if_capabilities & IFCAP_CSUM_TCPv4) || ifp->if_bridge != NULL) { in_delayed_cksum(m0); - m0->m_pkthdr.csum_flags &= ~M_TCPV4_CSUM_OUT; /* Clear */ + m0->m_pkthdr.csum_flags &= ~M_TCPV4_CSUM_OUT; /* Clr */ } } else if (m0->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT) { if (!(ifp->if_capabilities & IFCAP_CSUM_UDPv4) || ifp->if_bridge != NULL) { in_delayed_cksum(m0); - m0->m_pkthdr.csum_flags &= ~M_UDPV4_CSUM_OUT; /* Clear */ + m0->m_pkthdr.csum_flags &= ~M_UDPV4_CSUM_OUT; /* Clr */ } } diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c index e4b6f11529b..ff1dc003a83 100644 --- a/sys/net/pf_ioctl.c +++ b/sys/net/pf_ioctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_ioctl.c,v 1.199 2008/05/29 01:00:53 mcbride Exp $ */ +/* $OpenBSD: pf_ioctl.c,v 1.200 2008/05/30 14:22:48 henning Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -150,7 +150,7 @@ pfattach(int num) NULL); pool_init(&pf_state_key_pl, sizeof(struct pf_state_key), 0, 0, 0, "pfstatekeypl", NULL); - pool_init(&pf_state_item_pl, sizeof(struct pf_state_item), 0, 0, 0, + pool_init(&pf_state_item_pl, sizeof(struct pf_state_item), 0, 0, 0, "pfstateitempl", NULL); pool_init(&pf_altq_pl, sizeof(struct pf_altq), 0, 0, 0, "pfaltqpl", &pool_allocator_nointr); @@ -845,7 +845,7 @@ pf_commit_rules(u_int32_t ticket, int rs_num, char *anchor) } void -pf_state_export(struct pfsync_state *sp, struct pf_state *s) +pf_state_export(struct pfsync_state *sp, struct pf_state *s) { int secs = time_second; bzero(sp, sizeof(struct pfsync_state)); @@ -898,7 +898,7 @@ pf_state_export(struct pfsync_state *sp, struct pf_state *s) void pf_state_import(struct pfsync_state *sp, struct pf_state_key *skw, - struct pf_state_key *sks, struct pf_state *s) + struct pf_state_key *sks, struct pf_state *s) { /* copy to state key(s) */ skw->addr[0] = sp->key[PF_SK_WIRE].addr[0]; diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 256307832a5..8daa0b0918e 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pfvar.h,v 1.269 2008/05/29 01:00:53 mcbride Exp $ */ +/* $OpenBSD: pfvar.h,v 1.270 2008/05/30 14:22:48 henning Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1070,7 +1070,7 @@ struct pf_pdesc { } hdr; struct pf_rule *nat_rule; /* nat/rdr rule applied to packet */ - struct ether_header + struct ether_header *eh; struct pf_addr *src; /* src address */ struct pf_addr *dst; /* dst address */ |