Mercurial > nand-ecoscentric
changeset 1127:9ddd6c4d040b
* include/netinet/in.h:
* src/sys/kern/uipc_accf.c:
* src/sys/kern/uipc_socket.c:
* src/sys/net/route.c:
* src/sys/netinet/ip_icmp.c:
* src/sys/netinet/ip_input.c:
Fixed some compiler warnings.
| author | nickg |
|---|---|
| date | Thu, 24 Jul 2003 18:04:23 +0000 |
| parents | b56e22bed6a2 |
| children | 21aab473590c |
| files | packages/net/bsd_tcpip/current/ChangeLog packages/net/bsd_tcpip/current/include/netinet/in.h packages/net/bsd_tcpip/current/src/sys/kern/uipc_accf.c packages/net/bsd_tcpip/current/src/sys/kern/uipc_socket.c packages/net/bsd_tcpip/current/src/sys/net/route.c packages/net/bsd_tcpip/current/src/sys/netinet/ip_icmp.c packages/net/bsd_tcpip/current/src/sys/netinet/ip_input.c |
| diffstat | 7 files changed, 30 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/packages/net/bsd_tcpip/current/ChangeLog +++ b/packages/net/bsd_tcpip/current/ChangeLog @@ -1,3 +1,13 @@ +2003-07-24 Nick Garnett <nickg@balti.calivar.com> + + * include/netinet/in.h: + * src/sys/kern/uipc_accf.c: + * src/sys/kern/uipc_socket.c: + * src/sys/net/route.c: + * src/sys/netinet/ip_icmp.c: + * src/sys/netinet/ip_input.c: + Fixed some compiler warnings. + 2003-06-12 Motoya Kurotsu <kurotsu@allied-telesis.co.jp> * src/sys/netinet/ip_input.c(ip_reass):
--- a/packages/net/bsd_tcpip/current/include/netinet/in.h +++ b/packages/net/bsd_tcpip/current/include/netinet/in.h @@ -505,9 +505,16 @@ struct ifnet; struct mbuf; /* forward de #ifdef _KERNEL +struct ip; +struct mbuf; + int in_broadcast __P((struct in_addr, struct ifnet *)); int in_canforward __P((struct in_addr)); int in_cksum __P((struct mbuf *, int)); +u_int in_cksum_hdr __P((const struct ip *)); +u_short in_cksum_skip __P((struct mbuf *, int, int)); +u_short in_pseudo __P((u_int32_t, u_int32_t, u_int32_t)); +u_short in_addword __P((u_short, u_short)); int in_localaddr __P((struct in_addr)); char *inet_ntoa __P((struct in_addr));
--- a/packages/net/bsd_tcpip/current/src/sys/kern/uipc_accf.c +++ b/packages/net/bsd_tcpip/current/src/sys/kern/uipc_accf.c @@ -60,7 +60,9 @@ static SLIST_HEAD(, accept_filter) accept_filtlsthd = SLIST_HEAD_INITIALIZER(&accept_filtlsthd); +#ifdef ACCEPT_FILTER_MOD static int unloadable = 0; +#endif /* * must be passed a malloc'd structure so we don't explode if the kld
--- a/packages/net/bsd_tcpip/current/src/sys/kern/uipc_socket.c +++ b/packages/net/bsd_tcpip/current/src/sys/kern/uipc_socket.c @@ -108,7 +108,7 @@ static int somaxconn = SOMAXCONN; struct socket * soalloc(int waitok) { - struct socket *so; + struct socket *so = NULL; int maxtries = waitok ? 10 : 1; while (maxtries-- > 0) {
--- a/packages/net/bsd_tcpip/current/src/sys/net/route.c +++ b/packages/net/bsd_tcpip/current/src/sys/net/route.c @@ -92,6 +92,11 @@ rtable_init(table) dom->dom_rtoffset); } +static void call_route_init( void * arg ) +{ + route_init(); +} + void route_init() { @@ -1182,4 +1187,4 @@ rtinit(ifa, cmd, flags) } /* This must be before ip6_init2(), which is now SI_ORDER_MIDDLE */ -SYSINIT(route, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, route_init, 0); +SYSINIT(route, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, call_route_init, 0);
--- a/packages/net/bsd_tcpip/current/src/sys/netinet/ip_icmp.c +++ b/packages/net/bsd_tcpip/current/src/sys/netinet/ip_icmp.c @@ -98,7 +98,8 @@ static int log_redirect = 0; static int icmplim = 200; #else -static int icmplim = -1; +/* static int icmplim = -1; */ + #endif /*
--- a/packages/net/bsd_tcpip/current/src/sys/netinet/ip_input.c +++ b/packages/net/bsd_tcpip/current/src/sys/netinet/ip_input.c @@ -101,7 +101,9 @@ static int ipsendredirects = 1; /* XXX * int ip_defttl = IPDEFTTL; static int ip_dosourceroute = 0; static int ip_acceptsourceroute = 0; +#if defined(NFAITH) && 0 < NFAITH static int ip_keepfaith = 0; +#endif static int nipq = 0; /* total # of reass queues */ static int maxnipq;