diff options
| author | nattoheaven <nattoheaven@gmail.com> | 2014-01-14 18:19:37 +0400 |
|---|---|---|
| committer | nattoheaven <nattoheaven@gmail.com> | 2014-01-14 18:19:52 +0400 |
| commit | 8779e59295b857c38f5f453080a5e87be07c1fc3 (patch) | |
| tree | cdabdf395419f610f3919d1d817620b90f66c3a6 /src/Cedar/Client.c | |
| parent | c32bf3b84f0eeff7228edd0b545304ffa6d2c18f (diff) | |
Supporting VLAN for Mac OS X using TunTapOSX
Diffstat (limited to 'src/Cedar/Client.c')
| -rw-r--r-- | src/Cedar/Client.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/src/Cedar/Client.c b/src/Cedar/Client.c index 16062e7f..f85a9c72 100644 --- a/src/Cedar/Client.c +++ b/src/Cedar/Client.c @@ -7446,12 +7446,14 @@ bool CtDisableVLan(CLIENT *c, RPC_CLIENT_CREATE_VLAN *vlan) #ifndef OS_WIN32
+#ifdef NO_VLAN
if (GetOsInfo()->OsType == OSTYPE_MACOS_X)
{
// Can not be added or removed the virtual LAN card in MacOS X
CiSetError(c, ERR_NOT_SUPPORTED);
return false;
}
+#endif
// Check whether the virtual LAN card with the specified name is not
// being used by one or more accounts
@@ -7597,12 +7599,14 @@ bool CtEnableVLan(CLIENT *c, RPC_CLIENT_CREATE_VLAN *vlan) #ifndef OS_WIN32
+#ifdef NO_VLAN
if (GetOsInfo()->OsType == OSTYPE_MACOS_X)
{
// Can not be added or removed the virtual LAN card in MacOS X
CiSetError(c, ERR_NOT_SUPPORTED);
return false;
}
+#endif
// Search the virtual LAN card
LockList(c->UnixVLanList);
@@ -7693,12 +7697,14 @@ bool CtDeleteVLan(CLIENT *c, RPC_CLIENT_CREATE_VLAN *d) #ifndef OS_WIN32
+#ifdef NO_VLAN
if (GetOsInfo()->OsType == OSTYPE_MACOS_X)
{
// Can not be added or removed the virtual LAN card in MacOS X
CiSetError(c, ERR_NOT_SUPPORTED);
return false;
}
+#endif
// Check whether the virtual LAN card with the specified name is not
// being used by one or more accounts
@@ -8265,12 +8271,14 @@ bool CtCreateVLan(CLIENT *c, RPC_CLIENT_CREATE_VLAN *create) #ifndef OS_WIN32
// Non-Win32
+#ifdef NO_VLAN
if (GetOsInfo()->OsType == OSTYPE_MACOS_X)
{
// A virtual LAN card can not be added or removed in MacOS X
CiSetError(c, ERR_NOT_SUPPORTED);
return false;
}
+#endif
// Check whether the specified name is valid or not
if (IsSafeStr(create->DeviceName) == false)
@@ -9792,7 +9800,11 @@ bool CiReadSettingFromCfg(CLIENT *c, FOLDER *root) // Eraser
c->Eraser = NewEraser(c->Logger, CfgGetInt64(config, "AutoDeleteCheckDiskFreeSpaceMin"));
- if (OS_IS_UNIX(GetOsInfo()->OsType) && GetOsInfo()->OsType != OSTYPE_MACOS_X)
+ if (OS_IS_UNIX(GetOsInfo()->OsType)
+#ifdef NO_VLAN
+ && GetOsInfo()->OsType != OSTYPE_MACOS_X
+#endif
+ )
{
// Read the UNIX version virtual LAN card list (except MacOS)
vlan = CfgGetFolder(root, "UnixVLan");
@@ -9802,6 +9814,7 @@ bool CiReadSettingFromCfg(CLIENT *c, FOLDER *root) }
}
+#ifdef NO_VLAN
if (GetOsInfo()->OsType == OSTYPE_MACOS_X)
{
#ifdef OS_UNIX
@@ -9822,6 +9835,7 @@ bool CiReadSettingFromCfg(CLIENT *c, FOLDER *root) Add(c->UnixVLanList, uv);
#endif // OS_UNIX
}
+#endif
CiLoadAccountDatabase(c, db);
@@ -10328,7 +10342,11 @@ void CiWriteSettingToCfg(CLIENT *c, FOLDER *root) CiWriteCAList(c, ca);
// VLAN
- if (OS_IS_UNIX(GetOsInfo()->OsType) && GetOsInfo()->OsType != OSTYPE_MACOS_X)
+ if (OS_IS_UNIX(GetOsInfo()->OsType)
+#ifdef NO_VLAN
+ && GetOsInfo()->OsType != OSTYPE_MACOS_X
+#endif
+ )
{
vlan = CfgCreateFolder(root, "UnixVLan");
CiWriteVLanList(c, vlan);
|