Add a loadable module for tap(4).

The code was already modularized, we simply didn't build the loadable
module.

Note also that since the tap(4) device can be reasonably accessed by
either creating a  device instance (using ifconfig(8)) or by opening
/dev/tap, we need to create both if_tap.kmod and tap.kmod (similar to
what is done with tun(4)).
This commit is contained in:
pgoyette 2019-03-24 11:20:26 +00:00
parent 531e64eefe
commit 9c4fa8bcb0
6 changed files with 87 additions and 2 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: mi,v 1.119 2019/02/06 11:55:05 rin Exp $
# $NetBSD: mi,v 1.120 2019/03/24 11:20:26 pgoyette Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@ -228,6 +228,8 @@
./@MODULEDIR@/if_stf/if_stf.kmod base-kernel-modules kmod
./@MODULEDIR@/if_strip base-kernel-modules kmod
./@MODULEDIR@/if_strip/if_strip.kmod base-kernel-modules kmod
./@MODULEDIR@/if_tap base-kernel-modules kmod
./@MODULEDIR@/if_tap/if_tap.kmod base-kernel-modules kmod
./@MODULEDIR@/if_tun base-kernel-modules kmod
./@MODULEDIR@/if_tun/if_tun.kmod base-kernel-modules kmod
./@MODULEDIR@/if_ure base-kernel-modules kmod
@ -416,6 +418,8 @@
./@MODULEDIR@/tmpfs/tmpfs.kmod base-kernel-modules kmod
./@MODULEDIR@/tprof base-kernel-modules kmod
./@MODULEDIR@/tprof/tprof.kmod base-kernel-modules kmod
./@MODULEDIR@/tap base-kernel-modules kmod
./@MODULEDIR@/tap/tap.kmod base-kernel-modules kmod
./@MODULEDIR@/tun base-kernel-modules kmod
./@MODULEDIR@/tun/tun.kmod base-kernel-modules kmod
./@MODULEDIR@/twa base-obsolete obsolete

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.219 2019/02/06 11:55:06 rin Exp $
# $NetBSD: Makefile,v 1.220 2019/03/24 11:20:26 pgoyette Exp $
.include <bsd.own.mk>
@ -87,6 +87,7 @@ SUBDIR+= if_smsc
SUBDIR+= if_srt
SUBDIR+= if_stf
SUBDIR+= if_strip
SUBDIR+= if_tap tap
SUBDIR+= if_tun tun
SUBDIR+= if_ure
SUBDIR+= if_vlan

View File

@ -0,0 +1,14 @@
# $NetBSD: Makefile,v 1.1 2019/03/24 11:20:26 pgoyette Exp $
.include "../Makefile.inc"
.PATH: ${S}/net
KMOD= if_tap
IOCONF= tap.ioconf
SRCS= if_tap.c
CPPFLAGS+= -DINET
CPPFLAGS+= -DINET6
.include <bsd.kmodule.mk>

View File

@ -0,0 +1,7 @@
# $NetBSD: tap.ioconf,v 1.1 2019/03/24 11:20:26 pgoyette Exp $
ioconf tap
include "conf/files"
pseudo-device tap

8
sys/modules/tap/Makefile Normal file
View File

@ -0,0 +1,8 @@
# $NetBSD: Makefile,v 1.1 2019/03/24 11:20:26 pgoyette Exp $
.include "../Makefile.inc"
KMOD= tap
SRCS= tap.c
.include <bsd.kmodule.mk>

51
sys/modules/tap/tap.c Normal file
View File

@ -0,0 +1,51 @@
/* $NetBSD: tap.c,v 1.1 2019/03/24 11:20:26 pgoyette Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Paul Goyette
*
* 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``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 FOUNDATION 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: tap.c,v 1.1 2019/03/24 11:20:26 pgoyette Exp $");
#include <sys/errno.h>
#include <sys/module.h>
MODULE(MODULE_CLASS_DRIVER, tap, "if_tap");
static int
tap_modcmd(modcmd_t cmd, void *arg)
{
switch (cmd) {
case MODULE_CMD_INIT:
case MODULE_CMD_FINI:
return 0;
default:
return ENOTTY;
}
}