summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/net/if_bridge.c20
-rw-r--r--sys/net/if_ethersubr.c4
-rw-r--r--sys/net/pf.c10
-rw-r--r--sys/net/pfkey.c6
-rw-r--r--sys/net/pfkeyv2.c236
-rw-r--r--sys/net/pfkeyv2.h10
-rw-r--r--sys/net/pfkeyv2_convert.c4
-rw-r--r--sys/net/pfkeyv2_parsemessage.c28
-rw-r--r--sys/net/rtsock.c4
9 files changed, 163 insertions, 159 deletions
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index d4a2816710c..b282efcf1d1 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bridge.c,v 1.109 2003/01/07 17:47:21 jason Exp $ */
+/* $OpenBSD: if_bridge.c,v 1.110 2003/02/16 21:30:13 deraadt Exp $ */
/*
* Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -1696,7 +1696,7 @@ fail:
a -= b; a -= c; a ^= (c >> 3); \
b -= c; b -= a; b ^= (a << 10); \
c -= a; c -= b; c ^= (b >> 15); \
- } while(0)
+ } while (0)
u_int32_t
bridge_hash(sc, addr)
@@ -2522,10 +2522,10 @@ bridge_fragment(sc, ifp, eh, m)
m->m_pkthdr.len < (LLC_SNAPFRAMELEN +
sizeof(struct ether_header)))
goto dropit;
-
+
m_copydata(m, sizeof(struct ether_header),
LLC_SNAPFRAMELEN, (caddr_t)&llc);
-
+
if (llc.llc_dsap != LLC_SNAP_LSAP ||
llc.llc_ssap != LLC_SNAP_LSAP ||
llc.llc_control != LLC_UI ||
@@ -2534,10 +2534,10 @@ bridge_fragment(sc, ifp, eh, m)
llc.llc_snap.org_code[2] ||
llc.llc_snap.ether_type != htons(ETHERTYPE_IP))
goto dropit;
-
+
hassnap = 1;
}
-
+
m_adj(m, sizeof(struct ether_header));
if (hassnap)
m_adj(m, LLC_SNAPFRAMELEN);
@@ -2590,12 +2590,12 @@ bridge_fragment(sc, ifp, eh, m)
} else
m_freem(m);
}
-
+
if (error == 0)
ipstat.ips_fragmented++;
-
+
return;
-#endif /* INET */
+#endif /* INET */
dropit:
if (m != NULL)
m_freem(m);
@@ -2629,7 +2629,7 @@ bridge_ifenqueue(sc, ifp, m)
}
#ifdef INET
-void
+void
bridge_send_icmp_err(sc, ifp, eh, n, hassnap, llc, type, code)
struct bridge_softc *sc;
struct ifnet *ifp;
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 70b5c4e2207..b1071eae590 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ethersubr.c,v 1.67 2003/01/07 09:00:33 kjc Exp $ */
+/* $OpenBSD: if_ethersubr.c,v 1.68 2003/02/16 21:30:13 deraadt Exp $ */
/* $NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $ */
/*
@@ -835,7 +835,7 @@ decapsulate:
case LLC_XID:
case LLC_XID_P:
- if(m->m_len < ETHER_ADDR_LEN)
+ if (m->m_len < ETHER_ADDR_LEN)
goto dropanyway;
l->llc_window = 0;
l->llc_fid = 9;
diff --git a/sys/net/pf.c b/sys/net/pf.c
index af5e23f582e..61faaabff11 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf.c,v 1.320 2003/02/12 14:41:07 jason Exp $ */
+/* $OpenBSD: pf.c,v 1.321 2003/02/16 21:30:13 deraadt Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -352,7 +352,7 @@ pf_state_compare(struct pf_tree_node *a, struct pf_tree_node *b)
void
pf_addrcpy(struct pf_addr *dst, struct pf_addr *src, sa_family_t af)
{
- switch(af) {
+ switch (af) {
#ifdef INET
case AF_INET:
dst->addr32[0] = src->addr32[0];
@@ -643,7 +643,7 @@ pf_dynaddr_copyout(struct pf_addr_wrap *aw)
void
pf_print_host(struct pf_addr *addr, u_int16_t p, sa_family_t af)
{
- switch(af) {
+ switch (af) {
#ifdef INET
case AF_INET: {
u_int32_t a = ntohl(addr->addr32[0]);
@@ -1408,7 +1408,7 @@ pf_addr_inc(struct pf_addr *addr, u_int8_t af)
a -= b; a -= c; a ^= (c >> 3); \
b -= c; b -= a; b ^= (a << 10); \
c -= a; c -= b; c ^= (b >> 15); \
- } while(0)
+ } while (0)
/*
* hash function based on bridge_hash in if_bridge.c
@@ -1719,7 +1719,7 @@ pf_get_translation(int direction, struct ifnet *ifp, u_int8_t proto,
break;
case PF_NAT:
if (pf_get_sport(af, proto, &r->rpool, saddr, daddr,
- dport, naddr, nport, r->rpool.proxy_port[0],
+ dport, naddr, nport, r->rpool.proxy_port[0],
r->rpool.proxy_port[1])) {
DPFPRINTF(PF_DEBUG_MISC,
("pf: NAT proxy port allocation "
diff --git a/sys/net/pfkey.c b/sys/net/pfkey.c
index 628c0028b67..7a0a6d70fa1 100644
--- a/sys/net/pfkey.c
+++ b/sys/net/pfkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pfkey.c,v 1.13 2003/02/16 19:54:20 jason Exp $ */
+/* $OpenBSD: pfkey.c,v 1.14 2003/02/16 21:30:13 deraadt Exp $ */
/*
* @(#)COPYRIGHT 1.1 (NRL) 17 January 1995
@@ -254,7 +254,7 @@ pfkey_usrreq(struct socket *socket, int req, struct mbuf *mbuf,
!pfkey_versions[socket->so_proto->pr_protocol])
return (EPROTONOSUPPORT);
- switch(req) {
+ switch (req) {
case PRU_ATTACH:
return (pfkey_attach(socket, nam));
@@ -303,7 +303,7 @@ static struct protosw pfkey_protosw_template = {
int
pfkey_buildprotosw(void)
-{
+{
struct protosw *protosw, *p;
int i, j;
diff --git a/sys/net/pfkeyv2.c b/sys/net/pfkeyv2.c
index b8bc47c8d0f..8b6d0676fa6 100644
--- a/sys/net/pfkeyv2.c
+++ b/sys/net/pfkeyv2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pfkeyv2.c,v 1.86 2003/02/16 19:54:20 jason Exp $ */
+/* $OpenBSD: pfkeyv2.c,v 1.87 2003/02/16 21:30:13 deraadt Exp $ */
/*
* @(#)COPYRIGHT 1.1 (NRL) 17 January 1995
@@ -227,103 +227,103 @@ pfkeyv2_sendmessage(void **headers, int mode, struct socket *socket,
j, &packet)) != 0)
goto ret;
- switch(mode) {
- case PFKEYV2_SENDMESSAGE_UNICAST:
- /*
- * Send message to the specified socket, plus all
- * promiscuous listeners.
- */
- pfkey_sendup(socket, packet, 0);
-
- /*
- * Promiscuous messages contain the original message
- * encapsulated in another sadb_msg header.
- */
- bzero(buffer, sizeof(struct sadb_msg));
- smsg = (struct sadb_msg *) buffer;
- smsg->sadb_msg_version = PF_KEY_V2;
- smsg->sadb_msg_type = SADB_X_PROMISC;
- smsg->sadb_msg_len = (sizeof(struct sadb_msg) + j) /
- sizeof(uint64_t);
- smsg->sadb_msg_seq = 0;
-
- /* Copy to mbuf chain */
- if ((rval = pfdatatopacket(buffer, sizeof(struct sadb_msg) + j,
- &packet)) != 0)
- goto ret;
-
- /*
- * Search for promiscuous listeners, skipping the
- * original destination.
- */
- for (s = pfkeyv2_sockets; s; s = s->next)
- if ((s->flags & PFKEYV2_SOCKETFLAGS_PROMISC) &&
- (s->socket != socket))
- pfkey_sendup(s->socket, packet, 1);
-
- /* Done, let's be a bit paranoid */
- m_zero(packet);
- m_freem(packet);
- break;
-
- case PFKEYV2_SENDMESSAGE_REGISTERED:
- /*
- * Send the message to all registered sockets that match
- * the specified satype (e.g., all IPSEC-ESP negotiators)
- */
- for (s = pfkeyv2_sockets; s; s = s->next)
- if (s->flags & PFKEYV2_SOCKETFLAGS_REGISTERED) {
- if (!satype) /* Just send to everyone registered */
- pfkey_sendup(s->socket, packet, 1);
- else {
- /* Check for specified satype */
- if ((1 << satype) & s->registration)
- pfkey_sendup(s->socket, packet, 1);
- }
- }
-
- /* Free last/original copy of the packet */
- m_freem(packet);
-
- /* Encapsulate the original message "inside" an sadb_msg header */
- bzero(buffer, sizeof(struct sadb_msg));
- smsg = (struct sadb_msg *) buffer;
- smsg->sadb_msg_version = PF_KEY_V2;
- smsg->sadb_msg_type = SADB_X_PROMISC;
- smsg->sadb_msg_len = (sizeof(struct sadb_msg) + j) /
- sizeof(uint64_t);
- smsg->sadb_msg_seq = 0;
-
- /* Convert to mbuf chain */
- if ((rval = pfdatatopacket(buffer, sizeof(struct sadb_msg) + j,
- &packet)) != 0)
- goto ret;
-
- /* Send to all registered promiscuous listeners */
- for (s = pfkeyv2_sockets; s; s = s->next)
- if ((s->flags & PFKEYV2_SOCKETFLAGS_PROMISC) &&
- !(s->flags & PFKEYV2_SOCKETFLAGS_REGISTERED))
- pfkey_sendup(s->socket, packet, 1);
-
- m_freem(packet);
- break;
-
- case PFKEYV2_SENDMESSAGE_BROADCAST:
- /* Send message to all sockets */
- for (s = pfkeyv2_sockets; s; s = s->next)
- pfkey_sendup(s->socket, packet, 1);
-
- m_freem(packet);
- break;
- }
+ switch (mode) {
+ case PFKEYV2_SENDMESSAGE_UNICAST:
+ /*
+ * Send message to the specified socket, plus all
+ * promiscuous listeners.
+ */
+ pfkey_sendup(socket, packet, 0);
+
+ /*
+ * Promiscuous messages contain the original message
+ * encapsulated in another sadb_msg header.
+ */
+ bzero(buffer, sizeof(struct sadb_msg));
+ smsg = (struct sadb_msg *) buffer;
+ smsg->sadb_msg_version = PF_KEY_V2;
+ smsg->sadb_msg_type = SADB_X_PROMISC;
+ smsg->sadb_msg_len = (sizeof(struct sadb_msg) + j) /
+ sizeof(uint64_t);
+ smsg->sadb_msg_seq = 0;
+
+ /* Copy to mbuf chain */
+ if ((rval = pfdatatopacket(buffer, sizeof(struct sadb_msg) + j,
+ &packet)) != 0)
+ goto ret;
+
+ /*
+ * Search for promiscuous listeners, skipping the
+ * original destination.
+ */
+ for (s = pfkeyv2_sockets; s; s = s->next)
+ if ((s->flags & PFKEYV2_SOCKETFLAGS_PROMISC) &&
+ (s->socket != socket))
+ pfkey_sendup(s->socket, packet, 1);
+
+ /* Done, let's be a bit paranoid */
+ m_zero(packet);
+ m_freem(packet);
+ break;
+
+ case PFKEYV2_SENDMESSAGE_REGISTERED:
+ /*
+ * Send the message to all registered sockets that match
+ * the specified satype (e.g., all IPSEC-ESP negotiators)
+ */
+ for (s = pfkeyv2_sockets; s; s = s->next)
+ if (s->flags & PFKEYV2_SOCKETFLAGS_REGISTERED) {
+ if (!satype) /* Just send to everyone registered */
+ pfkey_sendup(s->socket, packet, 1);
+ else {
+ /* Check for specified satype */
+ if ((1 << satype) & s->registration)
+ pfkey_sendup(s->socket, packet, 1);
+ }
+ }
+
+ /* Free last/original copy of the packet */
+ m_freem(packet);
+
+ /* Encapsulate the original message "inside" an sadb_msg header */
+ bzero(buffer, sizeof(struct sadb_msg));
+ smsg = (struct sadb_msg *) buffer;
+ smsg->sadb_msg_version = PF_KEY_V2;
+ smsg->sadb_msg_type = SADB_X_PROMISC;
+ smsg->sadb_msg_len = (sizeof(struct sadb_msg) + j) /
+ sizeof(uint64_t);
+ smsg->sadb_msg_seq = 0;
+
+ /* Convert to mbuf chain */
+ if ((rval = pfdatatopacket(buffer, sizeof(struct sadb_msg) + j,
+ &packet)) != 0)
+ goto ret;
+
+ /* Send to all registered promiscuous listeners */
+ for (s = pfkeyv2_sockets; s; s = s->next)
+ if ((s->flags & PFKEYV2_SOCKETFLAGS_PROMISC) &&
+ !(s->flags & PFKEYV2_SOCKETFLAGS_REGISTERED))
+ pfkey_sendup(s->socket, packet, 1);
+
+ m_freem(packet);
+ break;
+
+ case PFKEYV2_SENDMESSAGE_BROADCAST:
+ /* Send message to all sockets */
+ for (s = pfkeyv2_sockets; s; s = s->next)
+ pfkey_sendup(s->socket, packet, 1);
+
+ m_freem(packet);
+ break;
+ }
ret:
- if (buffer != NULL) {
- bzero(buffer, j + sizeof(struct sadb_msg));
- free(buffer, M_PFKEY);
- }
+ if (buffer != NULL) {
+ bzero(buffer, j + sizeof(struct sadb_msg));
+ free(buffer, M_PFKEY);
+ }
- return (rval);
+ return (rval);
}
/*
@@ -833,7 +833,7 @@ pfkeyv2_send(struct socket *socket, void *message, int len)
goto ret;
smsg = (struct sadb_msg *) headers[0];
- switch(smsg->sadb_msg_type) {
+ switch (smsg->sadb_msg_type) {
case SADB_GETSPI: /* Reserve an SPI */
bzero(&sa, sizeof(struct tdb));
@@ -878,17 +878,17 @@ pfkeyv2_send(struct socket *socket, void *message, int len)
/* Either all or none of the flow must be included */
if ((headers[SADB_X_EXT_SRC_FLOW] ||
- headers[SADB_X_EXT_PROTOCOL] ||
- headers[SADB_X_EXT_FLOW_TYPE] ||
- headers[SADB_X_EXT_DST_FLOW] ||
- headers[SADB_X_EXT_SRC_MASK] ||
- headers[SADB_X_EXT_DST_MASK]) &&
- !(headers[SADB_X_EXT_SRC_FLOW] &&
- headers[SADB_X_EXT_PROTOCOL] &&
- headers[SADB_X_EXT_FLOW_TYPE] &&
- headers[SADB_X_EXT_DST_FLOW] &&
- headers[SADB_X_EXT_SRC_MASK] &&
- headers[SADB_X_EXT_DST_MASK])) {
+ headers[SADB_X_EXT_PROTOCOL] ||
+ headers[SADB_X_EXT_FLOW_TYPE] ||
+ headers[SADB_X_EXT_DST_FLOW] ||
+ headers[SADB_X_EXT_SRC_MASK] ||
+ headers[SADB_X_EXT_DST_MASK]) &&
+ !(headers[SADB_X_EXT_SRC_FLOW] &&
+ headers[SADB_X_EXT_PROTOCOL] &&
+ headers[SADB_X_EXT_FLOW_TYPE] &&
+ headers[SADB_X_EXT_DST_FLOW] &&
+ headers[SADB_X_EXT_SRC_MASK] &&
+ headers[SADB_X_EXT_DST_MASK])) {
rval = EINVAL;
goto ret;
}
@@ -1018,17 +1018,17 @@ pfkeyv2_send(struct socket *socket, void *message, int len)
/* Either all or none of the flow must be included */
if ((headers[SADB_X_EXT_SRC_FLOW] ||
- headers[SADB_X_EXT_PROTOCOL] ||
- headers[SADB_X_EXT_FLOW_TYPE] ||
- headers[SADB_X_EXT_DST_FLOW] ||
- headers[SADB_X_EXT_SRC_MASK] ||
- headers[SADB_X_EXT_DST_MASK]) &&
+ headers[SADB_X_EXT_PROTOCOL] ||
+ headers[SADB_X_EXT_FLOW_TYPE] ||
+ headers[SADB_X_EXT_DST_FLOW] ||
+ headers[SADB_X_EXT_SRC_MASK] ||
+ headers[SADB_X_EXT_DST_MASK]) &&
!(headers[SADB_X_EXT_SRC_FLOW] &&
- headers[SADB_X_EXT_PROTOCOL] &&
- headers[SADB_X_EXT_FLOW_TYPE] &&
- headers[SADB_X_EXT_DST_FLOW] &&
- headers[SADB_X_EXT_SRC_MASK] &&
- headers[SADB_X_EXT_DST_MASK])) {
+ headers[SADB_X_EXT_PROTOCOL] &&
+ headers[SADB_X_EXT_FLOW_TYPE] &&
+ headers[SADB_X_EXT_DST_FLOW] &&
+ headers[SADB_X_EXT_SRC_MASK] &&
+ headers[SADB_X_EXT_DST_MASK])) {
rval = EINVAL;
goto ret;
}
@@ -1265,7 +1265,7 @@ pfkeyv2_send(struct socket *socket, void *message, int len)
case SADB_FLUSH:
rval = 0;
- switch(smsg->sadb_msg_satype) {
+ switch (smsg->sadb_msg_satype) {
case SADB_SATYPE_UNSPEC:
s = spltdb();
diff --git a/sys/net/pfkeyv2.h b/sys/net/pfkeyv2.h
index 7deaefa3915..2f307331318 100644
--- a/sys/net/pfkeyv2.h
+++ b/sys/net/pfkeyv2.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pfkeyv2.h,v 1.45 2003/02/16 19:54:20 jason Exp $ */
+/* $OpenBSD: pfkeyv2.h,v 1.46 2003/02/16 21:30:13 deraadt Exp $ */
/*
* @(#)COPYRIGHT 1.1 (NRL) January 1998
*
@@ -206,10 +206,10 @@ struct sadb_x_cred {
};
#ifdef _KERNEL
-#define SADB_X_GETSPROTO(x) ( (x) == SADB_SATYPE_AH ? IPPROTO_AH :\
- (x) == SADB_SATYPE_ESP ? IPPROTO_ESP :\
- (x) == SADB_X_SATYPE_IPCOMP ? IPPROTO_IPCOMP:\
- IPPROTO_IPIP )
+#define SADB_X_GETSPROTO(x) \
+ ( (x) == SADB_SATYPE_AH ? IPPROTO_AH :\
+ (x) == SADB_SATYPE_ESP ? IPPROTO_ESP :\
+ (x) == SADB_X_SATYPE_IPCOMP ? IPPROTO_IPCOMP: IPPROTO_IPIP )
#endif
#define SADB_EXT_RESERVED 0
diff --git a/sys/net/pfkeyv2_convert.c b/sys/net/pfkeyv2_convert.c
index fefb11a37b1..8c4e286f364 100644
--- a/sys/net/pfkeyv2_convert.c
+++ b/sys/net/pfkeyv2_convert.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pfkeyv2_convert.c,v 1.13 2003/02/15 22:57:59 jason Exp $ */
+/* $OpenBSD: pfkeyv2_convert.c,v 1.14 2003/02/16 21:30:13 deraadt Exp $ */
/*
* The author of this code is Angelos D. Keromytis (angelos@keromytis.org)
*
@@ -495,7 +495,7 @@ import_address(struct sockaddr *sa, struct sadb_address *sadb_address)
if (ssa->sa_len)
salen = ssa->sa_len;
else
- switch(ssa->sa_family) {
+ switch (ssa->sa_family) {
#ifdef INET
case AF_INET:
salen = sizeof(struct sockaddr_in);
diff --git a/sys/net/pfkeyv2_parsemessage.c b/sys/net/pfkeyv2_parsemessage.c
index c1cc516bc30..2659832b0d8 100644
--- a/sys/net/pfkeyv2_parsemessage.c
+++ b/sys/net/pfkeyv2_parsemessage.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pfkeyv2_parsemessage.c,v 1.35 2003/02/16 19:54:20 jason Exp $ */
+/* $OpenBSD: pfkeyv2_parsemessage.c,v 1.36 2003/02/16 21:30:13 deraadt Exp $ */
/*
* @(#)COPYRIGHT 1.1 (NRL) 17 January 1995
@@ -491,7 +491,7 @@ pfkeyv2_parsemessage(void *p, int len, void **headers)
return (EINVAL);
}
- switch(sa->sa_family) {
+ switch (sa->sa_family) {
case AF_INET:
if (sizeof(struct sadb_address) +
PADUP(sizeof(struct sockaddr_in)) != i) {
@@ -518,7 +518,7 @@ pfkeyv2_parsemessage(void *p, int len, void **headers)
case SADB_X_EXT_SRC_FLOW:
case SADB_X_EXT_DST_FLOW:
break;
-
+
default:
if (((struct sockaddr_in *)sa)->sin_port) {
DPRINTF(("pfkeyv2_parsemessage"
@@ -583,7 +583,7 @@ pfkeyv2_parsemessage(void *p, int len, void **headers)
case SADB_X_EXT_SRC_FLOW:
case SADB_X_EXT_DST_FLOW:
break;
-
+
default:
if (((struct sockaddr_in6 *)sa)->sin6_port) {
DPRINTF(("pfkeyv2_parsemessage"
@@ -656,7 +656,7 @@ pfkeyv2_parsemessage(void *p, int len, void **headers)
if (sadb_cred->sadb_x_cred_type > SADB_X_AUTHTYPE_MAX) {
DPRINTF(("pfkeyv2_parsemessage: unknown auth "
"type %d in AUTH extension header %d\n",
- sadb_cred->sadb_x_cred_type,
+ sadb_cred->sadb_x_cred_type,
sadb_ext->sadb_ext_type));
return (EINVAL);
}
@@ -806,8 +806,9 @@ pfkeyv2_parsemessage(void *p, int len, void **headers)
int j;
for (j = 0;
- j < (i - sizeof(struct sadb_prop))/sizeof(struct sadb_comb);
- j++) {
+ j < (i - sizeof(struct sadb_prop))/
+ sizeof(struct sadb_comb);
+ j++) {
if (sadb_comb->sadb_comb_auth >
SADB_AALG_MAX) {
DPRINTF(("pfkeyv2_parsemessage"
@@ -866,11 +867,14 @@ pfkeyv2_parsemessage(void *p, int len, void **headers)
sizeof(struct sadb_supported));
int max_alg;
- max_alg = sadb_ext->sadb_ext_type == SADB_EXT_SUPPORTED_AUTH ?
+ max_alg = sadb_ext->sadb_ext_type ==
+ SADB_EXT_SUPPORTED_AUTH ?
SADB_AALG_MAX : SADB_EXT_SUPPORTED_ENCRYPT ?
- SADB_EALG_MAX : SADB_X_CALG_MAX;
+ SADB_EALG_MAX : SADB_X_CALG_MAX;
- for (j = 0; j < sadb_supported->sadb_supported_len - 1; j++) {
+ for (j = 0;
+ j < sadb_supported->sadb_supported_len - 1;
+ j++) {
if (sadb_alg->sadb_alg_id > max_alg) {
DPRINTF(("pfkeyv2_parsemessage"
": unknown algorithm %d "
@@ -921,7 +925,7 @@ pfkeyv2_parsemessage(void *p, int len, void **headers)
sadb_ext->sadb_ext_type));
return (EINVAL);
}
-
+
headers[sadb_ext->sadb_ext_type] = p;
p += i;
left -= i;
@@ -944,7 +948,7 @@ pfkeyv2_parsemessage(void *p, int len, void **headers)
}
}
- switch(((struct sadb_msg *)headers[0])->sadb_msg_type) {
+ switch (((struct sadb_msg *)headers[0])->sadb_msg_type) {
case SADB_UPDATE:
if (((struct sadb_sa *)headers[SADB_EXT_SA])->sadb_sa_state !=
SADB_SASTATE_MATURE) {
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 03c5192ef65..10b9cc5fbf2 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rtsock.c,v 1.25 2002/12/31 02:30:10 itojun Exp $ */
+/* $OpenBSD: rtsock.c,v 1.26 2003/02/16 21:30:13 deraadt Exp $ */
/* $NetBSD: rtsock.c,v 1.18 1996/03/29 00:32:10 cgd Exp $ */
/*
@@ -277,7 +277,7 @@ route_output(struct mbuf *m, ...)
rt = (struct rtentry *)rn;
rt->rt_refcnt++;
- switch(rtm->rtm_type) {
+ switch (rtm->rtm_type) {
case RTM_GET:
report:
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 21:28:06 +0000