diff options
| -rw-r--r-- | sys/net/pf.c | 10 | ||||
| -rw-r--r-- | sys/net/pfvar.h | 4 | ||||
| -rw-r--r-- | sys/net/route.c | 4 | ||||
| -rw-r--r-- | sys/net/route.h | 4 | ||||
| -rw-r--r-- | sys/netinet/ip_input.c | 7 | ||||
| -rw-r--r-- | sys/netinet6/ip6_forward.c | 6 | ||||
| -rw-r--r-- | sys/netinet6/ip6_input.c | 7 |
7 files changed, 22 insertions, 20 deletions
diff --git a/sys/net/pf.c b/sys/net/pf.c index f49d9288271..2c68a807512 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.647 2009/04/30 12:54:32 henning Exp $ */ +/* $OpenBSD: pf.c,v 1.648 2009/05/18 20:37:13 bluhm Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -154,9 +154,9 @@ void pf_send_tcp(const struct pf_rule *, sa_family_t, u_int16_t, u_int16_t, u_int32_t, u_int32_t, u_int8_t, u_int16_t, u_int16_t, u_int8_t, int, u_int16_t, struct ether_header *, struct ifnet *, - u_int); + int); void pf_send_icmp(struct mbuf *, u_int8_t, u_int8_t, - sa_family_t, struct pf_rule *, u_int); + sa_family_t, struct pf_rule *, int); void pf_detach_state(struct pf_state *); void pf_state_key_detach(struct pf_state *, int); u_int32_t pf_tcp_iss(struct pf_pdesc *); @@ -1878,7 +1878,7 @@ pf_send_tcp(const struct pf_rule *r, sa_family_t af, const struct pf_addr *saddr, const struct pf_addr *daddr, u_int16_t sport, u_int16_t dport, u_int32_t seq, u_int32_t ack, u_int8_t flags, u_int16_t win, u_int16_t mss, u_int8_t ttl, int tag, - u_int16_t rtag, struct ether_header *eh, struct ifnet *ifp, u_int rtableid) + u_int16_t rtag, struct ether_header *eh, struct ifnet *ifp, int rtableid) { struct mbuf *m; int len, tlen; @@ -2032,7 +2032,7 @@ pf_send_tcp(const struct pf_rule *r, sa_family_t af, void pf_send_icmp(struct mbuf *m, u_int8_t type, u_int8_t code, sa_family_t af, - struct pf_rule *r, u_int rtableid) + struct pf_rule *r, int rtableid) { struct mbuf *m0; diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 9952de3cf69..d60d52983c4 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pfvar.h,v 1.285 2009/04/06 12:05:55 henning Exp $ */ +/* $OpenBSD: pfvar.h,v 1.286 2009/05/18 20:37:13 bluhm Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -796,7 +796,7 @@ struct pf_state { /* XXX */ u_int8_t sync_updates; - int16_t rtableid; + int rtableid; u_int8_t min_ttl; u_int8_t set_tos; u_int16_t max_mss; diff --git a/sys/net/route.c b/sys/net/route.c index 4cfa782c63a..ae49455f943 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -1,4 +1,4 @@ -/* $OpenBSD: route.c,v 1.105 2009/03/15 19:40:41 miod Exp $ */ +/* $OpenBSD: route.c,v 1.106 2009/05/18 20:37:13 bluhm Exp $ */ /* $NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $ */ /* @@ -1300,7 +1300,7 @@ rt_gettable(sa_family_t af, u_int id) } struct radix_node * -rt_lookup(struct sockaddr *dst, struct sockaddr *mask, int tableid) +rt_lookup(struct sockaddr *dst, struct sockaddr *mask, u_int tableid) { struct radix_node_head *rnh; diff --git a/sys/net/route.h b/sys/net/route.h index b24598624ab..cb151fdfee3 100644 --- a/sys/net/route.h +++ b/sys/net/route.h @@ -1,4 +1,4 @@ -/* $OpenBSD: route.h,v 1.60 2009/03/31 01:31:26 dlg Exp $ */ +/* $OpenBSD: route.h,v 1.61 2009/05/18 20:37:13 bluhm Exp $ */ /* $NetBSD: route.h,v 1.9 1996/02/13 22:00:49 christos Exp $ */ /* @@ -430,6 +430,6 @@ void rt_if_track(struct ifnet *); int rtdeletemsg(struct rtentry *, u_int); struct radix_node_head *rt_gettable(sa_family_t, u_int); -struct radix_node *rt_lookup(struct sockaddr *, struct sockaddr *, int); +struct radix_node *rt_lookup(struct sockaddr *, struct sockaddr *, u_int); #endif /* _KERNEL */ #endif /* _NET_ROUTE_H_ */ diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 1e2d4792ef9..918b7516b4c 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_input.c,v 1.161 2008/12/24 07:41:59 dlg Exp $ */ +/* $OpenBSD: ip_input.c,v 1.162 2009/05/18 20:37:13 bluhm Exp $ */ /* $NetBSD: ip_input.c,v 1.30 1996/03/16 23:53:58 christos Exp $ */ /* @@ -222,7 +222,7 @@ ip_init() struct sockaddr_in ipaddr = { sizeof(ipaddr), AF_INET }; struct route ipforward_rt; -int ipforward_rtableid; +u_int ipforward_rtableid; void ipintr() @@ -1400,7 +1400,8 @@ ip_forward(m, srcrt) struct ip *ip = mtod(m, struct ip *); struct sockaddr_in *sin; struct rtentry *rt; - int error, type = 0, code = 0, destmtu = 0, rtableid = 0; + int error, type = 0, code = 0, destmtu = 0; + u_int rtableid = 0; struct mbuf *mcopy; n_long dest; diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c index 2fcb000bdca..3238b6eddcf 100644 --- a/sys/netinet6/ip6_forward.c +++ b/sys/netinet6/ip6_forward.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_forward.c,v 1.42 2008/11/23 13:30:59 claudio Exp $ */ +/* $OpenBSD: ip6_forward.c,v 1.43 2009/05/18 20:37:13 bluhm Exp $ */ /* $KAME: ip6_forward.c,v 1.75 2001/06/29 12:42:13 jinmei Exp $ */ /* @@ -70,7 +70,7 @@ #endif struct route_in6 ip6_forward_rt; -int ip6_forward_rtableid; +u_int ip6_forward_rtableid; /* * Forward a packet. If some error occurs return the sender @@ -103,7 +103,7 @@ ip6_forward(struct mbuf *m, int srcrt) struct tdb *tdb; int s; #endif /* IPSEC */ - int rtableid = 0; + u_int rtableid = 0; /* * Do not forward packets to multicast destination (should be handled diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index 7302f7e345c..a0492b1a9ae 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_input.c,v 1.90 2008/11/25 12:11:45 markus Exp $ */ +/* $OpenBSD: ip6_input.c,v 1.91 2009/05/18 20:37:13 bluhm Exp $ */ /* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */ /* @@ -196,7 +196,7 @@ ip6intr() } extern struct route_in6 ip6_forward_rt; -extern int ip6_forward_rtableid; +extern u_int ip6_forward_rtableid; void ip6_input(struct mbuf *m) @@ -210,7 +210,8 @@ ip6_input(struct mbuf *m) #if NPF > 0 struct in6_addr odst; #endif - int srcrt = 0, rtableid = 0, isanycast = 0; + int srcrt = 0, isanycast = 0; + u_int rtableid = 0; /* * mbuf statistics by kazu |