route_cb is internal to rtsock.c

diff --git a/sys/net/route.c b/sys/net/route.c
index 4ff77ef..c20fed7 100644 (file)
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: route.c,v 1.176 2014/08/11 11:59:05 mpi Exp $ */
+/*     $OpenBSD: route.c,v 1.177 2014/08/12 13:52:08 mpi Exp $ */
 /*     $NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $      */
 
 /*
@@ -132,7 +132,6 @@
 struct ifaddr  *encap_findgwifa(struct sockaddr *, u_int);
 #endif
 
-struct route_cb           route_cb;
 struct rtstat             rtstat;
 struct radix_node_head ***rt_tables;
 u_int8_t                  af2rtafidx[AF_MAX+1];

diff --git a/sys/net/route.h b/sys/net/route.h
index 9429933..f610a16 100644 (file)
--- a/sys/net/route.h
+++ b/sys/net/route.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: route.h,v 1.95 2014/07/29 12:18:41 mpi Exp $  */
+/*     $OpenBSD: route.h,v 1.96 2014/08/12 13:52:08 mpi Exp $  */
 /*     $NetBSD: route.h,v 1.9 1996/02/13 22:00:49 christos Exp $       */
 
 /*
@@ -343,14 +343,6 @@ void                rtlabel_unref(u_int16_t);
 #define        RT_REPORT       0x1
 #define        RT_NOCLONING    0x2
 
-struct route_cb {
-       int     ip_count;
-       int     ip6_count;
-       int     mpls_count;
-       int     any_count;
-};
-
-extern struct route_cb route_cb;
 extern struct rtstat rtstat;
 extern const struct sockaddr_rtin rt_defmask4;
 

diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 943ad8a..75c6536 100644 (file)
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rtsock.c,v 1.151 2014/08/11 11:59:05 mpi Exp $        */
+/*     $OpenBSD: rtsock.c,v 1.152 2014/08/12 13:52:08 mpi Exp $        */
 /*     $NetBSD: rtsock.c,v 1.18 1996/03/29 00:32:10 cgd Exp $  */
 
 /*
@@ -109,6 +109,15 @@ struct routecb {
 };
 #define        sotoroutecb(so) ((struct routecb *)(so)->so_pcb)
 
+struct route_cb {
+       int             ip_count;
+       int             ip6_count;
+       int             mpls_count;
+       int             any_count;
+};
+
+struct route_cb route_cb;
+
 /*
  * These flags and timeout are used for indicating to userland (via a 
  * RTM_DESYNC msg) when the route socket has overflowed and messages