diff options
Diffstat (limited to 'sys/netkey')
| -rw-r--r-- | sys/netkey/key.c | 33 | ||||
| -rw-r--r-- | sys/netkey/key_debug.c | 1 |
2 files changed, 16 insertions, 18 deletions
diff --git a/sys/netkey/key.c b/sys/netkey/key.c index 0116b2a23ec35..debf1cb1c3138 100644 --- a/sys/netkey/key.c +++ b/sys/netkey/key.c @@ -164,6 +164,7 @@ extern struct sockaddr key_addr; { x += ROUNDUP(n); } static int addrpart_equal __P((struct sockaddr *, struct sockaddr *)); +static int key_freetables __P((void)); static int key_gethashval __P((char *, int, int)); static int key_createkey __P((char *, u_int, struct sockaddr *, struct sockaddr *, u_int32_t, u_int)); @@ -446,7 +447,6 @@ key_inittables() return 0; } -#ifdef notyet static int key_freetables() { @@ -456,7 +456,6 @@ key_freetables() key_acquirelist = NULL; return 0; } -#endif /*---------------------------------------------------------------------- * key_gethashval(): @@ -2255,27 +2254,24 @@ static int my_addr(sa) struct sockaddr *sa; { + struct in6_ifaddr *i6a = 0; + struct in_ifaddr *ia = 0; + switch(sa->sa_family) { #ifdef INET6 - case AF_INET6: { - struct in6_ifaddr *i6a = 0; - - for (i6a = in6_ifaddr; i6a; i6a = i6a->ia_next) { /*XXX*/ - if (IN6_ARE_ADDR_EQUAL(&((struct sockaddr_in6 *)sa)->sin6_addr, - &i6a->ia_addr.sin6_addr)) - return(1); - } + case AF_INET6: + for (i6a = in6_ifaddr; i6a; i6a = i6a->ia_next) { /*XXX*/ + if (IN6_ARE_ADDR_EQUAL(&((struct sockaddr_in6 *)sa)->sin6_addr, + &i6a->ia_addr.sin6_addr)) + return(1); } break; #endif /* INET6 */ - case AF_INET: { - struct in_ifaddr *ia = 0; - - for (ia = in_ifaddrhead.tqh_first; ia; ia = ia->ia_link.tqe_next) { - if (((struct sockaddr_in *)sa)->sin_addr.s_addr == - ia->ia_addr.sin_addr.s_addr) - return(1); - } + case AF_INET: + for (ia = in_ifaddrhead.tqh_first; ia; ia = ia->ia_link.tqe_next) { + if (((struct sockaddr_in *)sa)->sin_addr.s_addr == + ia->ia_addr.sin_addr.s_addr) + return(1); } break; } @@ -2292,6 +2288,7 @@ key_output(m, so) struct socket *so; { struct key_msghdr *km = 0; + caddr_t cp, cplimit; int len; int error = 0; int dstfamily = 0; diff --git a/sys/netkey/key_debug.c b/sys/netkey/key_debug.c index a596c0c72a502..31f14cacea1ef 100644 --- a/sys/netkey/key_debug.c +++ b/sys/netkey/key_debug.c @@ -436,6 +436,7 @@ void dump_mchain(m) void dump_tcpdump(m) struct mbuf *m; { + struct mbuf *walker; int i, j, count; for (i = count = 0; m && (i < 10); m = m->m_next, i++) { |