 @@ -1,14 +1,14 @@
-/*	$NetBSD: rump_net_private.h,v 1.9 2014/02/14 01:43:13 pooka Exp $	*/
+/*	$NetBSD: rump_net_private.h,v 1.10 2014/08/22 11:34:28 pooka Exp $	*/
 /*
  * Copyright (c) 2008 Antti Kantee.  All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -20,23 +20,16 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef _SYS_RUMP_NET_PRIVATE_H_
 #define _SYS_RUMP_NET_PRIVATE_H_
 void		rump_netisr_register(int, void (*)(void));
 #define DOMAINADD(dom)							\
 do {									\
 	if (!pffinddomain(dom.dom_family)) {				\
 		domain_attach(&dom);					\
         }								\
 } while (/*CONSTCOND*/0)
 #include "rumpnet_if_priv.h"
 #endif /* _SYS_RUMP_NET_PRIVATE_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: local_component.c,v 1.1 2014/03/13 02:04:59 pooka Exp $	*/
+/*	$NetBSD: local_component.c,v 1.2 2014/08/22 11:34:28 pooka Exp $	*/
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by The Nokia Foundation
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -18,28 +18,28 @@
  * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: local_component.c,v 1.1 2014/03/13 02:04:59 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: local_component.c,v 1.2 2014/08/22 11:34:28 pooka Exp $");
 #include <sys/param.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>
 #include "rump_private.h"
 #include "rump_net_private.h"
 RUMP_COMPONENT(RUMP_COMPONENT_NET)
