AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2025-07-06 07:44:57 +03:00
Code Releases Activity

Supporting VLAN for Mac OS X using TunTapOSX

Browse Source
This commit is contained in:
nattoheaven
2014-01-14 23:19:37 +09:00
parent c32bf3b84f
commit 8779e59295
7 changed files with 91 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Mayaqua/TunTap.h
View File

@ -227,11 +227,14 @@ struct tundladdr {
#else // UNIX_SOLARIS
#ifdef UNIX_BSD
#if defined(UNIX_BSD) || (!defined(NO_VLAN) && defined(UNIX_MACOS))
// -----------------------------------------------------------------
// Tap header for FreeBSD
// -----------------------------------------------------------------
// -----------------------------------------------------------------
// Tap header For MacOS
// -----------------------------------------------------------------
/* $NetBSD: if_tun.h,v 1.5 1994/06/29 06:36:27 cgd Exp $ */
/*
@ -283,17 +286,7 @@ struct tuninfo {
#else // UNIX_BSD
#ifdef UNIX_MACOS
// -----------------------------------------------------------------
// Tap header For MacOS
// -----------------------------------------------------------------
#else // UNIX_MACOS
#endif // UNIX_MACOS
#endif // UNIX_BSD
#endif // UNIX_BSD || UNIX_MACOS
#endif // UNIX_SOLARIS

4
src/Mayaqua/Unix.c
View File

@ -96,6 +96,7 @@
// Struct statfs for MacOS X
#ifdef UNIX_MACOS
#ifdef NO_VLAN
typedef struct fsid { int32_t val[2]; } fsid_t;
struct statfs {
short f_otype; /* TEMPORARY SHADOW COPY OF f_type */
@ -117,6 +118,9 @@ struct statfs {
char f_mntonname[90]; /* directory on which mounted */
char f_mntfromname[90];/* mounted filesystem */
};
#else
#include <sys/mount.h>
#endif
#endif // UNIX_MACOS
// Scandir() function for Solaris