Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Rump-ify if_pppoe
details: https://anonhg.NetBSD.org/src/rev/a03f4eb82fe1
branches: trunk
changeset: 344750:a03f4eb82fe1
user: ozaki-r <ozaki-r%NetBSD.org@localhost>
date: Fri Apr 15 01:35:25 2016 +0000
description:
Rump-ify if_pppoe
>From s-yamaguchi@IIJ
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/include/opt/opt_rumpkernel.h | 4 +++-
sys/rump/include/opt/pppoe.h | 4 ++--
sys/rump/librump/rumpnet/net_stub.c | 8 ++++++--
sys/rump/net/Makefile.rumpnetcomp | 4 ++--
sys/rump/net/lib/libnet/Makefile | 5 +++--
sys/rump/net/lib/libpppoe/Makefile | 13 +++++++++++++
sys/rump/net/lib/libpppoe/PPPOE.ioconf | 6 ++++++
sys/rump/net/lib/libpppoe/pppoe_component.c | 13 +++++++++++++
13 files changed, 61 insertions(+), 14 deletions(-)
diffs (220 lines):
diff -r 3b9b91be6225 -r a03f4eb82fe1 distrib/sets/lists/base/shl.mi
--- a/distrib/sets/lists/base/shl.mi Fri Apr 15 01:31:29 2016 +0000
+++ b/distrib/sets/lists/base/shl.mi Fri Apr 15 01:35:25 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.768 2016/04/11 08:44:40 roy Exp $
+# $NetBSD: shl.mi,v 1.769 2016/04/15 01:35:25 ozaki-r Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -721,6 +721,9 @@
./usr/lib/librumpnet_npf.so base-rump-shlib rump
./usr/lib/librumpnet_npf.so.0 base-rump-shlib rump
./usr/lib/librumpnet_npf.so.0.0 base-rump-shlib rump
+./usr/lib/librumpnet_pppoe.so base-rump-shlib rump
+./usr/lib/librumpnet_pppoe.so.0 base-rump-shlib rump
+./usr/lib/librumpnet_pppoe.so.0.0 base-rump-shlib rump
./usr/lib/librumpnet_shmif.so base-rump-shlib rump
./usr/lib/librumpnet_shmif.so.0 base-rump-shlib rump
./usr/lib/librumpnet_shmif.so.0.0 base-rump-shlib rump
diff -r 3b9b91be6225 -r a03f4eb82fe1 distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi Fri Apr 15 01:31:29 2016 +0000
+++ b/distrib/sets/lists/comp/mi Fri Apr 15 01:35:25 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2029 2016/04/10 19:05:50 roy Exp $
+# $NetBSD: mi,v 1.2030 2016/04/15 01:35:26 ozaki-r Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -3547,6 +3547,8 @@
./usr/lib/librumpnet_npf.a comp-c-lib rump
./usr/lib/librumpnet_npf_p.a comp-c-lib rump,profile
./usr/lib/librumpnet_p.a comp-c-proflib compatfile,rump,profile
+./usr/lib/librumpnet_pppoe.a comp-c-lib rump
+./usr/lib/librumpnet_pppoe_p.a comp-c-proflib rump,profile
./usr/lib/librumpnet_shmif.a comp-c-lib rump
./usr/lib/librumpnet_shmif_p.a comp-c-proflib rump,profile
./usr/lib/librumpnet_sockin.a comp-c-lib rump
diff -r 3b9b91be6225 -r a03f4eb82fe1 distrib/sets/lists/comp/shl.mi
--- a/distrib/sets/lists/comp/shl.mi Fri Apr 15 01:31:29 2016 +0000
+++ b/distrib/sets/lists/comp/shl.mi Fri Apr 15 01:35:25 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.287 2016/03/16 05:32:09 mrg Exp $
+# $NetBSD: shl.mi,v 1.288 2016/04/15 01:35:26 ozaki-r Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -226,6 +226,7 @@
./usr/lib/librumpnet_netmpls_pic.a comp-c-piclib picinstall,rump
./usr/lib/librumpnet_npf_pic.a comp-c-piclib picinstall,rump
./usr/lib/librumpnet_pic.a comp-c-piclib compatfile,picinstall,rump
+./usr/lib/librumpnet_pppoe_pic.a comp-c-piclib picinstall,rump
./usr/lib/librumpnet_shmif_pic.a comp-c-piclib picinstall,rump
./usr/lib/librumpnet_sockin_pic.a comp-c-piclib picinstall,rump
./usr/lib/librumpnet_tap_pic.a comp-c-piclib picinstall,rump
diff -r 3b9b91be6225 -r a03f4eb82fe1 distrib/sets/lists/debug/mi
--- a/distrib/sets/lists/debug/mi Fri Apr 15 01:31:29 2016 +0000
+++ b/distrib/sets/lists/debug/mi Fri Apr 15 01:35:25 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.151 2016/04/10 21:45:33 kamil Exp $
+# $NetBSD: mi,v 1.152 2016/04/15 01:35:26 ozaki-r 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
@@ -218,6 +218,7 @@
./usr/lib/librumpnet_netinet_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpnet_netmpls_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpnet_npf_g.a comp-c-debuglib debuglib,rump
+./usr/lib/librumpnet_pppoe_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpnet_shmif_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpnet_sockin_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpnet_tap_g.a comp-c-debuglib debuglib,rump
diff -r 3b9b91be6225 -r a03f4eb82fe1 distrib/sets/lists/debug/shl.mi
--- a/distrib/sets/lists/debug/shl.mi Fri Apr 15 01:31:29 2016 +0000
+++ b/distrib/sets/lists/debug/shl.mi Fri Apr 15 01:35:25 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.130 2016/04/11 17:00:36 martin Exp $
+# $NetBSD: shl.mi,v 1.131 2016/04/15 01:35:26 ozaki-r 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.201.debug comp-sys-debug debug,dynamicroot
@@ -244,6 +244,7 @@
./usr/libdata/debug/usr/lib/librumpnet_netinet.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpnet_netinet6.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpnet_netmpls.so.0.0.debug comp-rump-debug debug,rump
+./usr/libdata/debug/usr/lib/librumpnet_pppoe.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpnet_npf.so.0.0.debug comp-rump-debug debug,npf,rump
./usr/libdata/debug/usr/lib/librumpnet_shmif.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpnet_sockin.so.0.0.debug comp-rump-debug debug,rump
diff -r 3b9b91be6225 -r a03f4eb82fe1 sys/rump/include/opt/opt_rumpkernel.h
--- a/sys/rump/include/opt/opt_rumpkernel.h Fri Apr 15 01:31:29 2016 +0000
+++ b/sys/rump/include/opt/opt_rumpkernel.h Fri Apr 15 01:35:25 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: opt_rumpkernel.h,v 1.4 2016/01/07 21:04:27 pooka Exp $ */
+/* $NetBSD: opt_rumpkernel.h,v 1.5 2016/04/15 01:35:26 ozaki-r Exp $ */
#ifndef __NetBSD__
#define __NetBSD__
@@ -29,3 +29,5 @@
#define WSEMUL_NO_DUMB
#define WSEMUL_VT100
+
+#define PPPOE_SERVER
diff -r 3b9b91be6225 -r a03f4eb82fe1 sys/rump/include/opt/pppoe.h
--- a/sys/rump/include/opt/pppoe.h Fri Apr 15 01:31:29 2016 +0000
+++ b/sys/rump/include/opt/pppoe.h Fri Apr 15 01:35:25 2016 +0000
@@ -1,3 +1,3 @@
-/* $NetBSD: pppoe.h,v 1.1 2015/08/24 23:04:42 pooka Exp $ */
+/* $NetBSD: pppoe.h,v 1.2 2016/04/15 01:35:26 ozaki-r Exp $ */
-/* dummy */
+#define NPPPOE 1
diff -r 3b9b91be6225 -r a03f4eb82fe1 sys/rump/librump/rumpnet/net_stub.c
--- a/sys/rump/librump/rumpnet/net_stub.c Fri Apr 15 01:31:29 2016 +0000
+++ b/sys/rump/librump/rumpnet/net_stub.c Fri Apr 15 01:35:25 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: net_stub.c,v 1.21 2014/12/02 14:34:19 ozaki-r Exp $ */
+/* $NetBSD: net_stub.c,v 1.22 2016/04/15 01:35:26 ozaki-r Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: net_stub.c,v 1.21 2014/12/02 14:34:19 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: net_stub.c,v 1.22 2016/04/15 01:35:26 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/protosw.h>
@@ -60,6 +60,10 @@
__weak_alias(ieee8023ad_lacp_input,rumpnet_stub);
__weak_alias(ieee8023ad_marker_input,rumpnet_stub);
+/* pppoe */
+__weak_alias(pppoe_input,rumpnet_stub);
+__weak_alias(pppoedisc_input,rumpnet_stub);
+
struct ifnet_head ifnet_list;
int
diff -r 3b9b91be6225 -r a03f4eb82fe1 sys/rump/net/Makefile.rumpnetcomp
--- a/sys/rump/net/Makefile.rumpnetcomp Fri Apr 15 01:31:29 2016 +0000
+++ b/sys/rump/net/Makefile.rumpnetcomp Fri Apr 15 01:35:25 2016 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.rumpnetcomp,v 1.13 2015/11/15 16:54:16 pooka Exp $
+# $NetBSD: Makefile.rumpnetcomp,v 1.14 2016/04/15 01:35:26 ozaki-r Exp $
#
.include <bsd.own.mk>
RUMPNETCOMP= agr bridge net net80211 netbt netinet netinet6
-RUMPNETCOMP+= gif netmpls npf local shmif tap
+RUMPNETCOMP+= gif netmpls npf local pppoe shmif tap
.if ${MKSLJIT} != "no" || make(rumpdescribe)
RUMPNETCOMP+= bpfjit
diff -r 3b9b91be6225 -r a03f4eb82fe1 sys/rump/net/lib/libnet/Makefile
--- a/sys/rump/net/lib/libnet/Makefile Fri Apr 15 01:31:29 2016 +0000
+++ b/sys/rump/net/lib/libnet/Makefile Fri Apr 15 01:35:25 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2015/10/19 16:16:38 pooka Exp $
+# $NetBSD: Makefile,v 1.28 2016/04/15 01:35:26 ozaki-r Exp $
#
@@ -10,7 +10,8 @@
IOCONF= NET.ioconf
# iffy stuff
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
+ raw_cb.c if_media.c link_proto.c net_stats.c if_ethersubr.c \
+ if_spppsubr.c
SRCS+= if_43.c pfil.c
SRCS+= if_llatbl.c
SRCS+= net_component.c
diff -r 3b9b91be6225 -r a03f4eb82fe1 sys/rump/net/lib/libpppoe/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/net/lib/libpppoe/Makefile Fri Apr 15 01:35:25 2016 +0000
@@ -0,0 +1,13 @@
+
+.PATH: ${.CURDIR}/../../../../net
+
+LIB= rumpnet_pppoe
+COMPONENT= PPP over Ethernet protocol network interface
+
+IOCONF= PPPOE.ioconf
+SRCS= if_pppoe.c
+
+SRCS+= pppoe_component.c
+
+.include <bsd.lib.mk>
+.include <bsd.klinks.mk>
diff -r 3b9b91be6225 -r a03f4eb82fe1 sys/rump/net/lib/libpppoe/PPPOE.ioconf
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/net/lib/libpppoe/PPPOE.ioconf Fri Apr 15 01:35:25 2016 +0000
@@ -0,0 +1,6 @@
+
+ioconf pppoe
+
+include "conf/files"
+
+pseudo-device pppoe
diff -r 3b9b91be6225 -r a03f4eb82fe1 sys/rump/net/lib/libpppoe/pppoe_component.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/net/lib/libpppoe/pppoe_component.c Fri Apr 15 01:35:25 2016 +0000
@@ -0,0 +1,13 @@
+
+#include <sys/cdefs.h>
+
+#include <sys/param.h>
+
+#include <rump-sys/kern.h>
+
+int pppoeattach(int);
+
+RUMP_COMPONENT(RUMP_COMPONENT_NET_IF)
+{
+ pppoeattach(0);
+}
Home |
Main Index |
Thread Index |
Old Index