Module Name: src
Committed By: knakahara
Date: Wed Nov 4 23:57:06 UTC 2015
Modified Files:
src/distrib/sets/lists/base: shl.mi
src/distrib/sets/lists/comp: mi shl.mi
src/distrib/sets/lists/debug: mi shl.mi
src/sys/rump/net: Makefile.rumpnetcomp
Added Files:
src/sys/rump/net/lib/libgif: GIF.ioconf Makefile gif_component.c
Log Message:
if_gif supports rump now.
To generate a diff of this commit:
cvs rdiff -u -r1.752 -r1.753 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.2000 -r1.2001 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.281 -r1.282 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.131 -r1.132 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.114 -r1.115 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.11 -r1.12 src/sys/rump/net/Makefile.rumpnetcomp
cvs rdiff -u -r0 -r1.1 src/sys/rump/net/lib/libgif/GIF.ioconf \
src/sys/rump/net/lib/libgif/Makefile \
src/sys/rump/net/lib/libgif/gif_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/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.752 src/distrib/sets/lists/base/shl.mi:1.753
--- src/distrib/sets/lists/base/shl.mi:1.752 Thu Oct 29 17:57:27 2015
+++ src/distrib/sets/lists/base/shl.mi Wed Nov 4 23:57:05 2015
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.752 2015/10/29 17:57:27 christos Exp $
+# $NetBSD: shl.mi,v 1.753 2015/11/04 23:57:05 knakahara Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -686,6 +686,9 @@
./usr/lib/librumpnet_bridge.so base-rump-shlib rump
./usr/lib/librumpnet_bridge.so.0 base-rump-shlib rump
./usr/lib/librumpnet_bridge.so.0.0 base-rump-shlib rump
+./usr/lib/librumpnet_gif.so base-rump-shlib rump
+./usr/lib/librumpnet_gif.so.0 base-rump-shlib rump
+./usr/lib/librumpnet_gif.so.0.0 base-rump-shlib rump
./usr/lib/librumpnet_local.so base-rump-shlib rump
./usr/lib/librumpnet_local.so.0 base-rump-shlib rump
./usr/lib/librumpnet_local.so.0.0 base-rump-shlib rump
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2000 src/distrib/sets/lists/comp/mi:1.2001
--- src/distrib/sets/lists/comp/mi:1.2000 Thu Oct 29 17:57:27 2015
+++ src/distrib/sets/lists/comp/mi Wed Nov 4 23:57:05 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2000 2015/10/29 17:57:27 christos Exp $
+# $NetBSD: mi,v 1.2001 2015/11/04 23:57:05 knakahara Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -3490,6 +3490,8 @@
./usr/lib/librumpnet_bpfjit_p.a comp-c-proflib rump,sljit,profile
./usr/lib/librumpnet_bridge.a comp-c-lib rump
./usr/lib/librumpnet_bridge_p.a comp-c-proflib rump,profile
+./usr/lib/librumpnet_gif.a comp-c-lib rump
+./usr/lib/librumpnet_gif_p.a comp-c-proflib rump,profile
./usr/lib/librumpnet_local.a comp-c-lib rump
./usr/lib/librumpnet_local_p.a comp-c-proflib rump,profile
./usr/lib/librumpnet_net.a comp-c-lib rump
Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.281 src/distrib/sets/lists/comp/shl.mi:1.282
--- src/distrib/sets/lists/comp/shl.mi:1.281 Tue Sep 29 08:00:22 2015
+++ src/distrib/sets/lists/comp/shl.mi Wed Nov 4 23:57:06 2015
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.281 2015/09/29 08:00:22 hannken Exp $
+# $NetBSD: shl.mi,v 1.282 2015/11/04 23:57:06 knakahara Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -213,6 +213,7 @@
./usr/lib/librumpnet_agr_pic.a comp-c-piclib picinstall,rump
./usr/lib/librumpnet_bpfjit_pic.a comp-c-piclib picinstall,rump,sljit
./usr/lib/librumpnet_bridge_pic.a comp-c-piclib picinstall,rump
+./usr/lib/librumpnet_gif_pic.a comp-c-piclib picinstall,rump
./usr/lib/librumpnet_local_pic.a comp-c-piclib picinstall,rump
./usr/lib/librumpnet_net80211_pic.a comp-c-piclib picinstall,rump
./usr/lib/librumpnet_net_pic.a comp-c-piclib picinstall,rump
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.131 src/distrib/sets/lists/debug/mi:1.132
--- src/distrib/sets/lists/debug/mi:1.131 Fri Sep 25 10:30:37 2015
+++ src/distrib/sets/lists/debug/mi Wed Nov 4 23:57:06 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.131 2015/09/25 10:30:37 martin Exp $
+# $NetBSD: mi,v 1.132 2015/11/04 23:57:06 knakahara Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile
@@ -206,6 +206,7 @@
./usr/lib/librumpnet_agr_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpnet_bpfjit_g.a comp-c-debuglib debuglib,rump,sljit
./usr/lib/librumpnet_bridge_g.a comp-c-debuglib debuglib,rump
+./usr/lib/librumpnet_gif_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpnet_g.a comp-c-debuglib debuglib,compatfile,rump
./usr/lib/librumpnet_local_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpnet_net80211_g.a comp-c-debuglib debuglib,rump
Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.114 src/distrib/sets/lists/debug/shl.mi:1.115
--- src/distrib/sets/lists/debug/shl.mi:1.114 Thu Oct 29 17:57:27 2015
+++ src/distrib/sets/lists/debug/shl.mi Wed Nov 4 23:57:06 2015
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.114 2015/10/29 17:57:27 christos Exp $
+# $NetBSD: shl.mi,v 1.115 2015/11/04 23:57:06 knakahara Exp $
./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir
./usr/libdata/debug/lib/libblacklist.so.0.0.debug comp-sys-debug debug,dynamicroot
./usr/libdata/debug/lib/libc.so.12.198.debug comp-sys-debug debug,dynamicroot
@@ -232,6 +232,7 @@
./usr/libdata/debug/usr/lib/librumpnet_agr.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpnet_bpfjit.so.0.0.debug comp-rump-debug debug,rump,sljit
./usr/libdata/debug/usr/lib/librumpnet_bridge.so.0.0.debug comp-rump-debug debug,rump
+./usr/libdata/debug/usr/lib/librumpnet_gif.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpnet_local.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpnet_net.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpnet_net80211.so.0.0.debug comp-rump-debug debug,rump
Index: src/sys/rump/net/Makefile.rumpnetcomp
diff -u src/sys/rump/net/Makefile.rumpnetcomp:1.11 src/sys/rump/net/Makefile.rumpnetcomp:1.12
--- src/sys/rump/net/Makefile.rumpnetcomp:1.11 Fri May 29 12:32:23 2015
+++ src/sys/rump/net/Makefile.rumpnetcomp Wed Nov 4 23:57:06 2015
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.rumpnetcomp,v 1.11 2015/05/29 12:32:23 pooka Exp $
+# $NetBSD: Makefile.rumpnetcomp,v 1.12 2015/11/04 23:57:06 knakahara Exp $
#
.include <bsd.own.mk>
RUMPNETCOMP= agr bridge net net80211 netbt netinet netinet6
-RUMPNETCOMP+= netmpls npf local shmif tap
+RUMPNETCOMP+= gif netmpls npf local shmif tap
.if ${MKSLJIT} != "no"
RUMPNETCOMP+= bpfjit
Added files:
Index: src/sys/rump/net/lib/libgif/GIF.ioconf
diff -u /dev/null src/sys/rump/net/lib/libgif/GIF.ioconf:1.1
--- /dev/null Wed Nov 4 23:57:06 2015
+++ src/sys/rump/net/lib/libgif/GIF.ioconf Wed Nov 4 23:57:06 2015
@@ -0,0 +1,7 @@
+# $NetBSD: GIF.ioconf,v 1.1 2015/11/04 23:57:06 knakahara Exp $
+
+ioconf gif
+
+include "conf/files"
+
+pseudo-device gif
Index: src/sys/rump/net/lib/libgif/Makefile
diff -u /dev/null src/sys/rump/net/lib/libgif/Makefile:1.1
--- /dev/null Wed Nov 4 23:57:06 2015
+++ src/sys/rump/net/lib/libgif/Makefile Wed Nov 4 23:57:06 2015
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.1 2015/11/04 23:57:06 knakahara Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../net ${.CURDIR}/../../../../netinet \
+ ${.CURDIR}/../../../../netinet6
+
+LIB= rumpnet_gif
+COMMENT= generic tunnel interface
+
+IOCONF= GIF.ioconf
+SRCS= if_gif.c in_gif.c in6_gif.c ip_ecn.c
+
+SRCS+= gif_component.c
+
+.include <bsd.lib.mk>
+.include <bsd.klinks.mk>
Index: src/sys/rump/net/lib/libgif/gif_component.c
diff -u /dev/null src/sys/rump/net/lib/libgif/gif_component.c:1.1
--- /dev/null Wed Nov 4 23:57:06 2015
+++ src/sys/rump/net/lib/libgif/gif_component.c Wed Nov 4 23:57:06 2015
@@ -0,0 +1,43 @@
+/* $NetBSD: gif_component.c,v 1.1 2015/11/04 23:57:06 knakahara Exp $ */
+
+/*
+ * Copyright (c) 2015 Internet Initiative Japan 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
+ * 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: gif_component.c,v 1.1 2015/11/04 23:57:06 knakahara Exp $");
+
+#include <sys/param.h>
+
+#include "rump_private.h"
+#include "rump_net_private.h"
+
+int gifattach(int);
+
+RUMP_COMPONENT(RUMP_COMPONENT_NET_IF)
+{
+
+ gifattach(0);
+}
