Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src rumpify vether(4)



details:   https://anonhg.NetBSD.org/src/rev/a761c032b9a5
branches:  trunk
changeset: 1014710:a761c032b9a5
user:      roy <roy%NetBSD.org@localhost>
date:      Tue Sep 29 18:33:22 2020 +0000

description:
rumpify vether(4)

diffstat:

 distrib/sets/lists/base/shl.mi                |   5 ++-
 distrib/sets/lists/comp/mi                    |   4 +-
 distrib/sets/lists/comp/shl.mi                |   3 +-
 distrib/sets/lists/debug/mi                   |   3 +-
 distrib/sets/lists/debug/shl.mi               |   3 +-
 sys/rump/net/Makefile.rumpnetcomp             |   4 +-
 sys/rump/net/lib/libvether/Makefile           |  15 +++++++++
 sys/rump/net/lib/libvether/VETHER.ioconf      |   7 ++++
 sys/rump/net/lib/libvether/vether_component.c |  41 +++++++++++++++++++++++++++
 9 files changed, 78 insertions(+), 7 deletions(-)

diffs (179 lines):

diff -r cfc71e904257 -r a761c032b9a5 distrib/sets/lists/base/shl.mi
--- a/distrib/sets/lists/base/shl.mi    Tue Sep 29 18:31:39 2020 +0000
+++ b/distrib/sets/lists/base/shl.mi    Tue Sep 29 18:33:22 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.906 2020/09/26 17:49:49 jmcneill Exp $
+# $NetBSD: shl.mi,v 1.907 2020/09/29 18:33:22 roy Exp $
 #
 # Note:        Don't delete entries from here - mark them as "obsolete" instead,
 #      unless otherwise stated below.
@@ -825,6 +825,9 @@
 ./usr/lib/librumpnet_tun.so                    base-rump-shlib         rump
 ./usr/lib/librumpnet_tun.so.0                  base-rump-shlib         rump
 ./usr/lib/librumpnet_tun.so.0.0                        base-rump-shlib         rump
+./usr/lib/librumpnet_vether.so                 base-rump-shlib         rump
+./usr/lib/librumpnet_vether.so.0               base-rump-shlib         rump
+./usr/lib/librumpnet_vether.so.0.0             base-rump-shlib         rump
 ./usr/lib/librumpnet_virtif.so                 base-rump-shlib         rump
 ./usr/lib/librumpnet_virtif.so.0               base-rump-shlib         rump
 ./usr/lib/librumpnet_virtif.so.0.0             base-rump-shlib         rump
diff -r cfc71e904257 -r a761c032b9a5 distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi        Tue Sep 29 18:31:39 2020 +0000
+++ b/distrib/sets/lists/comp/mi        Tue Sep 29 18:33:22 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: mi,v 1.2359 2020/09/26 17:49:49 jmcneill Exp $
+#      $NetBSD: mi,v 1.2360 2020/09/29 18:33:22 roy Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.comp                           comp-sys-root
@@ -3896,6 +3896,8 @@
 ./usr/lib/librumpnet_tap_p.a                   comp-c-proflib          rump,profile
 ./usr/lib/librumpnet_tun.a                     comp-c-lib              rump
 ./usr/lib/librumpnet_tun_p.a                   comp-c-proflib          rump,profile
+./usr/lib/librumpnet_vether.a                  comp-c-lib              rump
+./usr/lib/librumpnet_vether_p.a                        comp-c-proflib          rump,profile
 ./usr/lib/librumpnet_virtif.a                  comp-c-lib              rump
 ./usr/lib/librumpnet_virtif_p.a                        comp-c-proflib          rump,profile
 ./usr/lib/librumpnet_vlan.a                    comp-c-lib              rump
diff -r cfc71e904257 -r a761c032b9a5 distrib/sets/lists/comp/shl.mi
--- a/distrib/sets/lists/comp/shl.mi    Tue Sep 29 18:31:39 2020 +0000
+++ b/distrib/sets/lists/comp/shl.mi    Tue Sep 29 18:33:22 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.343 2020/09/15 07:00:03 mrg Exp $
+# $NetBSD: shl.mi,v 1.344 2020/09/29 18:33:22 roy Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -246,6 +246,7 @@
 ./usr/lib/librumpnet_sockin_pic.a              comp-c-piclib           picinstall,rump
 ./usr/lib/librumpnet_tap_pic.a                 comp-c-piclib           picinstall,rump
 ./usr/lib/librumpnet_tun_pic.a                 comp-c-piclib           picinstall,rump
+./usr/lib/librumpnet_vether_pic.a              comp-c-piclib           picinstall,rump
 ./usr/lib/librumpnet_virtif_pic.a              comp-c-piclib           picinstall,rump
 ./usr/lib/librumpnet_vlan_pic.a                        comp-c-piclib           picinstall,rump
 ./usr/lib/librumpnet_wg_pic.a                  comp-c-piclib           picinstall,rump
diff -r cfc71e904257 -r a761c032b9a5 distrib/sets/lists/debug/mi
--- a/distrib/sets/lists/debug/mi       Tue Sep 29 18:31:39 2020 +0000
+++ b/distrib/sets/lists/debug/mi       Tue Sep 29 18:33:22 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.339 2020/09/26 17:49:50 jmcneill Exp $
+# $NetBSD: mi,v 1.340 2020/09/29 18:33:23 roy 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
@@ -236,6 +236,7 @@
 ./usr/lib/librumpnet_sockin_g.a                        comp-c-debuglib         debuglib,rump
 ./usr/lib/librumpnet_tap_g.a                   comp-c-debuglib         debuglib,rump
 ./usr/lib/librumpnet_tun_g.a                   comp-c-debuglib         debuglib,rump
