Module Name: src
Committed By: pooka
Date: Wed Dec 8 18:06:43 UTC 2010
Modified Files:
src/sys/rump/net: Makefile.rumpnetcomp
src/sys/rump/net/lib/libnet: Makefile component.c
Added Files:
src/sys/rump/net/lib/libbridge: Makefile component.c shlib_version
Log Message:
Actually, unlike e.g. carp, bridge can be its own component since
it doesn't want to join the protosw party. We can deal with other
linkhappy stuff with weak symbols.
(where is our modular networking stack?)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/net/Makefile.rumpnetcomp
cvs rdiff -u -r0 -r1.1 src/sys/rump/net/lib/libbridge/Makefile \
src/sys/rump/net/lib/libbridge/component.c \
src/sys/rump/net/lib/libbridge/shlib_version
cvs rdiff -u -r1.9 -r1.10 src/sys/rump/net/lib/libnet/Makefile
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/net/lib/libnet/component.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/net/Makefile.rumpnetcomp
diff -u src/sys/rump/net/Makefile.rumpnetcomp:1.2 src/sys/rump/net/Makefile.rumpnetcomp:1.3
--- src/sys/rump/net/Makefile.rumpnetcomp:1.2 Tue Dec 7 17:23:27 2010
+++ src/sys/rump/net/Makefile.rumpnetcomp Wed Dec 8 18:06:43 2010
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.rumpnetcomp,v 1.2 2010/12/07 17:23:27 pooka Exp $
+# $NetBSD: Makefile.rumpnetcomp,v 1.3 2010/12/08 18:06:43 pooka Exp $
#
-RUMPNETCOMP= net net80211 netbt netinet local shmif virtif
+RUMPNETCOMP= bridge net net80211 netbt netinet local shmif virtif
RUMPNETSOCKIN= sockin
Index: src/sys/rump/net/lib/libnet/Makefile
diff -u src/sys/rump/net/lib/libnet/Makefile:1.9 src/sys/rump/net/lib/libnet/Makefile:1.10
--- src/sys/rump/net/lib/libnet/Makefile:1.9 Tue Dec 7 20:39:07 2010
+++ src/sys/rump/net/lib/libnet/Makefile Wed Dec 8 18:06:43 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2010/12/07 20:39:07 pooka Exp $
+# $NetBSD: Makefile,v 1.10 2010/12/08 18:06:43 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../net ${.CURDIR}/../../../../compat/common
@@ -6,9 +6,8 @@
LIB= rumpnet_net
# iffy stuff
-SRCS= if.c if_bridge.c if_loop.c route.c rtsock.c raw_usrreq.c \
+SRCS= if.c if_loop.c route.c rtsock.c raw_usrreq.c \
raw_cb.c if_media.c link_proto.c net_stats.c if_ethersubr.c
-SRCS+= bridgestp.c
SRCS+= if_43.c uipc_syscalls_50.c
SRCS+= component.c
Index: src/sys/rump/net/lib/libnet/component.c
diff -u src/sys/rump/net/lib/libnet/component.c:1.6 src/sys/rump/net/lib/libnet/component.c:1.7
--- src/sys/rump/net/lib/libnet/component.c:1.6 Tue Dec 7 20:39:07 2010
+++ src/sys/rump/net/lib/libnet/component.c Wed Dec 8 18:06:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: component.c,v 1.6 2010/12/07 20:39:07 pooka Exp $ */
+/* $NetBSD: component.c,v 1.7 2010/12/08 18:06:43 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.6 2010/12/07 20:39:07 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.7 2010/12/08 18:06:43 pooka Exp $");
#include <sys/param.h>
#include <sys/domain.h>
@@ -49,7 +49,6 @@
ifinit1();
ifinit();
loopattach(1);
- bridgeattach(1);
DOMAINADD(linkdomain);
DOMAINADD(routedomain);
}
Added files:
Index: src/sys/rump/net/lib/libbridge/Makefile
diff -u /dev/null src/sys/rump/net/lib/libbridge/Makefile:1.1
--- /dev/null Wed Dec 8 18:06:43 2010
+++ src/sys/rump/net/lib/libbridge/Makefile Wed Dec 8 18:06:43 2010
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1 2010/12/08 18:06:43 pooka Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../net
+
+LIB= rumpnet_bridge
+
+SRCS= if_bridge.c bridgestp.c
+
+SRCS+= component.c
+
+CPPFLAGS+= -I${.CURDIR}/../libnet/opt
+
+.include <bsd.lib.mk>
+.include <bsd.klinks.mk>
Index: src/sys/rump/net/lib/libbridge/component.c
diff -u /dev/null src/sys/rump/net/lib/libbridge/component.c:1.1
--- /dev/null Wed Dec 8 18:06:43 2010
+++ src/sys/rump/net/lib/libbridge/component.c Wed Dec 8 18:06:43 2010
@@ -0,0 +1,42 @@
+/* $NetBSD: component.c,v 1.1 2010/12/08 18:06:43 pooka Exp $ */
+
+/*
+ * Copyright (c) 2009 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * 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: component.c,v 1.1 2010/12/08 18:06:43 pooka Exp $");
+
+#include <sys/param.h>
+
+#include "rump_private.h"
+#include "rump_net_private.h"
+
+int bridgeattach(int);
+
+RUMP_COMPONENT(RUMP_COMPONENT_NET_IF)
+{
+
+ bridgeattach(0);
+}
Index: src/sys/rump/net/lib/libbridge/shlib_version
diff -u /dev/null src/sys/rump/net/lib/libbridge/shlib_version:1.1
--- /dev/null Wed Dec 8 18:06:43 2010
+++ src/sys/rump/net/lib/libbridge/shlib_version Wed Dec 8 18:06:43 2010
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2010/12/08 18:06:43 pooka Exp $
+#
+major=0
+minor=0
