j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

- Try old TUN/TAP ioctl() request if the one from if_tun.h fails.

Browse source 
- Be more verbose about the kind of tap device used.
This commit is contained in:
Guus Sliepen 2001-09-24 13:31:15 +00:00
parent 950c934e0b
commit 154733927a
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/net.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: net.c,v 1.35.4.129 2001/09/01 12:36:06 guus Exp $ $Id: net.c,v 1.35.4.130 2001/09/24 13:31:15 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -369,18 +369,25 @@ cp
cp cp
if (!ioctl(tap_fd, TUNSETIFF, (void *) &ifr)) if (!ioctl(tap_fd, TUNSETIFF, (void *) &ifr))
{ {
syslog(LOG_INFO, _("%s is a tun/tap device"), tapfname); syslog(LOG_INFO, _("%s is a Linux tun/tap device"), tapfname);
taptype = TAP_TYPE_TUNTAP; taptype = TAP_TYPE_TUNTAP;
} }
else else
if (!ioctl(tap_fd, (('T'<< 8) | 202), (void *) &ifr))
{
syslog(LOG_INFO, _("%s is a Linux tun/tap device"), tapfname);
syslog(LOG_WARNING, _("Old ioctl() request used"));
taptype = TAP_TYPE_TUNTAP;
}
else
#endif #endif
{ {
syslog(LOG_INFO, _("%s is an ethertap device"), tapfname); syslog(LOG_INFO, _("%s is a Linux ethertap device"), tapfname);
taptype = TAP_TYPE_ETHERTAP; taptype = TAP_TYPE_ETHERTAP;
} }
#endif #endif
#ifdef HAVE_FREEBSD #ifdef HAVE_FREEBSD
syslog(LOG_INFO, _("%s is a tun/tap device"), tapfname); syslog(LOG_INFO, _("%s is a FreeBSD tap device"), tapfname);
taptype = TAP_TYPE_TUNTAP; taptype = TAP_TYPE_TUNTAP;
#endif #endif
#ifdef HAVE_SOLARIS #ifdef HAVE_SOLARIS
@ -422,7 +429,7 @@ cp
return -1; return -1;
} }
syslog(LOG_INFO, _("%s is a tun/tap device"), tapfname); syslog(LOG_INFO, _("%s is a Solaris tun device"), tapfname);
#endif #endif
cp cp