+./usr/lib/librumpnet_vether_g.a                        comp-c-debuglib         debuglib,rump
 ./usr/lib/librumpnet_virtif_g.a                        comp-c-debuglib         debuglib,rump
 ./usr/lib/librumpnet_vlan_g.a                  comp-c-debuglib         debuglib,rump
 ./usr/lib/librumpnet_wg_g.a                    comp-c-debuglib         debuglib,rump
diff -r cfc71e904257 -r a761c032b9a5 distrib/sets/lists/debug/shl.mi
--- a/distrib/sets/lists/debug/shl.mi   Tue Sep 29 18:31:39 2020 +0000
+++ b/distrib/sets/lists/debug/shl.mi   Tue Sep 29 18:33:22 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.265 2020/09/26 17:49:50 jmcneill Exp $
+# $NetBSD: shl.mi,v 1.266 2020/09/29 18:33:23 roy Exp $
 ./usr/lib/libbfd_g.a                                           comp-c-debuglib debuglib,compatfile,binutils
 ./usr/libdata/debug/lib                                                base-sys-usr    debug,dynamicroot,compatdir
 ./usr/libdata/debug/lib/libavl.so.0.0.debug                    comp-zfs-debug  debug,dynamicroot,zfs
@@ -292,6 +292,7 @@
 ./usr/libdata/debug/usr/lib/librumpnet_sockin.so.0.0.debug     comp-rump-debug debug,rump
 ./usr/libdata/debug/usr/lib/librumpnet_tap.so.0.0.debug                comp-rump-debug debug,rump
 ./usr/libdata/debug/usr/lib/librumpnet_tun.so.0.0.debug                comp-rump-debug debug,rump
+./usr/libdata/debug/usr/lib/librumpnet_vether.so.0.0.debug     comp-rump-debug debug,rump
 ./usr/libdata/debug/usr/lib/librumpnet_virtif.so.0.0.debug     comp-rump-debug debug,rump
 ./usr/libdata/debug/usr/lib/librumpnet_vlan.so.0.0.debug       comp-rump-debug debug,rump
 ./usr/libdata/debug/usr/lib/librumpnet_wg.so.0.0.debug         comp-rump-debug debug,rump
diff -r cfc71e904257 -r a761c032b9a5 sys/rump/net/Makefile.rumpnetcomp
--- a/sys/rump/net/Makefile.rumpnetcomp Tue Sep 29 18:31:39 2020 +0000
+++ b/sys/rump/net/Makefile.rumpnetcomp Tue Sep 29 18:33:22 2020 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile.rumpnetcomp,v 1.22 2020/08/26 16:03:41 riastradh Exp $
+#      $NetBSD: Makefile.rumpnetcomp,v 1.23 2020/09/29 18:33:23 roy Exp $
 #
 
 .include <bsd.own.mk>
 
 RUMPNETCOMP=   agr bridge net net80211 netbt netcan netinet netinet6 netipsec
-RUMPNETCOMP+=  gif ipsec netmpls npf l2tp local pppoe shmif tap tun vlan
+RUMPNETCOMP+=  gif ipsec netmpls npf l2tp local pppoe shmif tap tun vlan vether
 RUMPNETCOMP+=  wg
 
 .if ${MKSLJIT} != "no" || make(rumpdescribe)
diff -r cfc71e904257 -r a761c032b9a5 sys/rump/net/lib/libvether/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/net/lib/libvether/Makefile       Tue Sep 29 18:33:22 2020 +0000
@@ -0,0 +1,15 @@
+#      $NetBSD: Makefile,v 1.1 2020/09/29 18:33:23 roy Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../net
+
+LIB=   rumpnet_vether
+COMMENT=virtual Ethernet interface
+
+IOCONF=        VETHER.ioconf
+SRCS=  if_vether.c
+
+SRCS+= vether_component.c
+
+.include <bsd.lib.mk>
+.include <bsd.klinks.mk>
diff -r cfc71e904257 -r a761c032b9a5 sys/rump/net/lib/libvether/VETHER.ioconf
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/net/lib/libvether/VETHER.ioconf  Tue Sep 29 18:33:22 2020 +0000
@@ -0,0 +1,7 @@
+#      $NetBSD: VETHER.ioconf,v 1.1 2020/09/29 18:33:23 roy Exp $
+
+ioconf         vether
+
+include                "conf/files"
+
+pseudo-device   vether
diff -r cfc71e904257 -r a761c032b9a5 sys/rump/net/lib/libvether/vether_component.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/net/lib/libvether/vether_component.c     Tue Sep 29 18:33:22 2020 +0000
@@ -0,0 +1,41 @@
+/*     $NetBSD: vether_component.c,v 1.1 2020/09/29 18:33:23 roy Exp $ */
+
+/*
+ * Copyright (c) 2020 Roy Marples.  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: vether_component.c,v 1.1 2020/09/29 18:33:23 roy Exp $");
+
+#include <sys/param.h>
+
+#include <rump-sys/kern.h>
+
+void vetherattach(int);
+
+RUMP_COMPONENT(RUMP_COMPONENT_NET_IF)
+{
+
+       vetherattach(0);
+}



Home | Main Index | Thread Index | Old Index