Sun Mar 15 22:16:09 2009 UTC ()
ansify function definitions


(cegger)
diff -r1.57 -r1.58 src/sys/netinet/ip_flow.c
cvs diff -r1.57 -r1.58 src/sys/netinet/ip_flow.c (expand / switch to unified diff)

--- src/sys/netinet/ip_flow.c 2009/02/01 17:04:11 1.57
+++ src/sys/netinet/ip_flow.c 2009/03/15 22:16:09 1.58
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: ip_flow.c,v 1.57 2009/02/01 17:04:11 pooka Exp $ */ 1/* $NetBSD: ip_flow.c,v 1.58 2009/03/15 22:16:09 cegger Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1998 The NetBSD Foundation, Inc. 4 * Copyright (c) 1998 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by the 3am Software Foundry ("3am"). It was developed by Matt Thomas. 8 * by the 3am Software Foundry ("3am"). It was developed by Matt Thomas.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -20,27 +20,27 @@ @@ -20,27 +20,27 @@
20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33__KERNEL_RCSID(0, "$NetBSD: ip_flow.c,v 1.57 2009/02/01 17:04:11 pooka Exp $"); 33__KERNEL_RCSID(0, "$NetBSD: ip_flow.c,v 1.58 2009/03/15 22:16:09 cegger Exp $");
34 34
35#include <sys/param.h> 35#include <sys/param.h>
36#include <sys/systm.h> 36#include <sys/systm.h>
37#include <sys/malloc.h> 37#include <sys/malloc.h>
38#include <sys/mbuf.h> 38#include <sys/mbuf.h>
39#include <sys/domain.h> 39#include <sys/domain.h>
40#include <sys/protosw.h> 40#include <sys/protosw.h>
41#include <sys/socket.h> 41#include <sys/socket.h>
42#include <sys/socketvar.h> 42#include <sys/socketvar.h>
43#include <sys/errno.h> 43#include <sys/errno.h>
44#include <sys/time.h> 44#include <sys/time.h>
45#include <sys/kernel.h> 45#include <sys/kernel.h>
46#include <sys/pool.h> 46#include <sys/pool.h>
@@ -131,27 +131,27 @@ ipflow_lookup(const struct ip *ip) @@ -131,27 +131,27 @@ ipflow_lookup(const struct ip *ip)
131 131
132 hash = ipflow_hash(ip); 132 hash = ipflow_hash(ip);
133 133
134 LIST_FOREACH(ipf, &ipflowtable[hash], ipf_hash) { 134 LIST_FOREACH(ipf, &ipflowtable[hash], ipf_hash) {
135 if (ip->ip_dst.s_addr == ipf->ipf_dst.s_addr 135 if (ip->ip_dst.s_addr == ipf->ipf_dst.s_addr
136 && ip->ip_src.s_addr == ipf->ipf_src.s_addr 136 && ip->ip_src.s_addr == ipf->ipf_src.s_addr
137 && ip->ip_tos == ipf->ipf_tos) 137 && ip->ip_tos == ipf->ipf_tos)
138 break; 138 break;
139 } 139 }
140 return ipf; 140 return ipf;
141} 141}
142 142
143void 143void
144ipflow_poolinit() 144ipflow_poolinit(void)
145{ 145{
146 146
147 pool_init(&ipflow_pool, sizeof(struct ipflow), 0, 0, 0, "ipflowpl", 147 pool_init(&ipflow_pool, sizeof(struct ipflow), 0, 0, 0, "ipflowpl",
148 NULL, IPL_NET); 148 NULL, IPL_NET);
149} 149}
150 150
151int 151int
152ipflow_init(int table_size) 152ipflow_init(int table_size)
153{ 153{
154 struct ipflowhead *new_table; 154 struct ipflowhead *new_table;
155 size_t i; 155 size_t i;
156 156
157 new_table = (struct ipflowhead *)malloc(sizeof(struct ipflowhead) * 157 new_table = (struct ipflowhead *)malloc(sizeof(struct ipflowhead) *