251a32b5b2
tun(4) and tap(4) share the same general management interface and have a lot
in common. Bugs exist in tap(4) that have been fixed in tun(4), and
vice-versa. Let's reduce the maintenance requirements by merging them
together and using flags to differentiate between the three interface types
(tun, tap, vmnet).
This fixes a couple of tap(4)/vmnet(4) issues right out of the gate:
- tap devices may no longer be destroyed while they're open [0]
- VIMAGE issues already addressed in tun by kp
[0] emaste had removed an easy-panic-button in r240938 due to devdrn
blocking. A naive glance over this leads me to believe that this isn't quite
complete -- destroy_devl will only block while executing d_* functions, but
doesn't block the device from being destroyed while a process has it open.
The latter is the intent of the condvar in tun, so this is "fixed" (for
certain definitions of the word -- it wasn't really broken in tap, it just
wasn't quite ideal).
ifconfig(8) also grew the ability to map an interface name to a kld, so
that `ifconfig {tun,tap}0` can continue to autoload the correct module, and
`ifconfig vmnet0 create` will now autoload the correct module. This is a
low overhead addition.
(MFC commentary)
This may get MFC'd if many bugs in tun(4)/tap(4) are discovered after this,
and how critical they are. Changes after this are likely easily MFC'd
without taking this merge, but the merge will be easier.
I have no plans to do this MFC as of now.
Reviewed by: bcr (manpages), tuexen (testing, syzkaller/packetdrill)
Input also from: melifaro
Relnotes: yes
Differential Revision: https://reviews.freebsd.org/D20044
75 lines
2.5 KiB
C
75 lines
2.5 KiB
C
/*-
|
|
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
|
|
*
|
|
* Copyright (C) 1999-2000 by Maksim Yevmenkin <m_evmenkin@yahoo.com>
|
|
* 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 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 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.
|
|
*
|
|
* BASED ON:
|
|
* -------------------------------------------------------------------------
|
|
*
|
|
* Copyright (c) 1988, Julian Onions <jpo@cs.nott.ac.uk>
|
|
* Nottingham University 1987.
|
|
*/
|
|
|
|
/*
|
|
* $FreeBSD$
|
|
* $Id: if_tap.h,v 0.7 2000/07/12 04:12:51 max Exp $
|
|
*/
|
|
|
|
#ifndef _NET_IF_TAP_H_
|
|
#define _NET_IF_TAP_H_
|
|
|
|
#include <net/if_tun.h>
|
|
|
|
/* maximum receive packet size (hard limit) */
|
|
#define TAPMRU 16384
|
|
|
|
#define tapinfo tuninfo
|
|
|
|
/*
|
|
* ioctl's for get/set debug; these are aliases of TUN* ioctls, see net/if_tun.h
|
|
* for details.
|
|
*/
|
|
#define TAPSDEBUG TUNSDEBUG
|
|
#define TAPGDEBUG TUNGDEBUG
|
|
#define TAPSIFINFO TUNSIFINFO
|
|
#define TAPGIFINFO TUNGIFINFO
|
|
#define TAPGIFNAME _IOR('t', 93, struct ifreq)
|
|
|
|
/* VMware ioctl's */
|
|
#define VMIO_SIOCSIFFLAGS _IOWINT('V', 0)
|
|
#define VMIO_SIOCSKEEP _IO('V', 1)
|
|
#define VMIO_SIOCSIFBR _IO('V', 2)
|
|
#define VMIO_SIOCSLADRF _IO('V', 3)
|
|
|
|
/* XXX -- unimplemented */
|
|
#define VMIO_SIOCSETMACADDR _IO('V', 4)
|
|
|
|
/* XXX -- not used? */
|
|
#define VMIO_SIOCPORT _IO('V', 5)
|
|
#define VMIO_SIOCBRIDGE _IO('V', 6)
|
|
#define VMIO_SIOCNETIF _IO('V', 7)
|
|
|
|
#endif /* !_NET_IF_TAP_H_ */
|