+{
 	extern struct domain unixdomain;
-	DOMAINADD(unixdomain);
+	domain_attach(&unixdomain);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: net_component.c,v 1.1 2014/03/13 02:06:32 pooka Exp $	*/
+/*	$NetBSD: net_component.c,v 1.2 2014/08/22 11:34:28 pooka Exp $	*/
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by The Nokia Foundation
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -18,46 +18,46 @@
  * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: net_component.c,v 1.1 2014/03/13 02:06:32 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: net_component.c,v 1.2 2014/08/22 11:34:28 pooka Exp $");
 #include <sys/param.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>
 #include <net/if.h>
 #include <net/route.h>
 #include "rump_private.h"
 #include "rump_net_private.h"
 RUMP_COMPONENT(RUMP_COMPONENT_NET)
+{
 	ifinit1();
 	ifinit();
+}
 RUMP_COMPONENT(RUMP_COMPONENT_NET_ROUTE)
+{
 	extern struct domain routedomain, compat_50_routedomain, linkdomain;
-	DOMAINADD(linkdomain);
+	domain_attach(&linkdomain);
-	DOMAINADD(routedomain);
+	domain_attach(&routedomain);
-	DOMAINADD(compat_50_routedomain);
+	domain_attach(&compat_50_routedomain);
+}
 RUMP_COMPONENT(RUMP_COMPONENT_NET_IF)
+{
 	loopattach(1);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: netbt_component.c,v 1.1 2014/03/13 02:06:16 pooka Exp $	*/
+/*	$NetBSD: netbt_component.c,v 1.2 2014/08/22 11:34:28 pooka Exp $	*/
 /*
  * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -16,28 +16,28 @@
  * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbt_component.c,v 1.1 2014/03/13 02:06:16 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbt_component.c,v 1.2 2014/08/22 11:34:28 pooka Exp $");
 #include <sys/param.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>
 #include "rump_private.h"
 #include "rump_net_private.h"
 RUMP_COMPONENT(RUMP_COMPONENT_NET)
+{
 	extern struct domain btdomain;
-	DOMAINADD(btdomain);
+	domain_attach(&btdomain);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: netinet_component.c,v 1.3 2014/07/01 05:49:19 rtr Exp $	*/
+/*	$NetBSD: netinet_component.c,v 1.4 2014/08/22 11:34:28 pooka Exp $	*/
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by The Nokia Foundation
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -18,51 +18,51 @@
  * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netinet_component.c,v 1.3 2014/07/01 05:49:19 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netinet_component.c,v 1.4 2014/08/22 11:34:28 pooka Exp $");
 #include <sys/param.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>
 #include <sys/socketvar.h>
 #include <net/if.h>
 #include <net/netisr.h>
 #include <netinet/in.h>
 #include <netinet/in_var.h>
 #include <netinet/ip_var.h>
 #include <netinet/if_inarp.h>
 #include "rump_private.h"
 #include "rump_net_private.h"
 int carpattach(int);
 RUMP_COMPONENT(RUMP_COMPONENT_NET)
+{
 	extern struct domain arpdomain, inetdomain;
-	DOMAINADD(arpdomain);
+	domain_attach(&arpdomain);
-	DOMAINADD(inetdomain);
+	domain_attach(&inetdomain);
 	carpattach(1);
 	rump_netisr_register(NETISR_ARP, arpintr);
+}
 RUMP_COMPONENT(RUMP_COMPONENT_NET_IFCFG)
+{
 	struct ifaliasreq ia;
 	struct sockaddr_in *sin;
 	struct socket *so;
 	int error;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: netinet6_component.c,v 1.2 2014/06/05 23:48:17 rmind Exp $	*/
+/*	$NetBSD: netinet6_component.c,v 1.3 2014/08/22 11:34:28 pooka Exp $	*/
 /*
  * Copyright (c) 2013 Antti Kantee.  All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -16,43 +16,43 @@
  * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netinet6_component.c,v 1.2 2014/06/05 23:48:17 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netinet6_component.c,v 1.3 2014/08/22 11:34:28 pooka Exp $");
 #include <sys/param.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>
 #include <sys/socketvar.h>
 #include <net/if.h>
 #include <net/netisr.h>
 #include <netinet/in.h>
 #include <netinet/ip_var.h>
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
 #include "rump_private.h"
 #include "rump_net_private.h"
 RUMP_COMPONENT(RUMP_COMPONENT_NET)
+{
 	extern struct domain inet6domain;
-	DOMAINADD(inet6domain);
+	domain_attach(&inet6domain);
+}
 RUMP_COMPONENT(RUMP_COMPONENT_NET_IFCFG)
+{
 	if_up(lo0ifp);
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: netmpls_component.c,v 1.1 2014/03/13 02:05:29 pooka Exp $ */
+/* $NetBSD: netmpls_component.c,v 1.2 2014/08/22 11:34:28 pooka Exp $ */
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by The Nokia Foundation
+ *
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -21,44 +21,44 @@
  * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netmpls_component.c,v 1.1 2014/03/13 02:05:29 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netmpls_component.c,v 1.2 2014/08/22 11:34:28 pooka Exp $");
 #include <sys/param.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>
 #include <net/if.h>
 #include <net/netisr.h>
 #include <net/route.h>
 #include <netmpls/mpls_var.h>
 #include "rump_private.h"
 #include "rump_net_private.h"
 void ifmplsattach(int);
 RUMP_COMPONENT(RUMP_COMPONENT_NET)
+{
 	extern struct domain mplsdomain;
-	DOMAINADD(mplsdomain);
+	domain_attach(&mplsdomain);
 	rump_netisr_register(NETISR_MPLS, mplsintr);
+}
 RUMP_COMPONENT(RUMP_COMPONENT_NET_IF)
+{
 	ifmplsattach(0);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sockin_component.c,v 1.1 2014/03/13 02:05:49 pooka Exp $	*/
+/*	$NetBSD: sockin_component.c,v 1.2 2014/08/22 11:34:28 pooka Exp $	*/
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by The Nokia Foundation
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -18,30 +18,30 @@
  * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sockin_component.c,v 1.1 2014/03/13 02:05:49 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sockin_component.c,v 1.2 2014/08/22 11:34:28 pooka Exp $");
 #include <sys/param.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>
 #include "rump_private.h"
 #include "rump_net_private.h"
 RUMP_COMPONENT(RUMP_COMPONENT_NET)
+{
 	extern struct domain sockindomain;
 	extern struct domain sockin6domain;
-	DOMAINADD(sockindomain);
+	domain_attach(&sockindomain);
-	DOMAINADD(sockin6domain);
+	domain_attach(&sockin6domain);
+}