diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2018-06-02 16:38:22 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2018-06-02 16:38:22 +0000 |
| commit | 96a950e9b419d167b243ed404713857a2302fe5e (patch) | |
| tree | d4bb85e855aca58945199ded9ec4955fec88bb40 /sys | |
| parent | a0af0cd08db60834409ee78ea0147fccb94dfacf (diff) | |
Move the declarations of the raw ip and ip6 pcb tables into the
in_pcb.h header file.
OK mpi@ visa@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/kern_sysctl.c | 6 | ||||
| -rw-r--r-- | sys/netinet/in_pcb.h | 3 | ||||
| -rw-r--r-- | sys/netinet6/icmp6.c | 3 |
3 files changed, 4 insertions, 8 deletions
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 896783f836f..43433d18d6b 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sysctl.c,v 1.340 2018/05/27 08:11:13 ratchov Exp $ */ +/* $OpenBSD: kern_sysctl.c,v 1.341 2018/06/02 16:38:21 bluhm Exp $ */ /* $NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $ */ /*- @@ -1319,10 +1319,6 @@ sysctl_file(int *name, u_int namelen, char *where, size_t *sizep, case KERN_FILE_BYFILE: /* use the inp-tables to pick up closed connections, too */ if (arg == DTYPE_SOCKET) { - extern struct inpcbtable rawcbtable; -#ifdef INET6 - extern struct inpcbtable rawin6pcbtable; -#endif struct inpcb *inp; NET_LOCK(); diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index bf5a3c97300..14ef76d975a 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -1,4 +1,4 @@ -/* $OpenBSD: in_pcb.h,v 1.107 2018/03/30 17:33:54 dhill Exp $ */ +/* $OpenBSD: in_pcb.h,v 1.108 2018/06/02 16:38:21 bluhm Exp $ */ /* $NetBSD: in_pcb.h,v 1.14 1996/02/13 23:42:00 christos Exp $ */ /* @@ -246,6 +246,7 @@ struct baddynamicports { #ifdef _KERNEL +extern struct inpcbtable rawcbtable, rawin6pcbtable; extern struct baddynamicports baddynamicports; extern struct baddynamicports rootonlyports; diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 4255ecadda5..bdbe89c87f6 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: icmp6.c,v 1.223 2018/05/21 15:52:22 bluhm Exp $ */ +/* $OpenBSD: icmp6.c,v 1.224 2018/06/02 16:38:21 bluhm Exp $ */ /* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */ /* @@ -104,7 +104,6 @@ struct cpumem *icmp6counters; -extern struct inpcbtable rawin6pcbtable; extern int icmp6errppslim; static int icmp6errpps_count = 0; static struct timeval icmp6errppslim_last; |