diff --git a/src/Cedar/Cedar.c b/src/Cedar/Cedar.c index 869efa59..45a49a38 100644 --- a/src/Cedar/Cedar.c +++ b/src/Cedar/Cedar.c @@ -1663,6 +1663,8 @@ CEDAR *NewCedar(X *server_x, K *server_k) c->CurrentRegionLock = NewLock(); + StrCpy(c->OpenVPNDefaultClientOption, sizeof(c->OpenVPNDefaultClientOption), OVPN_DEF_CLIENT_OPTION_STRING); + #ifdef BETA_NUMBER c->Beta = BETA_NUMBER; #endif // BETA_NUMBER diff --git a/src/Cedar/Cedar.h b/src/Cedar/Cedar.h index c0ea610e..562583c2 100644 --- a/src/Cedar/Cedar.h +++ b/src/Cedar/Cedar.h @@ -135,10 +135,10 @@ // Version number -#define CEDAR_VER 411 +#define CEDAR_VER 412 // Build Number -#define CEDAR_BUILD 9506 +#define CEDAR_BUILD 9514 // Beta number //#define BETA_NUMBER 3 @@ -158,11 +158,11 @@ // Specifies the build date #define BUILD_DATE_Y 2014 -#define BUILD_DATE_M 10 -#define BUILD_DATE_D 22 -#define BUILD_DATE_HO 19 -#define BUILD_DATE_MI 51 -#define BUILD_DATE_SE 55 +#define BUILD_DATE_M 11 +#define BUILD_DATE_D 17 +#define BUILD_DATE_HO 21 +#define BUILD_DATE_MI 41 +#define BUILD_DATE_SE 16 // Tolerable time difference #define ALLOW_TIMESTAMP_DIFF (UINT64)(3 * 24 * 60 * 60 * 1000) @@ -1052,6 +1052,7 @@ typedef struct CEDAR LOCK *FifoBudgetLock; // Fifo budget lock UINT FifoBudget; // Fifo budget bool AcceptOnlyTls; // Accept only TLS (Disable SSL) + char OpenVPNDefaultClientOption[MAX_SIZE]; // OpenVPN Default Client Option String } CEDAR; // Type of CEDAR diff --git a/src/Cedar/CedarType.h b/src/Cedar/CedarType.h index e9a1414e..5bd9d2c8 100644 --- a/src/Cedar/CedarType.h +++ b/src/Cedar/CedarType.h @@ -137,6 +137,13 @@ typedef struct AUTHRADIUS AUTHRADIUS; typedef struct AUTHNT AUTHNT; +// ============================================================== +// RADIUS +// ============================================================== + +typedef struct RADIUS_LOGIN_OPTION RADIUS_LOGIN_OPTION; + + // ============================================================== // Listener // ============================================================== diff --git a/src/Cedar/Hub.c b/src/Cedar/Hub.c index 2ffd1528..bb99d434 100644 --- a/src/Cedar/Hub.c +++ b/src/Cedar/Hub.c @@ -597,6 +597,7 @@ void DataToHubOptionStruct(HUB_OPTION *o, RPC_ADMIN_OPTION *ao) GetHubAdminOptionDataAndSet(ao, "DropArpInPrivacyFilterMode", &o->DropArpInPrivacyFilterMode); GetHubAdminOptionDataAndSet(ao, "SuppressClientUpdateNotification", &o->SuppressClientUpdateNotification); GetHubAdminOptionDataAndSet(ao, "FloodingSendQueueBufferQuota", &o->FloodingSendQueueBufferQuota); + GetHubAdminOptionDataAndSet(ao, "AssignVLanIdByRadiusAttribute", &o->AssignVLanIdByRadiusAttribute); } // Convert the contents of the HUB_OPTION to data @@ -662,6 +663,7 @@ void HubOptionStructToData(RPC_ADMIN_OPTION *ao, HUB_OPTION *o, char *hub_name) Add(aol, NewAdminOption("DropArpInPrivacyFilterMode", o->DropArpInPrivacyFilterMode)); Add(aol, NewAdminOption("SuppressClientUpdateNotification", o->SuppressClientUpdateNotification)); Add(aol, NewAdminOption("FloodingSendQueueBufferQuota", o->FloodingSendQueueBufferQuota)); + Add(aol, NewAdminOption("AssignVLanIdByRadiusAttribute", o->AssignVLanIdByRadiusAttribute)); Zero(ao, sizeof(RPC_ADMIN_OPTION)); diff --git a/src/Cedar/Hub.h b/src/Cedar/Hub.h index d13d216c..909dc77d 100644 --- a/src/Cedar/Hub.h +++ b/src/Cedar/Hub.h @@ -275,6 +275,7 @@ struct HUB_OPTION bool DropArpInPrivacyFilterMode; // Drop ARP packets if the both source and destination session is PrivacyFilter mode bool SuppressClientUpdateNotification; // Suppress the update notification function on the VPN Client UINT FloodingSendQueueBufferQuota; // The global quota of send queues of flooding packets + bool AssignVLanIdByRadiusAttribute; // Assign the VLAN ID for the VPN session, by the attribute value of RADIUS }; // MAC table entry diff --git a/src/Cedar/Interop_OpenVPN.c b/src/Cedar/Interop_OpenVPN.c index 3d125b7f..3f4ae23d 100644 --- a/src/Cedar/Interop_OpenVPN.c +++ b/src/Cedar/Interop_OpenVPN.c @@ -766,6 +766,7 @@ void OvsSetupSessionParameters(OPENVPN_SERVER *s, OPENVPN_SESSION *se, OPENVPN_C { LIST *o; BUF *b; + char opt_str[MAX_SIZE]; // Validate arguments if (s == NULL || se == NULL || c == NULL || data == NULL) { @@ -779,7 +780,14 @@ void OvsSetupSessionParameters(OPENVPN_SERVER *s, OPENVPN_SESSION *se, OPENVPN_C OvsLog(s, se, c, "LO_OPTION_STR_RECV", data->OptionString); - o = OvsParseOptions(data->OptionString); + Zero(opt_str, sizeof(opt_str)); + StrCpy(opt_str, sizeof(opt_str), data->OptionString); + if (s->Cedar != NULL && (IsEmptyStr(opt_str) || StartWith(opt_str, "V0 UNDEF") || InStr(opt_str, ",") == false)) + { + StrCpy(opt_str, sizeof(opt_str), s->Cedar->OpenVPNDefaultClientOption); + } + + o = OvsParseOptions(opt_str); if (se->Mode == OPENVPN_MODE_UNKNOWN) { diff --git a/src/Cedar/Interop_OpenVPN.h b/src/Cedar/Interop_OpenVPN.h index 3df7fad4..9a33f1bf 100644 --- a/src/Cedar/Interop_OpenVPN.h +++ b/src/Cedar/Interop_OpenVPN.h @@ -311,6 +311,9 @@ struct OPENVPN_SERVER_UDP UINT64 VgsNextGetPublicPortsTick; }; +// OpenVPN Default Client Option String +#define OVPN_DEF_CLIENT_OPTION_STRING "dev-type tun,link-mtu 1500,tun-mtu 1500,cipher AES-128-CBC,auth SHA1,keysize 128,key-method 2,tls-client" + //// Function prototype OPENVPN_SERVER_UDP *NewOpenVpnServerUdp(CEDAR *cedar); diff --git a/src/Cedar/Layer3.c b/src/Cedar/Layer3.c index 75f71c79..946b0173 100644 --- a/src/Cedar/Layer3.c +++ b/src/Cedar/Layer3.c @@ -1031,7 +1031,7 @@ void L3PollingBeacon(L3IF *f) Copy(udp_buf + sizeof(IPV4_HEADER) + sizeof(UDP_HEADER), beacon_str, sizeof(beacon_str)); - udp->Checksum = IpChecksum(udp, sizeof(UDP_HEADER) + sizeof(beacon_str)); + udp->Checksum = CalcChecksumForIPv4(f->IpAddress, dest_ip, 0x11, udp, sizeof(UDP_HEADER) + sizeof(beacon_str), 0); ip->DstIP = dest_ip; IPV4_SET_VERSION(ip, 4); diff --git a/src/Cedar/Protocol.c b/src/Cedar/Protocol.c index 9ad1906e..7599a28b 100644 --- a/src/Cedar/Protocol.c +++ b/src/Cedar/Protocol.c @@ -842,24 +842,24 @@ void GenerateMachineUniqueHash(void *data) { BUF *b; char name[64]; - char ip_str[64]; - IP ip; OS_INFO *osinfo; + UINT64 iphash = 0; // Validate arguments if (data == NULL) { return; } + iphash = GetHostIPAddressListHash(); + b = NewBuf(); GetMachineName(name, sizeof(name)); - GetMachineIp(&ip); - IPToStr(ip_str, sizeof(ip_str), &ip); osinfo = GetOsInfo(); WriteBuf(b, name, StrLen(name)); - WriteBuf(b, ip_str, StrLen(ip_str)); + + WriteBufInt64(b, iphash); WriteBuf(b, &osinfo->OsType, sizeof(osinfo->OsType)); WriteBuf(b, osinfo->KernelName, StrLen(osinfo->KernelName)); @@ -1265,6 +1265,7 @@ bool ServerAccept(CONNECTION *c) RC4_KEY_PAIR key_pair; UINT authtype; POLICY *policy; + UINT assigned_vlan_id = 0; HUB *hub; SESSION *s = NULL; UINT64 user_expires = 0; @@ -1330,6 +1331,8 @@ bool ServerAccept(CONNECTION *c) return false; } + GenerateMachineUniqueHash(unique2); + Zero(ctoken_hash_str, sizeof(ctoken_hash_str)); Zero(mschap_v2_server_response_20, sizeof(mschap_v2_server_response_20)); @@ -1623,6 +1626,8 @@ bool ServerAccept(CONNECTION *c) USER *user; USERGROUP *group; char plain_password[MAX_PASSWORD_LEN + 1]; + RADIUS_LOGIN_OPTION radius_login_opt; + if (hub->Halt || hub->Offline) { // HUB is off-line @@ -1633,6 +1638,13 @@ bool ServerAccept(CONNECTION *c) goto CLEANUP; } + Zero(&radius_login_opt, sizeof(radius_login_opt)); + + if (hub->Option != NULL) + { + radius_login_opt.In_CheckVLanId = hub->Option->AssignVLanIdByRadiusAttribute; + } + // Get the various flags use_encrypt = PackGetInt(p, "use_encrypt") == 0 ? false : true; use_compress = PackGetInt(p, "use_compress") == 0 ? false : true; @@ -1997,7 +2009,7 @@ bool ServerAccept(CONNECTION *c) if (fail_ext_user_auth == false) { - auth_ret = SamAuthUserByPlainPassword(c, hub, username, plain_password, false, mschap_v2_server_response_20); + auth_ret = SamAuthUserByPlainPassword(c, hub, username, plain_password, false, mschap_v2_server_response_20, &radius_login_opt); } if (auth_ret && pol == NULL) @@ -2028,7 +2040,7 @@ bool ServerAccept(CONNECTION *c) // If there is asterisk user, log on as the user if (b) { - auth_ret = SamAuthUserByPlainPassword(c, hub, username, plain_password, true, mschap_v2_server_response_20); + auth_ret = SamAuthUserByPlainPassword(c, hub, username, plain_password, true, mschap_v2_server_response_20, &radius_login_opt); if (auth_ret && pol == NULL) { pol = SamGetUserPolicy(hub, "*"); @@ -2180,6 +2192,12 @@ bool ServerAccept(CONNECTION *c) // Authentication success FreePack(p); + // Check the assigned VLAN ID + if (radius_login_opt.Out_VLanId != 0) + { + assigned_vlan_id = radius_login_opt.Out_VLanId; + } + if (StrCmpi(username, ADMINISTRATOR_USERNAME) != 0) { // Get the policy @@ -2468,8 +2486,6 @@ bool ServerAccept(CONNECTION *c) policy->NoRouting = true; } - GenerateMachineUniqueHash(unique2); - if (Cmp(unique, unique2, SHA1_SIZE) == 0) { // It's a localhost session @@ -2865,6 +2881,18 @@ bool ServerAccept(CONNECTION *c) // Remove the connection from Cedar DelConnection(c->Cedar, c); + // VLAN ID + if (assigned_vlan_id != 0) + { + if (policy != NULL) + { + if (policy->VLanId == 0) + { + policy->VLanId = assigned_vlan_id; + } + } + } + // Create a Session StrLower(username); s = NewServerSessionEx(c->Cedar, c, hub, username, policy, c->IsInProc); @@ -3050,6 +3078,7 @@ bool ServerAccept(CONNECTION *c) s->QoS = qos; s->NoReconnectToSession = no_reconnect_to_session; + if (policy != NULL) { s->VLanId = policy->VLanId; @@ -3245,6 +3274,11 @@ bool ServerAccept(CONNECTION *c) NodeInfoToStr(tmp, sizeof(tmp), &s->NodeInfo); HLog(hub, "LH_NODE_INFO", s->Name, tmp); + + if (s->VLanId != 0) + { + HLog(hub, "LH_VLAN_ID", s->Name, s->VLanId); + } } // Shift the connection to the tunneling mode diff --git a/src/Cedar/Radius.c b/src/Cedar/Radius.c index 82c6f122..34a5ee6f 100644 --- a/src/Cedar/Radius.c +++ b/src/Cedar/Radius.c @@ -114,7 +114,8 @@ #include "CedarPch.h" // Attempts Radius authentication (with specifying retry interval and multiple server) -bool RadiusLogin(CONNECTION *c, char *server, UINT port, UCHAR *secret, UINT secret_size, wchar_t *username, char *password, UINT interval, UCHAR *mschap_v2_server_response_20) +bool RadiusLogin(CONNECTION *c, char *server, UINT port, UCHAR *secret, UINT secret_size, wchar_t *username, char *password, UINT interval, UCHAR *mschap_v2_server_response_20, + RADIUS_LOGIN_OPTION *opt) { UCHAR random[MD5_SIZE]; UCHAR id; @@ -128,6 +129,7 @@ bool RadiusLogin(CONNECTION *c, char *server, UINT port, UCHAR *secret, UINT sec IPC_MSCHAP_V2_AUTHINFO mschap; bool is_mschap; char client_ip_str[MAX_SIZE]; + RADIUS_LOGIN_OPTION opt_dummy; static UINT packet_id = 0; // Validate arguments if (server == NULL || port == 0 || (secret_size != 0 && secret == NULL) || username == NULL || password == NULL) @@ -135,6 +137,15 @@ bool RadiusLogin(CONNECTION *c, char *server, UINT port, UCHAR *secret, UINT sec return false; } + if (opt == NULL) + { + Zero(&opt_dummy, sizeof(opt_dummy)); + + opt = &opt_dummy; + } + + opt->Out_VLanId = 0; + Zero(client_ip_str, sizeof(client_ip_str)); if (c != NULL && c->FirstSock != NULL) { @@ -450,6 +461,34 @@ RECV_RETRY: FreeBuf(b); } } + + if (opt->In_CheckVLanId) + { + BUF *buf = NewBufFromMemory(recv_buf, recv_size); + LIST *o = RadiusParseOptions(buf); + + if (o != NULL) + { + DHCP_OPTION *vlan_option = GetDhcpOption(o, RADIUS_ATTRIBUTE_VLAN_ID); + + if (vlan_option != NULL) + { + UINT vlan_id = 0; + char tmp[32]; + + Zero(tmp, sizeof(tmp)); + + Copy(tmp, vlan_option->Data, MIN(vlan_option->Size, sizeof(tmp) - 1)); + + vlan_id = ToInt(tmp); + + opt->Out_VLanId = vlan_id; + } + } + + FreeBuf(buf); + FreeDhcpOptions(o); + } } break; } @@ -484,6 +523,68 @@ RECV_RETRY: return ret; } +// Parse RADIUS attributes +LIST *RadiusParseOptions(BUF *b) +{ + LIST *o; + UCHAR code; + UCHAR id; + USHORT len; + UCHAR auth[16]; + // Validate arguments + if (b == NULL) + { + return NULL; + } + + o = NewList(NULL); + + ReadBuf(b, &code, 1); + ReadBuf(b, &id, 1); + len = 0; + ReadBuf(b, &len, 2); + len = Endian16(len); + ReadBuf(b, auth, 16); + + while (true) + { + UCHAR attribute_id; + UCHAR size; + UCHAR data[256]; + DHCP_OPTION *d; + + if (ReadBuf(b, &attribute_id, 1) != 1) + { + break; + } + + if (ReadBuf(b, &size, 1) != 1) + { + break; + } + + if (size <= 2) + { + break; + } + + size -= 2; + if (ReadBuf(b, data, size) != size) + { + break; + } + + d = ZeroMalloc(sizeof(DHCP_OPTION)); + d->Id = attribute_id; + d->Size = size; + d->Data = Clone(data, d->Size); + + Add(o, d); + } + + return o; +} + // Adding Attributes void RadiusAddValue(BUF *b, UCHAR t, UINT v, UCHAR vt, void *data, UINT size) { diff --git a/src/Cedar/Radius.h b/src/Cedar/Radius.h index 9c86c587..6c27fee2 100644 --- a/src/Cedar/Radius.h +++ b/src/Cedar/Radius.h @@ -118,13 +118,25 @@ #define RADIUS_RETRY_INTERVAL 500 // Retransmission interval #define RADIUS_RETRY_TIMEOUT (10 * 1000) // Time-out period + +// RADIUS attributes +#define RADIUS_ATTRIBUTE_VLAN_ID 81 + +struct RADIUS_LOGIN_OPTION +{ + bool In_CheckVLanId; + UINT Out_VLanId; +}; + // Function prototype -bool RadiusLogin(CONNECTION *c, char *server, UINT port, UCHAR *secret, UINT secret_size, wchar_t *username, char *password, UINT interval, UCHAR *mschap_v2_server_response_20); +bool RadiusLogin(CONNECTION *c, char *server, UINT port, UCHAR *secret, UINT secret_size, wchar_t *username, char *password, UINT interval, UCHAR *mschap_v2_server_response_20, + RADIUS_LOGIN_OPTION *opt); BUF *RadiusEncryptPassword(char *password, UCHAR *random, UCHAR *secret, UINT secret_size); BUF *RadiusCreateUserName(wchar_t *username); BUF *RadiusCreateUserPassword(void *data, UINT size); BUF *RadiusCreateNasId(char *name); void RadiusAddValue(BUF *b, UCHAR t, UINT v, UCHAR vt, void *data, UINT size); +LIST *RadiusParseOptions(BUF *b); #endif // RADIUS_H diff --git a/src/Cedar/SW.c b/src/Cedar/SW.c index 929f98d5..260a5342 100644 --- a/src/Cedar/SW.c +++ b/src/Cedar/SW.c @@ -2670,7 +2670,7 @@ void SwDefineTasks(SW *sw, SW_TASK *t, SW_COMPONENT *c) SW_TASK_COPY *vpninstall; wchar_t *src_config_filename; - CombinePathW(tmp, sizeof(tmp), sw->InstallDir, L"backup.vpn_vpnclient.config"); + CombinePathW(tmp, sizeof(tmp), sw->InstallDir, L"backup.vpn_client.config"); Add(t->SetSecurityPaths, CopyUniStr(tmp)); if (x64 == false) diff --git a/src/Cedar/Sam.c b/src/Cedar/Sam.c index 1072376d..5e8d85d1 100644 --- a/src/Cedar/Sam.c +++ b/src/Cedar/Sam.c @@ -175,7 +175,7 @@ bool SamAuthUserByAnonymous(HUB *h, char *username) } // Plaintext password authentication of user -bool SamAuthUserByPlainPassword(CONNECTION *c, HUB *hub, char *username, char *password, bool ast, UCHAR *mschap_v2_server_response_20) +bool SamAuthUserByPlainPassword(CONNECTION *c, HUB *hub, char *username, char *password, bool ast, UCHAR *mschap_v2_server_response_20, RADIUS_LOGIN_OPTION *opt) { bool b = false; wchar_t *name = NULL; @@ -267,7 +267,7 @@ bool SamAuthUserByPlainPassword(CONNECTION *c, HUB *hub, char *username, char *p // Attempt to login b = RadiusLogin(c, radius_server_addr, radius_server_port, radius_secret, StrLen(radius_secret), - name, password, interval, mschap_v2_server_response_20); + name, password, interval, mschap_v2_server_response_20, opt); } Lock(hub->lock); diff --git a/src/Cedar/Sam.h b/src/Cedar/Sam.h index c2bd9817..ca58f06f 100644 --- a/src/Cedar/Sam.h +++ b/src/Cedar/Sam.h @@ -121,7 +121,7 @@ UINT SamGetUserAuthType(HUB *h, char *username); bool SamAuthUserByPassword(HUB *h, char *username, void *random, void *secure_password, char *mschap_v2_password, UCHAR *mschap_v2_server_response_20, UINT *err); bool SamAuthUserByAnonymous(HUB *h, char *username); bool SamAuthUserByCert(HUB *h, char *username, X *x); -bool SamAuthUserByPlainPassword(CONNECTION *c, HUB *hub, char *username, char *password, bool ast, UCHAR *mschap_v2_server_response_20); +bool SamAuthUserByPlainPassword(CONNECTION *c, HUB *hub, char *username, char *password, bool ast, UCHAR *mschap_v2_server_response_20, RADIUS_LOGIN_OPTION *opt); POLICY *SamGetUserPolicy(HUB *h, char *username); void GenRamdom(void *random); diff --git a/src/Cedar/Server.c b/src/Cedar/Server.c index 161c6760..08b1fb3d 100644 --- a/src/Cedar/Server.c +++ b/src/Cedar/Server.c @@ -260,6 +260,7 @@ UINT SiDebug(SERVER *s, RPC_TEST *ret, UINT i, char *str) {10, "Get VgsMessageDisplayed Flag", "", SiDebugProcGetVgsMessageDisplayedValue}, {11, "Set VgsMessageDisplayed Flag", "", SiDebugProcSetVgsMessageDisplayedValue}, {12, "Get the current TCP send queue length", "", SiDebugProcGetCurrentTcpSendQueueLength}, + {13, "Get the current GetIP thread count", "", SiDebugProcGetCurrentGetIPThreadCount}, }; UINT num_proc_list = sizeof(proc_list) / sizeof(proc_list[0]); UINT j; @@ -478,6 +479,25 @@ UINT SiDebugProcGetCurrentTcpSendQueueLength(SERVER *s, char *in_str, char *ret_ return ERR_NO_ERROR; } +UINT SiDebugProcGetCurrentGetIPThreadCount(SERVER *s, char *in_str, char *ret_str, UINT ret_str_size) +{ + char tmp1[64], tmp2[64]; + // Validate arguments + if (s == NULL || in_str == NULL || ret_str == NULL) + { + return ERR_INVALID_PARAMETER; + } + + ToStr3(tmp1, 0, GetCurrentGetIpThreadNum()); + ToStr3(tmp2, 0, GetGetIpThreadMaxNum()); + + Format(ret_str, 0, + "Current threads = %s\n" + "Quota = %s\n", + tmp1, tmp2); + + return ERR_NO_ERROR; +} UINT SiDebugProcSetVgsMessageDisplayedValue(SERVER *s, char *in_str, char *ret_str, UINT ret_str_size) { // Validate arguments @@ -4081,6 +4101,7 @@ void SiLoadHubOptionCfg(FOLDER *f, HUB_OPTION *o) o->DisableCheckMacOnLocalBridge = CfgGetBool(f, "DisableCheckMacOnLocalBridge"); o->DisableCorrectIpOffloadChecksum = CfgGetBool(f, "DisableCorrectIpOffloadChecksum"); o->SuppressClientUpdateNotification = CfgGetBool(f, "SuppressClientUpdateNotification"); + o->AssignVLanIdByRadiusAttribute = CfgGetBool(f, "AssignVLanIdByRadiusAttribute"); // Enabled by default if (CfgIsItem(f, "ManageOnlyPrivateIP")) @@ -4156,6 +4177,7 @@ void SiWriteHubOptionCfg(FOLDER *f, HUB_OPTION *o) CfgAddBool(f, "DropBroadcastsInPrivacyFilterMode", o->DropBroadcastsInPrivacyFilterMode); CfgAddBool(f, "DropArpInPrivacyFilterMode", o->DropArpInPrivacyFilterMode); CfgAddBool(f, "SuppressClientUpdateNotification", o->SuppressClientUpdateNotification); + CfgAddBool(f, "AssignVLanIdByRadiusAttribute", o->AssignVLanIdByRadiusAttribute); CfgAddBool(f, "NoLookBPDUBridgeId", o->NoLookBPDUBridgeId); CfgAddInt(f, "AdjustTcpMssValue", o->AdjustTcpMssValue); CfgAddBool(f, "DisableAdjustTcpMss", o->DisableAdjustTcpMss); @@ -5748,6 +5770,7 @@ void SiLoadServerCfg(SERVER *s, FOLDER *f) bool cluster_allowed = false; UINT num_connections_per_ip = 0; FOLDER *params_folder; + UINT i; // Validate arguments if (s == NULL || f == NULL) { @@ -5765,6 +5788,16 @@ void SiLoadServerCfg(SERVER *s, FOLDER *f) s->AutoSaveConfigSpan = MAKESURE(s->AutoSaveConfigSpan, SERVER_FILE_SAVE_INTERVAL_MIN, SERVER_FILE_SAVE_INTERVAL_MAX); } + i = CfgGetInt(f, "MaxConcurrentDnsClientThreads"); + if (i != 0) + { + SetGetIpThreadMaxNum(i); + } + else + { + SetGetIpThreadMaxNum(DEFAULT_GETIP_THREAD_MAX_NUM); + } + s->DontBackupConfig = CfgGetBool(f, "DontBackupConfig"); if (CfgIsItem(f, "BackupConfigOnlyWhenModified")) @@ -5900,6 +5933,16 @@ void SiLoadServerCfg(SERVER *s, FOLDER *f) // Disable the OpenVPN server function s->DisableOpenVPNServer = CfgGetBool(f, "DisableOpenVPNServer"); + // OpenVPN Default Option String + if (CfgGetStr(f, "OpenVPNDefaultClientOption", tmp, sizeof(tmp))) + { + if (IsEmptyStr(tmp) == false) + { + StrCpy(c->OpenVPNDefaultClientOption, + sizeof(c->OpenVPNDefaultClientOption), tmp); + } + } + // Disable the NAT-traversal feature s->DisableNatTraversal = CfgGetBool(f, "DisableNatTraversal"); @@ -6190,6 +6233,8 @@ void SiWriteServerCfg(FOLDER *f, SERVER *s) return; } + CfgAddInt(f, "MaxConcurrentDnsClientThreads", GetGetIpThreadMaxNum()); + CfgAddInt(f, "CurrentBuild", s->Cedar->Build); CfgAddInt(f, "AutoSaveConfigSpan", s->AutoSaveConfigSpanSaved / 1000); @@ -6292,6 +6337,8 @@ void SiWriteServerCfg(FOLDER *f, SERVER *s) } } + CfgAddStr(f, "OpenVPNDefaultClientOption", c->OpenVPNDefaultClientOption); + if (c->Bridge == false) { // VPN over ICMP @@ -7431,6 +7478,7 @@ void SiCalledUpdateHub(SERVER *s, PACK *p) o.DropBroadcastsInPrivacyFilterMode = PackGetBool(p, "DropBroadcastsInPrivacyFilterMode"); o.DropArpInPrivacyFilterMode = PackGetBool(p, "DropArpInPrivacyFilterMode"); o.SuppressClientUpdateNotification = PackGetBool(p, "SuppressClientUpdateNotification"); + o.AssignVLanIdByRadiusAttribute = PackGetBool(p, "AssignVLanIdByRadiusAttribute"); o.VlanTypeId = PackGetInt(p, "VlanTypeId"); if (o.VlanTypeId == 0) { @@ -9270,6 +9318,7 @@ void SiPackAddCreateHub(PACK *p, HUB *h) PackAddBool(p, "DropBroadcastsInPrivacyFilterMode", h->Option->DropBroadcastsInPrivacyFilterMode); PackAddBool(p, "DropArpInPrivacyFilterMode", h->Option->DropArpInPrivacyFilterMode); PackAddBool(p, "SuppressClientUpdateNotification", h->Option->SuppressClientUpdateNotification); + PackAddBool(p, "AssignVLanIdByRadiusAttribute", h->Option->AssignVLanIdByRadiusAttribute); PackAddInt(p, "ClientMinimumRequiredBuild", h->Option->ClientMinimumRequiredBuild); PackAddBool(p, "FixForDLinkBPDU", h->Option->FixForDLinkBPDU); PackAddBool(p, "BroadcastLimiterStrictMode", h->Option->BroadcastLimiterStrictMode); @@ -10811,6 +10860,8 @@ SERVER *SiNewServerEx(bool bridge, bool in_client_inner_server) LISTENER *azure; LISTENER *rudp; + SetGetIpThreadMaxNum(DEFAULT_GETIP_THREAD_MAX_NUM); + s = ZeroMalloc(sizeof(SERVER)); SetEraserCheckInterval(0); diff --git a/src/Cedar/Server.h b/src/Cedar/Server.h index ffe5b78d..c722ca43 100644 --- a/src/Cedar/Server.h +++ b/src/Cedar/Server.h @@ -678,6 +678,7 @@ UINT SiDebugProcSetIPsecMessageDisplayedValue(SERVER *s, char *in_str, char *ret UINT SiDebugProcGetVgsMessageDisplayedValue(SERVER *s, char *in_str, char *ret_str, UINT ret_str_size); UINT SiDebugProcSetVgsMessageDisplayedValue(SERVER *s, char *in_str, char *ret_str, UINT ret_str_size); UINT SiDebugProcGetCurrentTcpSendQueueLength(SERVER *s, char *in_str, char *ret_str, UINT ret_str_size); +UINT SiDebugProcGetCurrentGetIPThreadCount(SERVER *s, char *in_str, char *ret_str, UINT ret_str_size); typedef UINT (SI_DEBUG_PROC)(SERVER *s, char *in_str, char *ret_str, UINT ret_str_size); diff --git a/src/Cedar/UdpAccel.c b/src/Cedar/UdpAccel.c index ccdc8e02..0e592e81 100644 --- a/src/Cedar/UdpAccel.c +++ b/src/Cedar/UdpAccel.c @@ -1034,6 +1034,11 @@ UDP_ACCEL *NewUdpAccel(CEDAR *cedar, IP *ip, bool client_mode, bool random_port, a->IsIPv6 = IsIP6(ip); + if (a->IsIPv6) + { + a->NoNatT = true; + } + a->RecvBlockQueue = NewQueue(); Rand(a->NextIv, sizeof(a->NextIv)); @@ -1088,6 +1093,8 @@ void NatT_GetIpThread(THREAD *thread, void *param) { UDP_ACCEL *a; char hostname[MAX_SIZE]; + static IP dummy_ip = {0}; + UINT num_retry = 0; // Validate arguments if (thread == NULL || param == NULL) { @@ -1096,11 +1103,17 @@ void NatT_GetIpThread(THREAD *thread, void *param) a = (UDP_ACCEL *)param; - RUDPGetRegisterHostNameByIP(hostname, sizeof(hostname), NULL); + if (IsZeroIP(&dummy_ip)) + { + SetIP(&dummy_ip, 11, Rand8(), Rand8(), Rand8()); + } + + RUDPGetRegisterHostNameByIP(hostname, sizeof(hostname), &dummy_ip); while (a->NatT_Halt == false) { IP ip; + UINT wait_time = UDP_NAT_T_GET_IP_INTERVAL; // Get the IP address bool ret = GetIP4Ex(&ip, hostname, 0, &a->NatT_Halt); @@ -1125,7 +1138,11 @@ void NatT_GetIpThread(THREAD *thread, void *param) } // Fail to get - Wait(a->NatT_HaltEvent, UDP_NAT_T_GET_IP_INTERVAL); + num_retry++; + + wait_time = (UINT)(MIN((UINT64)UDP_NAT_T_GET_IP_INTERVAL * (UINT64)num_retry, (UINT64)UDP_NAT_T_GET_IP_INTERVAL_MAX)); + + Wait(a->NatT_HaltEvent, wait_time); } } diff --git a/src/CurrentBuild.txt b/src/CurrentBuild.txt index 248c062f..45aa2be7 100644 --- a/src/CurrentBuild.txt +++ b/src/CurrentBuild.txt @@ -1,4 +1,4 @@ -BUILD_NUMBER 9506 -VERSION 411 +BUILD_NUMBER 9514 +VERSION 412 BUILD_NAME beta -BUILD_DATE 20141022_195155 +BUILD_DATE 20141117_214116 diff --git a/src/Makefile64 b/src/Makefile64 new file mode 100644 index 00000000..f02d7deb --- /dev/null +++ b/src/Makefile64 @@ -0,0 +1,361 @@ +# PacketiX VPN Source Code +# Copyright (c) SoftEther Corporation. All Rights Reserved. +# Platform: linux-x86-64bit + +# Variables +CC=gcc + +OPTIONS_COMPILE_DEBUG=-DUNIX_LINUX -DCPU_64 -DCPU_X64 -D_DEBUG -DDEBUG -DUNIX -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./ -I./Cedar/ -I./Mayaqua/ -g -fsigned-char -pthread -m64 + +OPTIONS_LINK_DEBUG=-g -fsigned-char -pthread -m64 -lm -ldl -lrt -lpthread -L./ lib/64/libssl.a lib/64/libcrypto.a lib/64/libiconv.a lib/64/libcharset.a lib/64/libedit.a lib/64/libncurses.a lib/64/libz.a lib/64/libintelaes.a + +OPTIONS_COMPILE_RELEASE=-DUNIX_LINUX -DCPU_64 -DCPU_X64 -DNDEBUG -DVPN_SPEED -DMAYAQUA_REPLACE -DUNIX -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./ -I./Cedar/ -I./Mayaqua/ -O2 -fsigned-char -pthread -m64 + +OPTIONS_LINK_RELEASE=-O2 -fsigned-char -pthread -m64 -lm -ldl -lrt -lpthread -L./ lib/64/libssl.a lib/64/libcrypto.a lib/64/libiconv.a lib/64/libcharset.a lib/64/libedit.a lib/64/libncurses.a lib/64/libz.a lib/64/libintelaes.a + +ifeq ($(DEBUG),YES) + OPTIONS_COMPILE=$(OPTIONS_COMPILE_DEBUG) + OPTIONS_LINK=$(OPTIONS_LINK_DEBUG) +else + OPTIONS_COMPILE=$(OPTIONS_COMPILE_RELEASE) + OPTIONS_LINK=$(OPTIONS_LINK_RELEASE) +endif + +# Files +HEADERS_MAYAQUA=Mayaqua/Cfg.h Mayaqua/cryptoki.h Mayaqua/Encrypt.h Mayaqua/FileIO.h Mayaqua/intelaes/iaesni.h Mayaqua/Internat.h Mayaqua/Kernel.h Mayaqua/Mayaqua.h Mayaqua/MayaType.h Mayaqua/Memory.h Mayaqua/Microsoft.h Mayaqua/Network.h Mayaqua/Object.h Mayaqua/openssl/aes.h Mayaqua/openssl/asn1.h Mayaqua/openssl/asn1_mac.h Mayaqua/openssl/asn1t.h Mayaqua/openssl/bio.h Mayaqua/openssl/blowfish.h Mayaqua/openssl/bn.h Mayaqua/openssl/buffer.h Mayaqua/openssl/cast.h Mayaqua/openssl/comp.h Mayaqua/openssl/conf.h Mayaqua/openssl/conf_api.h Mayaqua/openssl/crypto.h Mayaqua/openssl/des.h Mayaqua/openssl/des_old.h Mayaqua/openssl/dh.h Mayaqua/openssl/dsa.h Mayaqua/openssl/dso.h Mayaqua/openssl/dtls1.h Mayaqua/openssl/e_os2.h Mayaqua/openssl/ebcdic.h Mayaqua/openssl/ec.h Mayaqua/openssl/ecdh.h Mayaqua/openssl/ecdsa.h Mayaqua/openssl/engine.h Mayaqua/openssl/err.h Mayaqua/openssl/evp.h Mayaqua/openssl/fips.h Mayaqua/openssl/fips_rand.h Mayaqua/openssl/hmac.h Mayaqua/openssl/idea.h Mayaqua/openssl/krb5_asn.h Mayaqua/openssl/kssl.h Mayaqua/openssl/lhash.h Mayaqua/openssl/md2.h Mayaqua/openssl/md4.h Mayaqua/openssl/md5.h Mayaqua/openssl/mdc2.h Mayaqua/openssl/obj_mac.h Mayaqua/openssl/objects.h Mayaqua/openssl/ocsp.h Mayaqua/openssl/opensslconf.h Mayaqua/openssl/opensslv.h Mayaqua/openssl/ossl_typ.h Mayaqua/openssl/pem.h Mayaqua/openssl/pem2.h Mayaqua/openssl/pkcs12.h Mayaqua/openssl/pkcs7.h Mayaqua/openssl/pq_compat.h Mayaqua/openssl/pqueue.h Mayaqua/openssl/rand.h Mayaqua/openssl/rc2.h Mayaqua/openssl/rc4.h Mayaqua/openssl/rc5.h Mayaqua/openssl/ripemd.h Mayaqua/openssl/rsa.h Mayaqua/openssl/safestack.h Mayaqua/openssl/sha.h Mayaqua/openssl/ssl.h Mayaqua/openssl/ssl2.h Mayaqua/openssl/ssl23.h Mayaqua/openssl/ssl3.h Mayaqua/openssl/stack.h Mayaqua/openssl/store.h Mayaqua/openssl/symhacks.h Mayaqua/openssl/tls1.h Mayaqua/openssl/tmdiff.h Mayaqua/openssl/txt_db.h Mayaqua/openssl/ui.h Mayaqua/openssl/ui_compat.h Mayaqua/openssl/x509.h Mayaqua/openssl/x509_vfy.h Mayaqua/openssl/x509v3.h Mayaqua/OS.h Mayaqua/Pack.h Mayaqua/pkcs11.h Mayaqua/pkcs11f.h Mayaqua/pkcs11t.h Mayaqua/Secure.h Mayaqua/Str.h Mayaqua/Table.h Mayaqua/TcpIp.h Mayaqua/Tick64.h Mayaqua/Tracking.h Mayaqua/TunTap.h Mayaqua/Unix.h Mayaqua/Win32.h Mayaqua/zlib/zconf.h Mayaqua/zlib/zlib.h +HEADERS_CEDAR=Cedar/Account.h Cedar/Admin.h Cedar/AzureClient.h Cedar/AzureServer.h Cedar/Bridge.h Cedar/BridgeUnix.h Cedar/BridgeWin32.h Cedar/Cedar.h Cedar/CedarPch.h Cedar/CedarType.h Cedar/Client.h Cedar/CM.h Cedar/CMInner.h Cedar/Command.h Cedar/Connection.h Cedar/Console.h Cedar/Database.h Cedar/DDNS.h Cedar/EM.h Cedar/EMInner.h Cedar/EtherLog.h Cedar/Hub.h Cedar/Interop_OpenVPN.h Cedar/Interop_SSTP.h Cedar/IPsec.h Cedar/IPsec_EtherIP.h Cedar/IPsec_IKE.h Cedar/IPsec_IkePacket.h Cedar/IPsec_IPC.h Cedar/IPsec_L2TP.h Cedar/IPsec_PPP.h Cedar/IPsec_Win7.h Cedar/IPsec_Win7Inner.h Cedar/Layer3.h Cedar/Link.h Cedar/Listener.h Cedar/Logging.h Cedar/Nat.h Cedar/NativeStack.h Cedar/NM.h Cedar/NMInner.h Cedar/NullLan.h Cedar/Protocol.h Cedar/Radius.h Cedar/Remote.h Cedar/Sam.h Cedar/SecureInfo.h Cedar/SecureNAT.h Cedar/SeLowUser.h Cedar/Server.h Cedar/Session.h Cedar/SM.h Cedar/SMInner.h Cedar/SW.h Cedar/SWInner.h Cedar/UdpAccel.h Cedar/UT.h Cedar/VG.h Cedar/Virtual.h Cedar/VLan.h Cedar/VLanUnix.h Cedar/VLanWin32.h Cedar/WaterMark.h Cedar/WebUI.h Cedar/Win32Com.h Cedar/WinUi.h Cedar/Wpc.h +OBJECTS_MAYAQUA=object/Mayaqua/Cfg.o object/Mayaqua/Encrypt.o object/Mayaqua/FileIO.o object/Mayaqua/Internat.o object/Mayaqua/Kernel.o object/Mayaqua/Mayaqua.o object/Mayaqua/Memory.o object/Mayaqua/Microsoft.o object/Mayaqua/Network.o object/Mayaqua/Object.o object/Mayaqua/OS.o object/Mayaqua/Pack.o object/Mayaqua/Secure.o object/Mayaqua/Str.o object/Mayaqua/Table.o object/Mayaqua/TcpIp.o object/Mayaqua/Tick64.o object/Mayaqua/Tracking.o object/Mayaqua/Unix.o object/Mayaqua/Win32.o +OBJECTS_CEDAR=object/Cedar/Account.o object/Cedar/Admin.o object/Cedar/AzureClient.o object/Cedar/AzureServer.o object/Cedar/Bridge.o object/Cedar/BridgeUnix.o object/Cedar/BridgeWin32.o object/Cedar/Cedar.o object/Cedar/CedarPch.o object/Cedar/Client.o object/Cedar/CM.o object/Cedar/Command.o object/Cedar/Connection.o object/Cedar/Console.o object/Cedar/Database.o object/Cedar/DDNS.o object/Cedar/EM.o object/Cedar/EtherLog.o object/Cedar/Hub.o object/Cedar/Interop_OpenVPN.o object/Cedar/Interop_SSTP.o object/Cedar/IPsec.o object/Cedar/IPsec_EtherIP.o object/Cedar/IPsec_IKE.o object/Cedar/IPsec_IkePacket.o object/Cedar/IPsec_IPC.o object/Cedar/IPsec_L2TP.o object/Cedar/IPsec_PPP.o object/Cedar/IPsec_Win7.o object/Cedar/Layer3.o object/Cedar/Link.o object/Cedar/Listener.o object/Cedar/Logging.o object/Cedar/Nat.o object/Cedar/NativeStack.o object/Cedar/NM.o object/Cedar/NullLan.o object/Cedar/Protocol.o object/Cedar/Radius.o object/Cedar/Remote.o object/Cedar/Sam.o object/Cedar/SecureInfo.o object/Cedar/SecureNAT.o object/Cedar/SeLowUser.o object/Cedar/Server.o object/Cedar/Session.o object/Cedar/SM.o object/Cedar/SW.o object/Cedar/UdpAccel.o object/Cedar/UT.o object/Cedar/VG.o object/Cedar/Virtual.o object/Cedar/VLan.o object/Cedar/VLanUnix.o object/Cedar/VLanWin32.o object/Cedar/WaterMark.o object/Cedar/WebUI.o object/Cedar/WinUi.o object/Cedar/Wpc.o + +# Build Action +default: build + +build: $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) bin/ham bin/vpnserver bin/vpnbridge bin/vpnclient bin/vpncmd + +# Mayaqua Kernel Code +object/Mayaqua/Cfg.o: Mayaqua/Cfg.c $(HEADERS_MAYAQUA) + @mkdir -p object/ + @mkdir -p object/Mayaqua/ + @mkdir -p object/Cedar/ + @mkdir -p code/ + $(CC) $(OPTIONS_COMPILE) -c Mayaqua/Cfg.c -o object/Mayaqua/Cfg.o + +object/Mayaqua/Encrypt.o: Mayaqua/Encrypt.c $(HEADERS_MAYAQUA) + $(CC) $(OPTIONS_COMPILE) -c Mayaqua/Encrypt.c -o object/Mayaqua/Encrypt.o + +object/Mayaqua/FileIO.o: Mayaqua/FileIO.c $(HEADERS_MAYAQUA) + $(CC) $(OPTIONS_COMPILE) -c Mayaqua/FileIO.c -o object/Mayaqua/FileIO.o + +object/Mayaqua/Internat.o: Mayaqua/Internat.c $(HEADERS_MAYAQUA) + $(CC) $(OPTIONS_COMPILE) -c Mayaqua/Internat.c -o object/Mayaqua/Internat.o + +object/Mayaqua/Kernel.o: Mayaqua/Kernel.c $(HEADERS_MAYAQUA) + $(CC) $(OPTIONS_COMPILE) -c Mayaqua/Kernel.c -o object/Mayaqua/Kernel.o + +object/Mayaqua/Mayaqua.o: Mayaqua/Mayaqua.c $(HEADERS_MAYAQUA) + $(CC) $(OPTIONS_COMPILE) -c Mayaqua/Mayaqua.c -o object/Mayaqua/Mayaqua.o + +object/Mayaqua/Memory.o: Mayaqua/Memory.c $(HEADERS_MAYAQUA) + $(CC) $(OPTIONS_COMPILE) -c Mayaqua/Memory.c -o object/Mayaqua/Memory.o + +object/Mayaqua/Microsoft.o: Mayaqua/Microsoft.c $(HEADERS_MAYAQUA) + $(CC) $(OPTIONS_COMPILE) -c Mayaqua/Microsoft.c -o object/Mayaqua/Microsoft.o + +object/Mayaqua/Network.o: Mayaqua/Network.c $(HEADERS_MAYAQUA) + $(CC) $(OPTIONS_COMPILE) -c Mayaqua/Network.c -o object/Mayaqua/Network.o + +object/Mayaqua/Object.o: Mayaqua/Object.c $(HEADERS_MAYAQUA) + $(CC) $(OPTIONS_COMPILE) -c Mayaqua/Object.c -o object/Mayaqua/Object.o + +object/Mayaqua/OS.o: Mayaqua/OS.c $(HEADERS_MAYAQUA) + $(CC) $(OPTIONS_COMPILE) -c Mayaqua/OS.c -o object/Mayaqua/OS.o + +object/Mayaqua/Pack.o: Mayaqua/Pack.c $(HEADERS_MAYAQUA) + $(CC) $(OPTIONS_COMPILE) -c Mayaqua/Pack.c -o object/Mayaqua/Pack.o + +object/Mayaqua/Secure.o: Mayaqua/Secure.c $(HEADERS_MAYAQUA) + $(CC) $(OPTIONS_COMPILE) -c Mayaqua/Secure.c -o object/Mayaqua/Secure.o + +object/Mayaqua/Str.o: Mayaqua/Str.c $(HEADERS_MAYAQUA) + $(CC) $(OPTIONS_COMPILE) -c Mayaqua/Str.c -o object/Mayaqua/Str.o + +object/Mayaqua/Table.o: Mayaqua/Table.c $(HEADERS_MAYAQUA) + $(CC) $(OPTIONS_COMPILE) -c Mayaqua/Table.c -o object/Mayaqua/Table.o + +object/Mayaqua/TcpIp.o: Mayaqua/TcpIp.c $(HEADERS_MAYAQUA) + $(CC) $(OPTIONS_COMPILE) -c Mayaqua/TcpIp.c -o object/Mayaqua/TcpIp.o + +object/Mayaqua/Tick64.o: Mayaqua/Tick64.c $(HEADERS_MAYAQUA) + $(CC) $(OPTIONS_COMPILE) -c Mayaqua/Tick64.c -o object/Mayaqua/Tick64.o + +object/Mayaqua/Tracking.o: Mayaqua/Tracking.c $(HEADERS_MAYAQUA) + $(CC) $(OPTIONS_COMPILE) -c Mayaqua/Tracking.c -o object/Mayaqua/Tracking.o + +object/Mayaqua/Unix.o: Mayaqua/Unix.c $(HEADERS_MAYAQUA) + $(CC) $(OPTIONS_COMPILE) -c Mayaqua/Unix.c -o object/Mayaqua/Unix.o + +object/Mayaqua/Win32.o: Mayaqua/Win32.c $(HEADERS_MAYAQUA) + $(CC) $(OPTIONS_COMPILE) -c Mayaqua/Win32.c -o object/Mayaqua/Win32.o + +# Cedar Communication Module Code +object/Cedar/Account.o: Cedar/Account.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/Account.c -o object/Cedar/Account.o + +object/Cedar/Admin.o: Cedar/Admin.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/Admin.c -o object/Cedar/Admin.o + +object/Cedar/AzureClient.o: Cedar/AzureClient.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/AzureClient.c -o object/Cedar/AzureClient.o + +object/Cedar/AzureServer.o: Cedar/AzureServer.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/AzureServer.c -o object/Cedar/AzureServer.o + +object/Cedar/Bridge.o: Cedar/Bridge.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) Cedar/BridgeUnix.c + $(CC) $(OPTIONS_COMPILE) -c Cedar/Bridge.c -o object/Cedar/Bridge.o + +object/Cedar/BridgeUnix.o: Cedar/BridgeUnix.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/BridgeUnix.c -o object/Cedar/BridgeUnix.o + +object/Cedar/BridgeWin32.o: Cedar/BridgeWin32.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/BridgeWin32.c -o object/Cedar/BridgeWin32.o + +object/Cedar/Cedar.o: Cedar/Cedar.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/Cedar.c -o object/Cedar/Cedar.o + +object/Cedar/CedarPch.o: Cedar/CedarPch.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/CedarPch.c -o object/Cedar/CedarPch.o + +object/Cedar/Client.o: Cedar/Client.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/Client.c -o object/Cedar/Client.o + +object/Cedar/CM.o: Cedar/CM.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/CM.c -o object/Cedar/CM.o + +object/Cedar/Command.o: Cedar/Command.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/Command.c -o object/Cedar/Command.o + +object/Cedar/Connection.o: Cedar/Connection.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/Connection.c -o object/Cedar/Connection.o + +object/Cedar/Console.o: Cedar/Console.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/Console.c -o object/Cedar/Console.o + +object/Cedar/Database.o: Cedar/Database.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/Database.c -o object/Cedar/Database.o + +object/Cedar/DDNS.o: Cedar/DDNS.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/DDNS.c -o object/Cedar/DDNS.o + +object/Cedar/EM.o: Cedar/EM.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/EM.c -o object/Cedar/EM.o + +object/Cedar/EtherLog.o: Cedar/EtherLog.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/EtherLog.c -o object/Cedar/EtherLog.o + +object/Cedar/Hub.o: Cedar/Hub.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/Hub.c -o object/Cedar/Hub.o + +object/Cedar/Interop_OpenVPN.o: Cedar/Interop_OpenVPN.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/Interop_OpenVPN.c -o object/Cedar/Interop_OpenVPN.o + +object/Cedar/Interop_SSTP.o: Cedar/Interop_SSTP.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/Interop_SSTP.c -o object/Cedar/Interop_SSTP.o + +object/Cedar/IPsec.o: Cedar/IPsec.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/IPsec.c -o object/Cedar/IPsec.o + +object/Cedar/IPsec_EtherIP.o: Cedar/IPsec_EtherIP.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/IPsec_EtherIP.c -o object/Cedar/IPsec_EtherIP.o + +object/Cedar/IPsec_IKE.o: Cedar/IPsec_IKE.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/IPsec_IKE.c -o object/Cedar/IPsec_IKE.o + +object/Cedar/IPsec_IkePacket.o: Cedar/IPsec_IkePacket.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/IPsec_IkePacket.c -o object/Cedar/IPsec_IkePacket.o + +object/Cedar/IPsec_IPC.o: Cedar/IPsec_IPC.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/IPsec_IPC.c -o object/Cedar/IPsec_IPC.o + +object/Cedar/IPsec_L2TP.o: Cedar/IPsec_L2TP.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/IPsec_L2TP.c -o object/Cedar/IPsec_L2TP.o + +object/Cedar/IPsec_PPP.o: Cedar/IPsec_PPP.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/IPsec_PPP.c -o object/Cedar/IPsec_PPP.o + +object/Cedar/IPsec_Win7.o: Cedar/IPsec_Win7.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/IPsec_Win7.c -o object/Cedar/IPsec_Win7.o + +object/Cedar/Layer3.o: Cedar/Layer3.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/Layer3.c -o object/Cedar/Layer3.o + +object/Cedar/Link.o: Cedar/Link.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/Link.c -o object/Cedar/Link.o + +object/Cedar/Listener.o: Cedar/Listener.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/Listener.c -o object/Cedar/Listener.o + +object/Cedar/Logging.o: Cedar/Logging.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/Logging.c -o object/Cedar/Logging.o + +object/Cedar/Nat.o: Cedar/Nat.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/Nat.c -o object/Cedar/Nat.o + +object/Cedar/NativeStack.o: Cedar/NativeStack.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/NativeStack.c -o object/Cedar/NativeStack.o + +object/Cedar/NM.o: Cedar/NM.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/NM.c -o object/Cedar/NM.o + +object/Cedar/NullLan.o: Cedar/NullLan.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/NullLan.c -o object/Cedar/NullLan.o + +object/Cedar/Protocol.o: Cedar/Protocol.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/Protocol.c -o object/Cedar/Protocol.o + +object/Cedar/Radius.o: Cedar/Radius.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/Radius.c -o object/Cedar/Radius.o + +object/Cedar/Remote.o: Cedar/Remote.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/Remote.c -o object/Cedar/Remote.o + +object/Cedar/Sam.o: Cedar/Sam.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/Sam.c -o object/Cedar/Sam.o + +object/Cedar/SecureInfo.o: Cedar/SecureInfo.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/SecureInfo.c -o object/Cedar/SecureInfo.o + +object/Cedar/SecureNAT.o: Cedar/SecureNAT.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/SecureNAT.c -o object/Cedar/SecureNAT.o + +object/Cedar/SeLowUser.o: Cedar/SeLowUser.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/SeLowUser.c -o object/Cedar/SeLowUser.o + +object/Cedar/Server.o: Cedar/Server.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/Server.c -o object/Cedar/Server.o + +object/Cedar/Session.o: Cedar/Session.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/Session.c -o object/Cedar/Session.o + +object/Cedar/SM.o: Cedar/SM.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/SM.c -o object/Cedar/SM.o + +object/Cedar/SW.o: Cedar/SW.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/SW.c -o object/Cedar/SW.o + +object/Cedar/UdpAccel.o: Cedar/UdpAccel.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/UdpAccel.c -o object/Cedar/UdpAccel.o + +object/Cedar/UT.o: Cedar/UT.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/UT.c -o object/Cedar/UT.o + +object/Cedar/VG.o: Cedar/VG.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/VG.c -o object/Cedar/VG.o + +object/Cedar/Virtual.o: Cedar/Virtual.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/Virtual.c -o object/Cedar/Virtual.o + +object/Cedar/VLan.o: Cedar/VLan.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/VLan.c -o object/Cedar/VLan.o + +object/Cedar/VLanUnix.o: Cedar/VLanUnix.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/VLanUnix.c -o object/Cedar/VLanUnix.o + +object/Cedar/VLanWin32.o: Cedar/VLanWin32.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/VLanWin32.c -o object/Cedar/VLanWin32.o + +object/Cedar/WaterMark.o: Cedar/WaterMark.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/WaterMark.c -o object/Cedar/WaterMark.o + +object/Cedar/WebUI.o: Cedar/WebUI.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/WebUI.c -o object/Cedar/WebUI.o + +object/Cedar/WinUi.o: Cedar/WinUi.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/WinUi.c -o object/Cedar/WinUi.o + +object/Cedar/Wpc.o: Cedar/Wpc.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Cedar/Wpc.c -o object/Cedar/Wpc.o + +# Ham +bin/ham: code/Ham.a $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) + $(CC) code/Ham.a $(OPTIONS_LINK) -o bin/ham + +code/Ham.a: object/Ham.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) + rm -f code/Ham.a + ar r code/Ham.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) object/Ham.o + ranlib code/Ham.a + +object/Ham.o: Ham/Ham.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c Ham/Ham.c -o object/Ham.o + +# vpnserver +bin/vpnserver: code/vpnserver.a $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) + $(CC) code/vpnserver.a $(OPTIONS_LINK) -o bin/vpnserver + +code/vpnserver.a: object/vpnserver.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) + rm -f code/vpnserver.a + ar r code/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) object/vpnserver.o + ranlib code/vpnserver.a + +object/vpnserver.o: vpnserver/vpnserver.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c vpnserver/vpnserver.c -o object/vpnserver.o + +# vpnbridge +bin/vpnbridge: code/vpnbridge.a $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) + $(CC) code/vpnbridge.a $(OPTIONS_LINK) -o bin/vpnbridge + +code/vpnbridge.a: object/vpnbridge.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) + rm -f code/vpnbridge.a + ar r code/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) object/vpnbridge.o + ranlib code/vpnbridge.a + +object/vpnbridge.o: vpnbridge/vpnbridge.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c vpnbridge/vpnbridge.c -o object/vpnbridge.o + +# vpnclient +bin/vpnclient: code/vpnclient.a $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) + $(CC) code/vpnclient.a $(OPTIONS_LINK) -o bin/vpnclient + +code/vpnclient.a: object/vpnclient.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) + rm -f code/vpnclient.a + ar r code/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) object/vpnclient.o + ranlib code/vpnclient.a + +object/vpnclient.o: vpnclient/vpncsvc.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c vpnclient/vpncsvc.c -o object/vpnclient.o + +# vpncmd +bin/vpncmd: code/vpncmd.a $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) + $(CC) code/vpncmd.a $(OPTIONS_LINK) -o bin/vpncmd + +code/vpncmd.a: object/vpncmd.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) + rm -f code/vpncmd.a + ar r code/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) object/vpncmd.o + ranlib code/vpncmd.a + +object/vpncmd.o: vpncmd/vpncmd.c $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) + $(CC) $(OPTIONS_COMPILE) -c vpncmd/vpncmd.c -o object/vpncmd.o + +# Clean +clean: + -rm -f $(OBJECTS_MAYAQUA) + -rm -f $(OBJECTS_CEDAR) + -rm -f object/Ham.o + -rm -f code/Ham.a + -rm -f bin/ham + -rm -f object/vpnserver.o + -rm -f code/vpnserver.a + -rm -f bin/vpnserver + -rm -f object/vpnbridge.o + -rm -f code/vpnbridge.a + -rm -f bin/vpnbridge + -rm -f object/vpnclient.o + -rm -f code/vpnclient.a + -rm -f bin/vpnclient + -rm -f object/vpncmd.o + -rm -f code/vpncmd.a + -rm -f bin/vpncmd + +# Help Strings +help: + @echo "make [DEBUG=YES]" + diff --git a/src/Mayaqua/Network.c b/src/Mayaqua/Network.c index bf3231fb..26dfd11e 100644 --- a/src/Mayaqua/Network.c +++ b/src/Mayaqua/Network.c @@ -229,6 +229,8 @@ static LOCK *host_ip_address_list_cache_lock = NULL; static UINT64 host_ip_address_list_cache_last = 0; static LIST *host_ip_address_cache = NULL; static bool disable_gethostname_by_accept = false; +static COUNTER *getip_thread_counter = NULL; +static UINT max_getip_thread = 0; static char *cipher_list = "RC4-MD5 RC4-SHA AES128-SHA AES256-SHA DES-CBC-SHA DES-CBC3-SHA DHE-RSA-AES128-SHA DHE-RSA-AES256-SHA"; @@ -2005,6 +2007,17 @@ bool RUDPIsIpInValidateList(RUDP_STACK *r, IP *ip) return false; } + // Always allow private IP addresses + if (IsIPPrivate(ip)) + { + return true; + } + + if (IsIPAddressInSameLocalNetwork(ip)) + { + return true; + } + for (i = 0;i < LIST_NUM(r->NatT_SourceIpList);i++) { RUDP_SOURCE_IP *s = (RUDP_SOURCE_IP *)LIST_DATA(r->NatT_SourceIpList, i); @@ -4350,6 +4363,7 @@ void RUDPIpQueryThread(THREAD *thread, void *param) void *route_change_poller = NULL; char current_hostname[MAX_SIZE]; bool last_time_ip_changed = false; + UINT num_retry = 0; // Validate arguments if (thread == NULL || param == NULL) { @@ -4429,7 +4443,9 @@ void RUDPIpQueryThread(THREAD *thread, void *param) if (IsZeroIp(&r->NatT_IP)) { - next_getip_tick = now + (UINT64)UDP_NAT_T_GET_IP_INTERVAL; + num_retry++; + + next_getip_tick = now + MIN((UINT64)UDP_NAT_T_GET_IP_INTERVAL * (UINT64)num_retry, (UINT64)UDP_NAT_T_GET_IP_INTERVAL_MAX); } else { @@ -6730,6 +6746,46 @@ bool IsInSameNetwork4(IP *a1, IP *a2, IP *subnet) return false; } +bool IsInSameNetwork4Standard(IP *a1, IP *a2) +{ + IP subnet; + + SetIP(&subnet, 255, 255, 0, 0); + + return IsInSameNetwork4(a1, a2, &subnet); +} +bool IsInSameLocalNetworkToMe4(IP *a) +{ + IP g1, g2; + + Zero(&g1, sizeof(g1)); + Zero(&g2, sizeof(g2)); + + GetCurrentGlobalIPGuess(&g1, false); + + if (IsZeroIp(&g1) == false) + { + if (IsInSameNetwork4Standard(&g1, a)) + { + return true; + } + } + + if (GetCurrentGlobalIP(&g2, false)) + { + if (IsInSameNetwork4Standard(&g2, a)) + { + return true; + } + } + + if (IsIPAddressInSameLocalNetwork(a)) + { + return true; + } + + return false; +} // Check whether it is a network address prefix bool IsNetworkAddress6(IP *ip, IP *subnet) @@ -10926,6 +10982,20 @@ void InitHostCache() HostCacheList = NewList(CompareHostCache); } +// Get the number of wait threads +UINT GetNumWaitThread() +{ + UINT ret = 0; + + LockList(WaitThreadList); + { + ret = LIST_NUM(WaitThreadList); + } + UnlockList(WaitThreadList); + + return ret; +} + // Add the thread to the thread waiting list void AddWaitThread(THREAD *t) { @@ -16631,6 +16701,8 @@ void GetIP4Ex6ExThread(THREAD *t, void *param) ReleaseGetIPThreadParam(p); DelWaitThread(t); + + Dec(getip_thread_counter); } // Perform a forward DNS query (with timeout) @@ -16645,9 +16717,13 @@ bool GetIP4Ex6Ex2(IP *ip, char *hostname_arg, UINT timeout, bool ipv6, bool *can bool ret = false; UINT64 start_tick = 0; UINT64 end_tick = 0; + UINT64 spent_time = 0; + UINT64 now; + UINT n; bool use_dns_proxy = false; char hostname[260]; UINT i; + bool timed_out; // Validate arguments if (ip == NULL || hostname_arg == NULL) { @@ -16718,6 +16794,89 @@ bool GetIP4Ex6Ex2(IP *ip, char *hostname_arg, UINT timeout, bool ipv6, bool *can } + // check the quota + start_tick = Tick64(); + end_tick = start_tick + (UINT64)timeout; + + n = 0; + + timed_out = false; + + while (true) + { + UINT64 now = Tick64(); + UINT64 remain; + UINT remain32; + + if (GetGetIpThreadMaxNum() > GetCurrentGetIpThreadNum()) + { + // below the quota + break; + } + + if (now >= end_tick) + { + // timeouted + timed_out = true; + break; + } + + if (cancel != NULL && (*cancel)) + { + // cancelled + timed_out = true; + break; + } + + remain = end_tick - now; + remain32 = MIN((UINT)remain, 100); + + SleepThread(remain32); + n++; + } + + now = Tick64(); + spent_time = now - start_tick; + + if (n == 0) + { + spent_time = 0; + } + + if ((UINT)spent_time >= timeout) + { + timed_out = true; + } + + if (timed_out) + { + IP ip2; + + // timed out, cancelled + if (QueryDnsCache(&ip2, hostname)) + { + ret = true; + + Copy(ip, &ip2, sizeof(IP)); + } + + Debug("GetIP4Ex6Ex2: Worker thread quota exceeded: max=%u current=%u\n", + GetGetIpThreadMaxNum(), GetCurrentGetIpThreadNum()); + + return ret; + } + + // Increment the counter + Inc(getip_thread_counter); + + if (spent_time != 0) + { + Debug("GetIP4Ex6Ex2: Waited for %u msecs to create a worker thread.\n", + spent_time); + } + + timeout -= (UINT)spent_time; + p = ZeroMalloc(sizeof(GETIP_THREAD_PARAM)); p->Ref = NewRef(); StrCpy(p->HostName, sizeof(p->HostName), hostname); @@ -16774,6 +16933,7 @@ bool GetIP4Ex6Ex2(IP *ip, char *hostname_arg, UINT timeout, bool ipv6, bool *can { IP ip2; +#if 0 if (only_direct_dns == false) { if (ipv6) @@ -16802,6 +16962,7 @@ bool GetIP4Ex6Ex2(IP *ip, char *hostname_arg, UINT timeout, bool ipv6, bool *can } } } +#endif if (QueryDnsCache(&ip2, hostname)) { @@ -17457,6 +17618,27 @@ void FreeSSLCtx(struct ssl_ctx_st *ctx) SSL_CTX_free(ctx); } +// The number of get ip threads +void SetGetIpThreadMaxNum(UINT num) +{ + max_getip_thread = num; +} +UINT GetGetIpThreadMaxNum() +{ + UINT ret = max_getip_thread; + + if (ret == 0) + { + ret = 0x7FFFFFFF; + } + + return ret; +} +UINT GetCurrentGetIpThreadNum() +{ + return Count(getip_thread_counter); +} + // Initialize the network communication module void InitNetwork() { @@ -17471,6 +17653,8 @@ void InitNetwork() num_tcp_connections = NewCounter(); + getip_thread_counter = NewCounter(); + // Initialization of client list InitIpClientList(); @@ -17515,6 +17699,8 @@ void InitNetwork() dh_1024 = DhNewGroup2(); Zero(rand_port_numbers, sizeof(rand_port_numbers)); + + SetGetIpThreadMaxNum(DEFAULT_GETIP_THREAD_MAX_NUM); } // Enable the network name cache @@ -17770,6 +17956,45 @@ void FreePrivateIPFile() g_use_privateip_file = false; } +// Check whether the specified IP address is in the same network to this computer +bool IsIPAddressInSameLocalNetwork(IP *a) +{ + bool ret = false; + LIST *o; + UINT i; + // Validate arguments + if (a == NULL) + { + return false; + } + + o = GetHostIPAddressList(); + + if (o != NULL) + { + for (i = 0;i < LIST_NUM(o);i++) + { + IP *p = LIST_DATA(o, i); + + if (IsIP4(p)) + { + if (IsZeroIp(p) == false && p->addr[0] != 127) + { + if (IsInSameNetwork4Standard(p, a)) + { + ret = true; + break; + } + } + } + } + + FreeHostIPAddressList(o); + } + + return ret; +} + // Guess the IPv4, IPv6 global address from the IP address list of the current interface void GetCurrentGlobalIPGuess(IP *ip, bool ipv6) { @@ -17950,6 +18175,9 @@ void FreeNetwork() FreeDynList(); + DeleteCounter(getip_thread_counter); + getip_thread_counter = NULL; + } // Add a socket to socket list @@ -19114,6 +19342,46 @@ int CmpIpAddressList(void *p1, void *p2) return r; } +// Get the IP address list hash of the host +UINT64 GetHostIPAddressListHash() +{ + UINT i; + LIST *o; + BUF *buf = NewBuf(); + UCHAR hash[SHA1_SIZE]; + UINT64 ret = 0; + + o = GetHostIPAddressList(); + + if (o != NULL) + { + for (i = 0;i < LIST_NUM(o);i++) + { + IP *ip = LIST_DATA(o, i); + char tmp[128]; + + Zero(tmp, sizeof(tmp)); + IPToStr(tmp, sizeof(tmp), ip); + + WriteBufStr(buf, tmp); + } + + FreeHostIPAddressList(o); + } + + WriteBufStr(buf, "test"); + + HashSha1(hash, buf->Buf, buf->Size); + + FreeBuf(buf); + + Copy(&ret, hash, sizeof(UINT64)); + + ret = Endian64(ret); + + return ret; +} + // Get the IP address list of the host (using cache) LIST *GetHostIPAddressList() { diff --git a/src/Mayaqua/Network.h b/src/Mayaqua/Network.h index 60064852..e33c64ce 100644 --- a/src/Mayaqua/Network.h +++ b/src/Mayaqua/Network.h @@ -147,6 +147,13 @@ struct DYN_VALUE #define MAX_NUM_IGNORE_ERRORS 1024 +#ifndef USE_STRATEGY_LOW_MEMORY +#define DEFAULT_GETIP_THREAD_MAX_NUM 512 +#else // USE_STRATEGY_LOW_MEMORY +#define DEFAULT_GETIP_THREAD_MAX_NUM 64 +#endif // USE_STRATEGY_LOW_MEMORY + + // SSL logging function //#define ENABLE_SSL_LOGGING #define SSL_LOGGING_DIRNAME "@ssl_log" @@ -748,6 +755,7 @@ struct RUDP_SESSION // Related to processing to get the IP address of the NAT-T server #define UDP_NAT_T_GET_IP_INTERVAL DYN32(UDP_NAT_T_GET_IP_INTERVAL, (5 * 1000)) // IP address acquisition interval of NAT-T server (before success) +#define UDP_NAT_T_GET_IP_INTERVAL_MAX DYN32(UDP_NAT_T_GET_IP_INTERVAL, (150 * 1000)) // IP address acquisition interval of NAT-T server (before success) #define UDP_NAT_T_GET_IP_INTERVAL_AFTER DYN32(UDP_NAT_T_GET_IP_INTERVAL_AFTER, (5 * 60 * 1000)) // IP address acquisition interval of NAT-T server (after success) // Related to process to get the private IP address of itself with making a TCP connection to the NAT-T server @@ -1418,6 +1426,7 @@ void RouteToStr(char *str, UINT str_size, ROUTE_ENTRY *e); void DebugPrintRoute(ROUTE_ENTRY *e); void DebugPrintRouteTable(ROUTE_TABLE *r); bool IsIPv6LocalNetworkAddress(IP *ip); +UINT GetNumWaitThread(); #ifdef ENABLE_SSL_LOGGING void SockEnableSslLogging(SOCK *s); @@ -1484,6 +1493,8 @@ void IPNot4(IP *dst, IP *a); void IPOr4(IP *dst, IP *a, IP *b); void IPAnd4(IP *dst, IP *a, IP *b); bool IsInSameNetwork4(IP *a1, IP *a2, IP *subnet); +bool IsInSameNetwork4Standard(IP *a1, IP *a2); +bool IsInSameLocalNetworkToMe4(IP *a); bool ParseIpAndSubnetMask4(char *src, UINT *ip, UINT *mask); bool ParseIpAndSubnetMask6(char *src, IP *ip, IP *mask); @@ -1539,6 +1550,7 @@ bool IsMyIPAddress(IP *ip); void FreeHostIPAddressList(LIST *o); void AddHostIPAddressToList(LIST *o, IP *ip); int CmpIpAddressList(void *p1, void *p2); +UINT64 GetHostIPAddressListHash(); UDPLISTENER *NewUdpListener(UDPLISTENER_RECV_PROC *recv_proc, void *param); void UdpListenerThread(THREAD *thread, void *param); @@ -1599,6 +1611,7 @@ bool SslBioSync(SSL_BIO *b, bool sync_send, bool sync_recv); void SetCurrentGlobalIP(IP *ip, bool ipv6); bool GetCurrentGlobalIP(IP *ip, bool ipv6); void GetCurrentGlobalIPGuess(IP *ip, bool ipv6); +bool IsIPAddressInSameLocalNetwork(IP *a); bool IsIPPrivate(IP *ip); bool IsIPMyHost(IP *ip); @@ -1631,6 +1644,11 @@ QUERYIPTHREAD *NewQueryIpThread(char *hostname, UINT interval_last_ok, UINT inte bool GetQueryIpThreadResult(QUERYIPTHREAD *t, IP *ip); void FreeQueryIpThread(QUERYIPTHREAD *t); +void SetGetIpThreadMaxNum(UINT num); +UINT GetGetIpThreadMaxNum(); +UINT GetCurrentGetIpThreadNum(); + + bool IsIpInStrList(IP *ip, char *ip_list); bool IsInStrByStrList(char *str, char *str_list); diff --git a/src/Mayaqua/TcpIp.c b/src/Mayaqua/TcpIp.c index 83e3e226..b299accc 100644 --- a/src/Mayaqua/TcpIp.c +++ b/src/Mayaqua/TcpIp.c @@ -3304,11 +3304,44 @@ BUF *BuildDhcpOptionsBuf(LIST *o) for (i = 0;i < LIST_NUM(o);i++) { DHCP_OPTION *d = LIST_DATA(o, i); + UINT current_size = d->Size; + UINT current_pos = 0; + id = (UCHAR)d->Id; - sz = (UCHAR)d->Size; + if (d->Size <= 255) + { + sz = (UCHAR)d->Size; + } + else + { + sz = 0xFF; + } WriteBuf(b, &id, 1); WriteBuf(b, &sz, 1); - WriteBuf(b, d->Data, d->Size); + WriteBuf(b, d->Data, sz); + + current_size -= sz; + current_pos += sz; + + while (current_size != 0) + { + id = DHCP_ID_PRIVATE; + if (current_size <= 255) + { + sz = (UCHAR)current_size; + } + else + { + sz = 0xFF; + } + WriteBuf(b, &id, 1); + WriteBuf(b, &sz, 1); + WriteBuf(b, ((UCHAR *)d->Data) + current_pos, sz); + + current_size -= sz; + current_pos += sz; + } + } id = 0xff; @@ -3755,27 +3788,24 @@ BUF *DhcpBuildClasslessRouteData(DHCP_CLASSLESS_ROUTE_TABLE *t) if (r->Exists && r->SubnetMaskLen <= 32) { - if (b->Size <= (255 - 9)) - { - UCHAR c; - UINT data_len; - UINT ip32; - UCHAR tmp[4]; + UCHAR c; + UINT data_len; + UINT ip32; + UCHAR tmp[4]; - // Width of subnet mask - c = (UCHAR)r->SubnetMaskLen; - WriteBuf(b, &c, 1); + // Width of subnet mask + c = (UCHAR)r->SubnetMaskLen; + WriteBuf(b, &c, 1); - // Number of significant octets - data_len = (r->SubnetMaskLen + 7) / 8; - Zero(tmp, sizeof(tmp)); - Copy(tmp, &r->Network, data_len); - WriteBuf(b, tmp, data_len); + // Number of significant octets + data_len = (r->SubnetMaskLen + 7) / 8; + Zero(tmp, sizeof(tmp)); + Copy(tmp, &r->Network, data_len); + WriteBuf(b, tmp, data_len); - // Gateway - ip32 = IPToUINT(&r->Gateway); - WriteBuf(b, &ip32, sizeof(UINT)); - } + // Gateway + ip32 = IPToUINT(&r->Gateway); + WriteBuf(b, &ip32, sizeof(UINT)); } } @@ -3965,6 +3995,7 @@ LIST *ParseDhcpOptions(void *data, UINT size) { BUF *b; LIST *o; + DHCP_OPTION *last_opt; // Validate arguments if (data == NULL) { @@ -3977,6 +4008,8 @@ LIST *ParseDhcpOptions(void *data, UINT size) o = NewListFast(NULL); + last_opt = NULL; + while (true) { UCHAR c = 0; @@ -3995,12 +4028,27 @@ LIST *ParseDhcpOptions(void *data, UINT size) break; } - opt = ZeroMalloc(sizeof(DHCP_OPTION)); - opt->Id = (UINT)c; - opt->Size = (UINT)sz; - opt->Data = ZeroMalloc((UINT)sz); - ReadBuf(b, opt->Data, sz); - Add(o, opt); + if (c == DHCP_ID_PRIVATE && last_opt != NULL) + { + UINT new_size = last_opt->Size + (UINT)sz; + UCHAR *new_buf = ZeroMalloc(new_size); + Copy(new_buf, last_opt->Data, last_opt->Size); + ReadBuf(b, new_buf + last_opt->Size, sz); + Free(last_opt->Data); + last_opt->Data = new_buf; + last_opt->Size = new_size; + } + else + { + opt = ZeroMalloc(sizeof(DHCP_OPTION)); + opt->Id = (UINT)c; + opt->Size = (UINT)sz; + opt->Data = ZeroMalloc((UINT)sz); + ReadBuf(b, opt->Data, sz); + Add(o, opt); + + last_opt = opt; + } } FreeBuf(b); diff --git a/src/Mayaqua/TcpIp.h b/src/Mayaqua/TcpIp.h index 8cf13c98..2353b37a 100644 --- a/src/Mayaqua/TcpIp.h +++ b/src/Mayaqua/TcpIp.h @@ -625,6 +625,7 @@ struct ICMPV6_HEADER_INFO #define DHCP_ID_REQ_PARAM_LIST 0x37 #define DHCP_ID_CLASSLESS_ROUTE 0x79 #define DHCP_ID_MS_CLASSLESS_ROUTE 0xF9 +#define DHCP_ID_PRIVATE 0xFA // DHCP client action diff --git a/src/bin/hamcore/SeLow_x64.sys b/src/bin/hamcore/SeLow_x64.sys index d70a95fd..5cb5d02b 100644 Binary files a/src/bin/hamcore/SeLow_x64.sys and b/src/bin/hamcore/SeLow_x64.sys differ diff --git a/src/bin/hamcore/SeLow_x86.sys b/src/bin/hamcore/SeLow_x86.sys index 2ec2c5be..1c4d0694 100644 Binary files a/src/bin/hamcore/SeLow_x86.sys and b/src/bin/hamcore/SeLow_x86.sys differ diff --git a/src/bin/hamcore/inf/selow_x64/SeLow_x64.inf b/src/bin/hamcore/inf/selow_x64/SeLow_x64.inf index dcb8b0f7..d5279ad7 100644 --- a/src/bin/hamcore/inf/selow_x64/SeLow_x64.inf +++ b/src/bin/hamcore/inf/selow_x64/SeLow_x64.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = NetTrans ClassGUID = {4D36E975-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_selow.cat @@ -66,5 +66,5 @@ SeLow_Description = "A lightweight helper kernel-mode module for PacketiX VPN -; Auto Generated 20141022_203021.056 +; Auto Generated 20141117_222152.555 diff --git a/src/bin/hamcore/inf/selow_x64/inf.cat b/src/bin/hamcore/inf/selow_x64/inf.cat index 13626a9b..d0eebd13 100644 Binary files a/src/bin/hamcore/inf/selow_x64/inf.cat and b/src/bin/hamcore/inf/selow_x64/inf.cat differ diff --git a/src/bin/hamcore/inf/selow_x86/SeLow_x86.inf b/src/bin/hamcore/inf/selow_x86/SeLow_x86.inf index d30bb511..93e2d919 100644 --- a/src/bin/hamcore/inf/selow_x86/SeLow_x86.inf +++ b/src/bin/hamcore/inf/selow_x86/SeLow_x86.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = NetTrans ClassGUID = {4D36E975-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_selow.cat @@ -66,5 +66,5 @@ SeLow_Description = "A lightweight helper kernel-mode module for PacketiX VPN -; Auto Generated 20141022_202525.677 +; Auto Generated 20141117_221645.757 diff --git a/src/bin/hamcore/inf/selow_x86/inf.cat b/src/bin/hamcore/inf/selow_x86/inf.cat index 7d1b8052..a3af2929 100644 Binary files a/src/bin/hamcore/inf/selow_x86/inf.cat and b/src/bin/hamcore/inf/selow_x86/inf.cat differ diff --git a/src/bin/hamcore/inf/x64/INF_VPN.inf b/src/bin/hamcore/inf/x64/INF_VPN.inf index 7d057041..b1130ef6 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN10.inf b/src/bin/hamcore/inf/x64/INF_VPN10.inf index 39668e2d..7c3562c3 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN10.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN10.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN10.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN100.inf b/src/bin/hamcore/inf/x64/INF_VPN100.inf index 09120a4a..0a0f31bb 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN100.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN100.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN100.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN101.inf b/src/bin/hamcore/inf/x64/INF_VPN101.inf index be43da39..64679117 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN101.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN101.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN101.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN102.inf b/src/bin/hamcore/inf/x64/INF_VPN102.inf index c76e2972..73a87e99 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN102.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN102.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN102.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN103.inf b/src/bin/hamcore/inf/x64/INF_VPN103.inf index c6aec034..12544449 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN103.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN103.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN103.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN104.inf b/src/bin/hamcore/inf/x64/INF_VPN104.inf index 455785e2..973a11e2 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN104.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN104.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN104.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN105.inf b/src/bin/hamcore/inf/x64/INF_VPN105.inf index 6161851a..b2ae855d 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN105.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN105.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN105.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN106.inf b/src/bin/hamcore/inf/x64/INF_VPN106.inf index abd8678b..330cbf98 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN106.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN106.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN106.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN107.inf b/src/bin/hamcore/inf/x64/INF_VPN107.inf index 796183b2..eebcda8f 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN107.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN107.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN107.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN108.inf b/src/bin/hamcore/inf/x64/INF_VPN108.inf index bdd11c39..9b1b71e7 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN108.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN108.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN108.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN109.inf b/src/bin/hamcore/inf/x64/INF_VPN109.inf index a4a7ddae..42f25bbf 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN109.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN109.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN109.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN11.inf b/src/bin/hamcore/inf/x64/INF_VPN11.inf index d5248fd5..407bca96 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN11.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN11.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN11.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN110.inf b/src/bin/hamcore/inf/x64/INF_VPN110.inf index a9bbb2e8..182328bc 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN110.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN110.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN110.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN111.inf b/src/bin/hamcore/inf/x64/INF_VPN111.inf index 8db0b726..fb206660 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN111.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN111.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN111.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN112.inf b/src/bin/hamcore/inf/x64/INF_VPN112.inf index d3d6323a..de433dc4 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN112.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN112.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN112.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN113.inf b/src/bin/hamcore/inf/x64/INF_VPN113.inf index 57fd8a42..0f52ed82 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN113.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN113.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN113.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN114.inf b/src/bin/hamcore/inf/x64/INF_VPN114.inf index 5ff197a8..582dd363 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN114.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN114.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN114.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN115.inf b/src/bin/hamcore/inf/x64/INF_VPN115.inf index eb800d30..08cde77b 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN115.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN115.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN115.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN116.inf b/src/bin/hamcore/inf/x64/INF_VPN116.inf index 3fd8b7fb..3253bfa0 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN116.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN116.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN116.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN117.inf b/src/bin/hamcore/inf/x64/INF_VPN117.inf index 1837acef..83a2fc80 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN117.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN117.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN117.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN118.inf b/src/bin/hamcore/inf/x64/INF_VPN118.inf index e3920645..7ea1e18c 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN118.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN118.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN118.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN119.inf b/src/bin/hamcore/inf/x64/INF_VPN119.inf index 17316e68..ac9b4f75 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN119.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN119.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN119.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN12.inf b/src/bin/hamcore/inf/x64/INF_VPN12.inf index c0dbe35d..b7556f21 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN12.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN12.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN12.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN120.inf b/src/bin/hamcore/inf/x64/INF_VPN120.inf index abfdb870..fd811f0c 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN120.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN120.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN120.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN121.inf b/src/bin/hamcore/inf/x64/INF_VPN121.inf index af616a5e..75cc630b 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN121.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN121.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN121.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN122.inf b/src/bin/hamcore/inf/x64/INF_VPN122.inf index 5af8d4bf..17906631 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN122.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN122.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN122.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN123.inf b/src/bin/hamcore/inf/x64/INF_VPN123.inf index 43486f1a..288d90ed 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN123.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN123.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN123.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN124.inf b/src/bin/hamcore/inf/x64/INF_VPN124.inf index 0ebe6ae4..58132e4b 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN124.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN124.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN124.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN125.inf b/src/bin/hamcore/inf/x64/INF_VPN125.inf index 717a6418..6c7b1cb0 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN125.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN125.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN125.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN126.inf b/src/bin/hamcore/inf/x64/INF_VPN126.inf index b28a3687..91f0d8fe 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN126.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN126.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN126.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN127.inf b/src/bin/hamcore/inf/x64/INF_VPN127.inf index 70a63960..4033dd5e 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN127.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN127.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN127.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN13.inf b/src/bin/hamcore/inf/x64/INF_VPN13.inf index d447885a..a570c84d 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN13.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN13.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN13.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN14.inf b/src/bin/hamcore/inf/x64/INF_VPN14.inf index 67fff81e..0f51aaab 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN14.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN14.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN14.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN15.inf b/src/bin/hamcore/inf/x64/INF_VPN15.inf index 35d93bd6..d4cbd6de 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN15.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN15.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN15.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN16.inf b/src/bin/hamcore/inf/x64/INF_VPN16.inf index 98ddcb2a..c87c55ec 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN16.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN16.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN16.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN17.inf b/src/bin/hamcore/inf/x64/INF_VPN17.inf index 38e09402..9455f5b3 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN17.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN17.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN17.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN18.inf b/src/bin/hamcore/inf/x64/INF_VPN18.inf index 9e699467..d3938074 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN18.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN18.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN18.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN19.inf b/src/bin/hamcore/inf/x64/INF_VPN19.inf index 0ae852e6..ff0e7575 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN19.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN19.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN19.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN2.inf b/src/bin/hamcore/inf/x64/INF_VPN2.inf index 87cbb6c2..e1e35a27 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN2.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN2.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN2.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN20.inf b/src/bin/hamcore/inf/x64/INF_VPN20.inf index c28acf2e..f087dcf6 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN20.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN20.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN20.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN21.inf b/src/bin/hamcore/inf/x64/INF_VPN21.inf index eeca1f79..f020ab70 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN21.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN21.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN21.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN22.inf b/src/bin/hamcore/inf/x64/INF_VPN22.inf index 83e6dad9..24c4b7da 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN22.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN22.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN22.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN23.inf b/src/bin/hamcore/inf/x64/INF_VPN23.inf index 65452f04..b587e1d7 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN23.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN23.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN23.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN24.inf b/src/bin/hamcore/inf/x64/INF_VPN24.inf index b31fc7fd..b95903fa 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN24.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN24.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN24.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN25.inf b/src/bin/hamcore/inf/x64/INF_VPN25.inf index 9c81b4a6..1b0b7a6d 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN25.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN25.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN25.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN26.inf b/src/bin/hamcore/inf/x64/INF_VPN26.inf index 62b0f670..21e4e3ce 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN26.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN26.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN26.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN27.inf b/src/bin/hamcore/inf/x64/INF_VPN27.inf index 8b00b341..7ae414dd 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN27.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN27.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN27.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN28.inf b/src/bin/hamcore/inf/x64/INF_VPN28.inf index a11acefe..2b964a0a 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN28.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN28.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN28.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN29.inf b/src/bin/hamcore/inf/x64/INF_VPN29.inf index 4c03372f..5b6b00d7 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN29.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN29.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN29.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN3.inf b/src/bin/hamcore/inf/x64/INF_VPN3.inf index 50c1f828..e64e61f7 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN3.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN3.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN3.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN30.inf b/src/bin/hamcore/inf/x64/INF_VPN30.inf index 2f877f75..2b75c948 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN30.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN30.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN30.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN31.inf b/src/bin/hamcore/inf/x64/INF_VPN31.inf index eba45f73..664b74cb 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN31.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN31.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN31.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN32.inf b/src/bin/hamcore/inf/x64/INF_VPN32.inf index e16ed2d0..11d05b7b 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN32.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN32.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN32.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN33.inf b/src/bin/hamcore/inf/x64/INF_VPN33.inf index 968dfa43..1619acc2 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN33.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN33.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN33.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN34.inf b/src/bin/hamcore/inf/x64/INF_VPN34.inf index bff591f2..b2794004 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN34.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN34.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN34.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN35.inf b/src/bin/hamcore/inf/x64/INF_VPN35.inf index b4a39e19..fb2b7317 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN35.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN35.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN35.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN36.inf b/src/bin/hamcore/inf/x64/INF_VPN36.inf index 4a647a4d..e74ccd67 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN36.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN36.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN36.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN37.inf b/src/bin/hamcore/inf/x64/INF_VPN37.inf index 513402c1..b2dd917f 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN37.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN37.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN37.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN38.inf b/src/bin/hamcore/inf/x64/INF_VPN38.inf index 4cbf55d9..27090b46 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN38.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN38.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN38.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN39.inf b/src/bin/hamcore/inf/x64/INF_VPN39.inf index 0fb0d785..17fea9d1 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN39.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN39.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN39.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN4.inf b/src/bin/hamcore/inf/x64/INF_VPN4.inf index 048baf5d..2f6765f9 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN4.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN4.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN4.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN40.inf b/src/bin/hamcore/inf/x64/INF_VPN40.inf index b5fc4d0d..324493e3 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN40.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN40.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN40.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN41.inf b/src/bin/hamcore/inf/x64/INF_VPN41.inf index 79ccb2b7..66439667 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN41.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN41.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN41.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN42.inf b/src/bin/hamcore/inf/x64/INF_VPN42.inf index 01c0f501..78f74b42 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN42.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN42.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN42.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN43.inf b/src/bin/hamcore/inf/x64/INF_VPN43.inf index 55b070c2..199e20c0 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN43.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN43.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN43.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN44.inf b/src/bin/hamcore/inf/x64/INF_VPN44.inf index 3e6394f3..f874f898 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN44.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN44.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN44.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN45.inf b/src/bin/hamcore/inf/x64/INF_VPN45.inf index 64bfb859..94454328 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN45.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN45.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN45.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN46.inf b/src/bin/hamcore/inf/x64/INF_VPN46.inf index 37caf116..a4a2e0c8 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN46.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN46.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN46.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN47.inf b/src/bin/hamcore/inf/x64/INF_VPN47.inf index 5bd95c8e..ecaa47fc 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN47.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN47.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN47.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN48.inf b/src/bin/hamcore/inf/x64/INF_VPN48.inf index 72c29761..5aff03b9 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN48.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN48.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN48.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN49.inf b/src/bin/hamcore/inf/x64/INF_VPN49.inf index 0a14590c..fa08620c 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN49.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN49.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN49.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN5.inf b/src/bin/hamcore/inf/x64/INF_VPN5.inf index 45ac86b8..bb1f5bd3 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN5.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN5.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN5.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN50.inf b/src/bin/hamcore/inf/x64/INF_VPN50.inf index 3bc5d22c..9d83257d 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN50.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN50.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN50.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN51.inf b/src/bin/hamcore/inf/x64/INF_VPN51.inf index 0964f87f..67278f1f 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN51.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN51.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN51.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN52.inf b/src/bin/hamcore/inf/x64/INF_VPN52.inf index 0e9c5ecd..f78ef80f 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN52.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN52.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN52.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN53.inf b/src/bin/hamcore/inf/x64/INF_VPN53.inf index 8ccdf302..223be0d8 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN53.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN53.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN53.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN54.inf b/src/bin/hamcore/inf/x64/INF_VPN54.inf index aa9d4042..3b6ca85e 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN54.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN54.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN54.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN55.inf b/src/bin/hamcore/inf/x64/INF_VPN55.inf index afdc870e..0d98b98b 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN55.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN55.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN55.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN56.inf b/src/bin/hamcore/inf/x64/INF_VPN56.inf index 2fb5b8ce..727b0403 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN56.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN56.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN56.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN57.inf b/src/bin/hamcore/inf/x64/INF_VPN57.inf index 90baa76e..65260c5b 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN57.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN57.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN57.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN58.inf b/src/bin/hamcore/inf/x64/INF_VPN58.inf index 81d5d03d..d54a3f02 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN58.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN58.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN58.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN59.inf b/src/bin/hamcore/inf/x64/INF_VPN59.inf index 336b38ba..b9cbd359 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN59.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN59.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN59.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN6.inf b/src/bin/hamcore/inf/x64/INF_VPN6.inf index 6325ad6b..04843a39 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN6.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN6.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN6.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN60.inf b/src/bin/hamcore/inf/x64/INF_VPN60.inf index 96f0407a..2d6fe614 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN60.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN60.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN60.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN61.inf b/src/bin/hamcore/inf/x64/INF_VPN61.inf index 0a583c5f..5ae9dba4 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN61.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN61.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN61.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN62.inf b/src/bin/hamcore/inf/x64/INF_VPN62.inf index c2c459a3..df63af0b 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN62.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN62.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN62.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN63.inf b/src/bin/hamcore/inf/x64/INF_VPN63.inf index a18fede4..28601029 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN63.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN63.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN63.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN64.inf b/src/bin/hamcore/inf/x64/INF_VPN64.inf index 48798584..7b22f82a 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN64.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN64.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN64.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN65.inf b/src/bin/hamcore/inf/x64/INF_VPN65.inf index 9074ef2b..769353b5 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN65.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN65.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN65.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN66.inf b/src/bin/hamcore/inf/x64/INF_VPN66.inf index 95b852c2..040c367f 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN66.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN66.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN66.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN67.inf b/src/bin/hamcore/inf/x64/INF_VPN67.inf index a5c04957..658b383e 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN67.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN67.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN67.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN68.inf b/src/bin/hamcore/inf/x64/INF_VPN68.inf index bb8ffbfc..8ce43683 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN68.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN68.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN68.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN69.inf b/src/bin/hamcore/inf/x64/INF_VPN69.inf index 05a13e29..9eb768cd 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN69.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN69.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN69.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN7.inf b/src/bin/hamcore/inf/x64/INF_VPN7.inf index 7ffff5be..7cce183d 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN7.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN7.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN7.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN70.inf b/src/bin/hamcore/inf/x64/INF_VPN70.inf index 615b968e..afeee1d6 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN70.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN70.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN70.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN71.inf b/src/bin/hamcore/inf/x64/INF_VPN71.inf index 655720d9..e4700ef7 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN71.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN71.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN71.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN72.inf b/src/bin/hamcore/inf/x64/INF_VPN72.inf index bb153f8b..22db8ceb 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN72.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN72.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN72.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN73.inf b/src/bin/hamcore/inf/x64/INF_VPN73.inf index 5567378c..b7ca129b 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN73.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN73.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN73.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN74.inf b/src/bin/hamcore/inf/x64/INF_VPN74.inf index f49060b7..b18e04a7 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN74.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN74.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN74.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN75.inf b/src/bin/hamcore/inf/x64/INF_VPN75.inf index f5ef1afd..a1e5e848 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN75.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN75.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN75.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN76.inf b/src/bin/hamcore/inf/x64/INF_VPN76.inf index c23c4e00..d9868b4e 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN76.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN76.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN76.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN77.inf b/src/bin/hamcore/inf/x64/INF_VPN77.inf index 3dc7823d..5cd0c14a 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN77.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN77.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN77.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN78.inf b/src/bin/hamcore/inf/x64/INF_VPN78.inf index bd4f80e3..6f906ced 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN78.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN78.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN78.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN79.inf b/src/bin/hamcore/inf/x64/INF_VPN79.inf index 8c27d42a..5eb6f03d 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN79.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN79.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN79.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN8.inf b/src/bin/hamcore/inf/x64/INF_VPN8.inf index f35bef12..f76beed6 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN8.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN8.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN8.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN80.inf b/src/bin/hamcore/inf/x64/INF_VPN80.inf index 696df0b2..0ea0cf32 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN80.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN80.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN80.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN81.inf b/src/bin/hamcore/inf/x64/INF_VPN81.inf index dca4f6f0..8f6acddd 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN81.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN81.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN81.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN82.inf b/src/bin/hamcore/inf/x64/INF_VPN82.inf index 0bd9bbbf..57a3a1eb 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN82.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN82.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN82.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN83.inf b/src/bin/hamcore/inf/x64/INF_VPN83.inf index 514e91e6..cf48556c 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN83.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN83.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN83.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN84.inf b/src/bin/hamcore/inf/x64/INF_VPN84.inf index 44c4d181..b94b8cc5 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN84.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN84.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN84.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN85.inf b/src/bin/hamcore/inf/x64/INF_VPN85.inf index 7188acbe..089b9e16 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN85.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN85.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN85.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN86.inf b/src/bin/hamcore/inf/x64/INF_VPN86.inf index 6c042927..b24ec863 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN86.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN86.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN86.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN87.inf b/src/bin/hamcore/inf/x64/INF_VPN87.inf index 8d0bcadc..dbdc8706 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN87.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN87.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN87.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN88.inf b/src/bin/hamcore/inf/x64/INF_VPN88.inf index 50c016f4..19809f9d 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN88.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN88.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN88.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN89.inf b/src/bin/hamcore/inf/x64/INF_VPN89.inf index 7016c8a2..4ac11b2f 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN89.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN89.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN89.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN9.inf b/src/bin/hamcore/inf/x64/INF_VPN9.inf index f73e14e3..ad30a5c0 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN9.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN9.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN9.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN90.inf b/src/bin/hamcore/inf/x64/INF_VPN90.inf index 054e2355..5f8de0c9 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN90.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN90.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN90.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN91.inf b/src/bin/hamcore/inf/x64/INF_VPN91.inf index 1fdfe2a5..8d791a2c 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN91.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN91.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN91.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN92.inf b/src/bin/hamcore/inf/x64/INF_VPN92.inf index 902f904e..277fe160 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN92.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN92.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN92.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN93.inf b/src/bin/hamcore/inf/x64/INF_VPN93.inf index 558c3828..dbd463bd 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN93.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN93.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN93.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN94.inf b/src/bin/hamcore/inf/x64/INF_VPN94.inf index 38737c21..5e1e07c6 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN94.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN94.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN94.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN95.inf b/src/bin/hamcore/inf/x64/INF_VPN95.inf index d5819be0..1ac4d9f3 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN95.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN95.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN95.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN96.inf b/src/bin/hamcore/inf/x64/INF_VPN96.inf index 96593e5c..56d543ba 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN96.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN96.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN96.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN97.inf b/src/bin/hamcore/inf/x64/INF_VPN97.inf index 39a3d6e0..7730cd3c 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN97.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN97.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN97.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN98.inf b/src/bin/hamcore/inf/x64/INF_VPN98.inf index 8f2d9079..957d0cd4 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN98.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN98.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN98.cat diff --git a/src/bin/hamcore/inf/x64/INF_VPN99.inf b/src/bin/hamcore/inf/x64/INF_VPN99.inf index 63e83cf2..16fa3938 100644 --- a/src/bin/hamcore/inf/x64/INF_VPN99.inf +++ b/src/bin/hamcore/inf/x64/INF_VPN99.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN99.cat diff --git a/src/bin/hamcore/inf/x64/inf.cat b/src/bin/hamcore/inf/x64/inf.cat index f3d13f92..963f6c7a 100644 Binary files a/src/bin/hamcore/inf/x64/inf.cat and b/src/bin/hamcore/inf/x64/inf.cat differ diff --git a/src/bin/hamcore/inf/x86/INF_VPN.inf b/src/bin/hamcore/inf/x86/INF_VPN.inf index 236fff2f..a3df7ad3 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN10.inf b/src/bin/hamcore/inf/x86/INF_VPN10.inf index 597a25af..5f262d20 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN10.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN10.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN10.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN100.inf b/src/bin/hamcore/inf/x86/INF_VPN100.inf index 69ec75b4..f2fcdf7d 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN100.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN100.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN100.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN101.inf b/src/bin/hamcore/inf/x86/INF_VPN101.inf index cc4f4e46..7fca9e1e 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN101.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN101.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN101.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN102.inf b/src/bin/hamcore/inf/x86/INF_VPN102.inf index 40ee238a..debe4245 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN102.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN102.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN102.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN103.inf b/src/bin/hamcore/inf/x86/INF_VPN103.inf index c9976019..72d2d41e 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN103.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN103.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN103.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN104.inf b/src/bin/hamcore/inf/x86/INF_VPN104.inf index acbeb4c8..389f40e3 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN104.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN104.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN104.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN105.inf b/src/bin/hamcore/inf/x86/INF_VPN105.inf index 46920a31..ab2aba5e 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN105.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN105.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN105.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN106.inf b/src/bin/hamcore/inf/x86/INF_VPN106.inf index 6b7874d2..542b63ac 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN106.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN106.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN106.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN107.inf b/src/bin/hamcore/inf/x86/INF_VPN107.inf index 95118188..d150218a 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN107.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN107.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN107.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN108.inf b/src/bin/hamcore/inf/x86/INF_VPN108.inf index 66df7b76..806ec019 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN108.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN108.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN108.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN109.inf b/src/bin/hamcore/inf/x86/INF_VPN109.inf index 6131c058..83083cf1 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN109.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN109.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN109.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN11.inf b/src/bin/hamcore/inf/x86/INF_VPN11.inf index 6710b1a9..67bffe2c 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN11.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN11.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN11.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN110.inf b/src/bin/hamcore/inf/x86/INF_VPN110.inf index 8fa5c1ac..530ef457 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN110.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN110.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN110.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN111.inf b/src/bin/hamcore/inf/x86/INF_VPN111.inf index 501da841..6553389d 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN111.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN111.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN111.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN112.inf b/src/bin/hamcore/inf/x86/INF_VPN112.inf index 96c18780..2091407a 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN112.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN112.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN112.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN113.inf b/src/bin/hamcore/inf/x86/INF_VPN113.inf index 97978de0..ccb2fe31 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN113.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN113.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN113.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN114.inf b/src/bin/hamcore/inf/x86/INF_VPN114.inf index 54fee0d7..247674ef 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN114.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN114.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN114.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN115.inf b/src/bin/hamcore/inf/x86/INF_VPN115.inf index ac9fbb6b..599cc42d 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN115.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN115.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN115.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN116.inf b/src/bin/hamcore/inf/x86/INF_VPN116.inf index 99e38bb7..ee80a098 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN116.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN116.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN116.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN117.inf b/src/bin/hamcore/inf/x86/INF_VPN117.inf index 63f5a2ab..e96f8e4f 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN117.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN117.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN117.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN118.inf b/src/bin/hamcore/inf/x86/INF_VPN118.inf index 35b87483..d6f53891 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN118.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN118.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN118.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN119.inf b/src/bin/hamcore/inf/x86/INF_VPN119.inf index 8be8f21f..9c720423 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN119.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN119.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN119.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN12.inf b/src/bin/hamcore/inf/x86/INF_VPN12.inf index caf5950f..e401e44c 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN12.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN12.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN12.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN120.inf b/src/bin/hamcore/inf/x86/INF_VPN120.inf index 42005a2a..d8f76ec0 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN120.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN120.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN120.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN121.inf b/src/bin/hamcore/inf/x86/INF_VPN121.inf index 348d6871..7f92537e 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN121.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN121.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN121.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN122.inf b/src/bin/hamcore/inf/x86/INF_VPN122.inf index 4554972e..d2ee30e8 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN122.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN122.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN122.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN123.inf b/src/bin/hamcore/inf/x86/INF_VPN123.inf index cbb5a895..5188d3ec 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN123.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN123.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN123.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN124.inf b/src/bin/hamcore/inf/x86/INF_VPN124.inf index 7682869e..774d80a8 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN124.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN124.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN124.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN125.inf b/src/bin/hamcore/inf/x86/INF_VPN125.inf index 2d1789a6..027b69e1 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN125.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN125.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN125.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN126.inf b/src/bin/hamcore/inf/x86/INF_VPN126.inf index ed47bdb5..8c03d3b2 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN126.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN126.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN126.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN127.inf b/src/bin/hamcore/inf/x86/INF_VPN127.inf index 2d4f091f..18f0f481 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN127.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN127.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN127.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN13.inf b/src/bin/hamcore/inf/x86/INF_VPN13.inf index 1eaa6722..961eef05 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN13.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN13.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN13.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN14.inf b/src/bin/hamcore/inf/x86/INF_VPN14.inf index 25fc8725..b875f3d8 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN14.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN14.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN14.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN15.inf b/src/bin/hamcore/inf/x86/INF_VPN15.inf index 8067ded8..9e34bf52 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN15.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN15.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN15.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN16.inf b/src/bin/hamcore/inf/x86/INF_VPN16.inf index 41b9ef59..deccdca3 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN16.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN16.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN16.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN17.inf b/src/bin/hamcore/inf/x86/INF_VPN17.inf index 5b33bc9e..a0e73d8f 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN17.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN17.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN17.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN18.inf b/src/bin/hamcore/inf/x86/INF_VPN18.inf index 2f0cd225..98334b4d 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN18.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN18.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN18.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN19.inf b/src/bin/hamcore/inf/x86/INF_VPN19.inf index cf97b53e..dc7a302d 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN19.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN19.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN19.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN2.inf b/src/bin/hamcore/inf/x86/INF_VPN2.inf index 885666c6..8e04c75e 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN2.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN2.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN2.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN20.inf b/src/bin/hamcore/inf/x86/INF_VPN20.inf index fa02b25c..1bd88d7b 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN20.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN20.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN20.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN21.inf b/src/bin/hamcore/inf/x86/INF_VPN21.inf index 4278cf08..527608ef 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN21.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN21.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN21.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN22.inf b/src/bin/hamcore/inf/x86/INF_VPN22.inf index dacc96c3..f542d744 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN22.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN22.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN22.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN23.inf b/src/bin/hamcore/inf/x86/INF_VPN23.inf index d51121ed..0a309687 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN23.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN23.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN23.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN24.inf b/src/bin/hamcore/inf/x86/INF_VPN24.inf index 59d73a97..a5946a91 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN24.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN24.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN24.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN25.inf b/src/bin/hamcore/inf/x86/INF_VPN25.inf index 60368e42..07b550e5 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN25.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN25.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN25.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN26.inf b/src/bin/hamcore/inf/x86/INF_VPN26.inf index 9683a902..891edabd 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN26.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN26.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN26.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN27.inf b/src/bin/hamcore/inf/x86/INF_VPN27.inf index 59f0e2e9..1cd35206 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN27.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN27.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN27.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN28.inf b/src/bin/hamcore/inf/x86/INF_VPN28.inf index 6e5830b1..61287314 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN28.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN28.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN28.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN29.inf b/src/bin/hamcore/inf/x86/INF_VPN29.inf index fdb4ace6..e0c58d16 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN29.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN29.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN29.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN3.inf b/src/bin/hamcore/inf/x86/INF_VPN3.inf index ae922879..69d2fb68 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN3.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN3.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN3.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN30.inf b/src/bin/hamcore/inf/x86/INF_VPN30.inf index fa1909de..6da2fd81 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN30.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN30.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN30.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN31.inf b/src/bin/hamcore/inf/x86/INF_VPN31.inf index c0eee3cb..f5664c1c 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN31.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN31.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN31.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN32.inf b/src/bin/hamcore/inf/x86/INF_VPN32.inf index 5d6565dc..3a97fa57 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN32.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN32.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN32.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN33.inf b/src/bin/hamcore/inf/x86/INF_VPN33.inf index 3d5c98d0..5be55e09 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN33.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN33.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN33.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN34.inf b/src/bin/hamcore/inf/x86/INF_VPN34.inf index ee9e81f4..2d43175b 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN34.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN34.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN34.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN35.inf b/src/bin/hamcore/inf/x86/INF_VPN35.inf index 6db3d102..1f619949 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN35.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN35.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN35.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN36.inf b/src/bin/hamcore/inf/x86/INF_VPN36.inf index a2ee621b..25a2e17f 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN36.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN36.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN36.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN37.inf b/src/bin/hamcore/inf/x86/INF_VPN37.inf index ff98696b..3c2cdad8 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN37.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN37.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN37.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN38.inf b/src/bin/hamcore/inf/x86/INF_VPN38.inf index ff3e27cd..f9c60965 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN38.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN38.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN38.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN39.inf b/src/bin/hamcore/inf/x86/INF_VPN39.inf index a84a527f..ea476151 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN39.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN39.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN39.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN4.inf b/src/bin/hamcore/inf/x86/INF_VPN4.inf index 5d67f8c7..5080a027 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN4.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN4.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN4.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN40.inf b/src/bin/hamcore/inf/x86/INF_VPN40.inf index ae463515..edf004e3 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN40.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN40.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN40.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN41.inf b/src/bin/hamcore/inf/x86/INF_VPN41.inf index 18be62b6..a3634104 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN41.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN41.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN41.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN42.inf b/src/bin/hamcore/inf/x86/INF_VPN42.inf index be47cd4e..c8701bfe 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN42.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN42.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN42.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN43.inf b/src/bin/hamcore/inf/x86/INF_VPN43.inf index 22226612..741f7a4d 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN43.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN43.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN43.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN44.inf b/src/bin/hamcore/inf/x86/INF_VPN44.inf index 58183e15..8c5af969 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN44.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN44.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN44.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN45.inf b/src/bin/hamcore/inf/x86/INF_VPN45.inf index e2d7b06f..37ce58aa 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN45.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN45.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN45.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN46.inf b/src/bin/hamcore/inf/x86/INF_VPN46.inf index b10943bc..9851f86e 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN46.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN46.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN46.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN47.inf b/src/bin/hamcore/inf/x86/INF_VPN47.inf index 2a38f6f1..bb03c533 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN47.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN47.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN47.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN48.inf b/src/bin/hamcore/inf/x86/INF_VPN48.inf index 0c4e3d75..420654d0 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN48.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN48.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN48.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN49.inf b/src/bin/hamcore/inf/x86/INF_VPN49.inf index e11ff568..99fe895d 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN49.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN49.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN49.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN5.inf b/src/bin/hamcore/inf/x86/INF_VPN5.inf index b44738f2..7a760ee1 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN5.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN5.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN5.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN50.inf b/src/bin/hamcore/inf/x86/INF_VPN50.inf index 3db9056a..513bc615 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN50.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN50.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN50.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN51.inf b/src/bin/hamcore/inf/x86/INF_VPN51.inf index cf8f3e8f..2a7a20a6 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN51.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN51.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN51.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN52.inf b/src/bin/hamcore/inf/x86/INF_VPN52.inf index 7a9681ec..1279471a 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN52.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN52.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN52.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN53.inf b/src/bin/hamcore/inf/x86/INF_VPN53.inf index 8cb91454..f2d370ef 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN53.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN53.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN53.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN54.inf b/src/bin/hamcore/inf/x86/INF_VPN54.inf index 1c484108..cdf0b17b 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN54.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN54.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN54.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN55.inf b/src/bin/hamcore/inf/x86/INF_VPN55.inf index 2c8e4b9d..dce775f3 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN55.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN55.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN55.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN56.inf b/src/bin/hamcore/inf/x86/INF_VPN56.inf index 5c0fcb67..ee5acf66 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN56.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN56.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN56.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN57.inf b/src/bin/hamcore/inf/x86/INF_VPN57.inf index 0775f8d2..2b62eaea 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN57.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN57.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN57.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN58.inf b/src/bin/hamcore/inf/x86/INF_VPN58.inf index b8ac7c3e..4831fdca 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN58.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN58.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN58.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN59.inf b/src/bin/hamcore/inf/x86/INF_VPN59.inf index bb7e56f4..77ad17ad 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN59.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN59.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN59.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN6.inf b/src/bin/hamcore/inf/x86/INF_VPN6.inf index fb812972..5bcf906c 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN6.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN6.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN6.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN60.inf b/src/bin/hamcore/inf/x86/INF_VPN60.inf index a0fe91cc..f334aa2a 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN60.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN60.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN60.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN61.inf b/src/bin/hamcore/inf/x86/INF_VPN61.inf index 33240fb2..42a2f539 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN61.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN61.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN61.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN62.inf b/src/bin/hamcore/inf/x86/INF_VPN62.inf index e6ebcb84..ae5e05b8 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN62.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN62.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN62.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN63.inf b/src/bin/hamcore/inf/x86/INF_VPN63.inf index a4fa78d2..2a611e4d 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN63.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN63.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN63.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN64.inf b/src/bin/hamcore/inf/x86/INF_VPN64.inf index d208936c..058d5e68 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN64.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN64.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN64.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN65.inf b/src/bin/hamcore/inf/x86/INF_VPN65.inf index 5e7516e8..4f0d42a4 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN65.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN65.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN65.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN66.inf b/src/bin/hamcore/inf/x86/INF_VPN66.inf index 0395b23d..6223b2d3 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN66.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN66.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN66.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN67.inf b/src/bin/hamcore/inf/x86/INF_VPN67.inf index d574476f..a9f166b3 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN67.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN67.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN67.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN68.inf b/src/bin/hamcore/inf/x86/INF_VPN68.inf index 5f44addb..4347644d 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN68.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN68.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN68.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN69.inf b/src/bin/hamcore/inf/x86/INF_VPN69.inf index 38a469bd..784d2192 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN69.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN69.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN69.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN7.inf b/src/bin/hamcore/inf/x86/INF_VPN7.inf index 423e69cf..4ea50105 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN7.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN7.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN7.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN70.inf b/src/bin/hamcore/inf/x86/INF_VPN70.inf index dfba9a13..ef8b1751 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN70.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN70.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN70.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN71.inf b/src/bin/hamcore/inf/x86/INF_VPN71.inf index b56c0e73..8e14ed67 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN71.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN71.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN71.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN72.inf b/src/bin/hamcore/inf/x86/INF_VPN72.inf index 41df828a..ee839362 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN72.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN72.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN72.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN73.inf b/src/bin/hamcore/inf/x86/INF_VPN73.inf index 30acb4d4..558596f4 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN73.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN73.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN73.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN74.inf b/src/bin/hamcore/inf/x86/INF_VPN74.inf index c69948da..7ef8df3b 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN74.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN74.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN74.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN75.inf b/src/bin/hamcore/inf/x86/INF_VPN75.inf index c50ee132..c925f8b4 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN75.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN75.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN75.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN76.inf b/src/bin/hamcore/inf/x86/INF_VPN76.inf index 16aebcf1..0272ba5f 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN76.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN76.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN76.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN77.inf b/src/bin/hamcore/inf/x86/INF_VPN77.inf index bbee72c6..3ed6592f 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN77.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN77.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN77.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN78.inf b/src/bin/hamcore/inf/x86/INF_VPN78.inf index ed501aee..5a7f1c7b 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN78.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN78.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN78.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN79.inf b/src/bin/hamcore/inf/x86/INF_VPN79.inf index 0ec31f61..76745e30 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN79.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN79.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN79.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN8.inf b/src/bin/hamcore/inf/x86/INF_VPN8.inf index e35d7e57..ca142674 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN8.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN8.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN8.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN80.inf b/src/bin/hamcore/inf/x86/INF_VPN80.inf index 3cac19e6..5fe6c872 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN80.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN80.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN80.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN81.inf b/src/bin/hamcore/inf/x86/INF_VPN81.inf index 49b3a86e..c5a6b803 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN81.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN81.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN81.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN82.inf b/src/bin/hamcore/inf/x86/INF_VPN82.inf index f3f5550f..0f855f7a 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN82.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN82.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN82.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN83.inf b/src/bin/hamcore/inf/x86/INF_VPN83.inf index a1d6466a..3db31c1b 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN83.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN83.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN83.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN84.inf b/src/bin/hamcore/inf/x86/INF_VPN84.inf index 63118120..3f990fde 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN84.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN84.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN84.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN85.inf b/src/bin/hamcore/inf/x86/INF_VPN85.inf index 6a18b545..356e8899 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN85.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN85.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN85.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN86.inf b/src/bin/hamcore/inf/x86/INF_VPN86.inf index 1948aca5..6ac19ece 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN86.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN86.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN86.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN87.inf b/src/bin/hamcore/inf/x86/INF_VPN87.inf index 2fed433b..8f3aa208 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN87.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN87.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN87.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN88.inf b/src/bin/hamcore/inf/x86/INF_VPN88.inf index 178cf7f1..0da364a1 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN88.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN88.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN88.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN89.inf b/src/bin/hamcore/inf/x86/INF_VPN89.inf index 1d6f860f..70400794 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN89.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN89.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN89.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN9.inf b/src/bin/hamcore/inf/x86/INF_VPN9.inf index e961b1c8..df777336 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN9.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN9.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN9.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN90.inf b/src/bin/hamcore/inf/x86/INF_VPN90.inf index 86830b3d..3051eab5 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN90.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN90.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN90.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN91.inf b/src/bin/hamcore/inf/x86/INF_VPN91.inf index eaf958af..478716e3 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN91.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN91.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN91.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN92.inf b/src/bin/hamcore/inf/x86/INF_VPN92.inf index 7ef4b3de..90f525e0 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN92.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN92.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN92.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN93.inf b/src/bin/hamcore/inf/x86/INF_VPN93.inf index bcf20e09..2fbbe828 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN93.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN93.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN93.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN94.inf b/src/bin/hamcore/inf/x86/INF_VPN94.inf index 32cd80dd..e85d3914 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN94.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN94.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN94.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN95.inf b/src/bin/hamcore/inf/x86/INF_VPN95.inf index c04c7b79..26099c54 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN95.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN95.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN95.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN96.inf b/src/bin/hamcore/inf/x86/INF_VPN96.inf index 60c7fe70..b2aa80fc 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN96.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN96.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN96.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN97.inf b/src/bin/hamcore/inf/x86/INF_VPN97.inf index 8c55fb25..0d5bde78 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN97.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN97.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN97.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN98.inf b/src/bin/hamcore/inf/x86/INF_VPN98.inf index 77995ad5..a1cb7620 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN98.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN98.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN98.cat diff --git a/src/bin/hamcore/inf/x86/INF_VPN99.inf b/src/bin/hamcore/inf/x86/INF_VPN99.inf index fa1a18b4..76877e2c 100644 --- a/src/bin/hamcore/inf/x86/INF_VPN99.inf +++ b/src/bin/hamcore/inf/x86/INF_VPN99.inf @@ -8,7 +8,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %CompanyName% -DriverVer = 10/22/2014, 4.11.0.9506 +DriverVer = 11/17/2014, 4.12.0.9514 CatalogFile.NT = inf_VPN99.cat diff --git a/src/bin/hamcore/inf/x86/inf.cat b/src/bin/hamcore/inf/x86/inf.cat index 4fe81adb..d2292a04 100644 Binary files a/src/bin/hamcore/inf/x86/inf.cat and b/src/bin/hamcore/inf/x86/inf.cat differ diff --git a/src/bin/hamcore/pxwfp_x64.sys b/src/bin/hamcore/pxwfp_x64.sys index 4814c5f5..5cddf9c8 100644 Binary files a/src/bin/hamcore/pxwfp_x64.sys and b/src/bin/hamcore/pxwfp_x64.sys differ diff --git a/src/bin/hamcore/pxwfp_x86.sys b/src/bin/hamcore/pxwfp_x86.sys index 47401ac3..833c7732 100644 Binary files a/src/bin/hamcore/pxwfp_x86.sys and b/src/bin/hamcore/pxwfp_x86.sys differ diff --git a/src/bin/hamcore/see.sys b/src/bin/hamcore/see.sys index dd76f791..9d4bba88 100644 Binary files a/src/bin/hamcore/see.sys and b/src/bin/hamcore/see.sys differ diff --git a/src/bin/hamcore/see_x64.sys b/src/bin/hamcore/see_x64.sys index cd5994d0..65d64fce 100644 Binary files a/src/bin/hamcore/see_x64.sys and b/src/bin/hamcore/see_x64.sys differ diff --git a/src/bin/hamcore/strtable_cn.stb b/src/bin/hamcore/strtable_cn.stb index 0d972aa9..47d766bd 100644 --- a/src/bin/hamcore/strtable_cn.stb +++ b/src/bin/hamcore/strtable_cn.stb @@ -557,6 +557,7 @@ HUB_AO_DropBroadcastsInPrivacyFilterMode Drop broadcasting packets if the both s HUB_AO_DropArpInPrivacyFilterMode Drop ARP packets if the both source and destination session is PrivacyFilter mode. HUB_AO_SuppressClientUpdateNotification Suppress the update notification screen on the VPN Client. HUB_AO_FloodingSendQueueBufferQuota Specify the quota limitation value (in bytes) of the sending queue buffer size which the flooding operation on the Virtual Hub can consume. The quota value is applied on the total length of sending queues of all active VPN sessions. Specify '0' to disable the quota. This option is effective to solve the out-of-memory problem on the network where there are many flooding packets. +HUB_AO_AssignVLanIdByRadiusAttribute Enable the VLAN ID dynamic assignment function. Each VPN session will be assigned its own VLAN ID by the RADIUS attribute value when the user is authenticated by the external RADIUS server unless the user object has a VLAN ID security policy. The RADIUS attribute with the name "Tunnel-Pvt-Group-ID" (ID = 81) will be used as the VLAN ID. The data type must be STRING. #关于失败连接对话框 @@ -1919,6 +1920,7 @@ LH_MAX_SESSION_2 连接 "%S": 可被 VPN Server 管理的的最大会话数 (% LH_NEW_SESSION 连接 "%S": 已创建新会话 "%S"。(IP 地址:%S,端口号:%u,物理底层协议:"%S") LH_SET_SESSION 会话 "%S": 已设置参数。最大 TCP 连接数:%u,使用的加密:%s,使用的压缩:%s,使用的半双工通信:%s,超时:%u 秒。 LH_NODE_INFO 会话 "%S": VPN Client 详细信息: (%s) +LH_VLAN_ID 会话 "%S": Assigned VLAN ID: %u LH_INVALID_SIGNATURE 会话 "%S": 已连接的客户端发送了非法协议数据。无法与客户端建立一般通信。请首先检查客户端到服务端之间的连接和网络线缆问题,然后再检查是否安装有特殊传输数据包重写设备。 LH_END_SESSION 会话 "%S": 会话已结束。统计信息如下: 总输出数据大小: %I64u 字节,总输入数据大小: %I64u 字节。 LH_BCAST_STORM 会话 "%S": 检测到大量广播数据包。您可能会按照策略废弃数据包。源 MAC 地址是 %S,源 IP 地址是 %S,目标 IP 地址是 %S。广播数据包量大于等于 %u 每秒 (注意此信息是对部分数据包进行刻板的分析,结果可能不正确)。 diff --git a/src/bin/hamcore/strtable_en.stb b/src/bin/hamcore/strtable_en.stb index 02f53f45..c2f78a91 100644 --- a/src/bin/hamcore/strtable_en.stb +++ b/src/bin/hamcore/strtable_en.stb @@ -551,6 +551,7 @@ HUB_AO_DropBroadcastsInPrivacyFilterMode Drop broadcasting packets if the both s HUB_AO_DropArpInPrivacyFilterMode Drop ARP packets if the both source and destination session is PrivacyFilter mode. HUB_AO_SuppressClientUpdateNotification Suppress the update notification screen on the VPN Client. HUB_AO_FloodingSendQueueBufferQuota Specify the quota limitation value (in bytes) of the sending queue buffer size which the flooding operation on the Virtual Hub can consume. The quota value is applied on the total length of sending queues of all active VPN sessions. Specify '0' to disable the quota. This option is effective to solve the out-of-memory problem on the network where there are many flooding packets. +HUB_AO_AssignVLanIdByRadiusAttribute Enable the VLAN ID dynamic assignment function. Each VPN session will be assigned its own VLAN ID by the RADIUS attribute value when the user is authenticated by the external RADIUS server unless the user object has a VLAN ID security policy. The RADIUS attribute with the name "Tunnel-Pvt-Group-ID" (ID = 81) will be used as the VLAN ID. The data type must be STRING. # Concerning failed connection dialogs @@ -1902,6 +1903,7 @@ LH_MAX_SESSION_2 Connection "%S": The maximum number of sessions (%u) that can LH_NEW_SESSION Connection "%S": The new session "%S" has been created. (IP address: %S, Port number: %u, Physical underlying protocol: "%S") LH_SET_SESSION Session "%S": The parameter has been set. Max number of TCP connections: %u, Use of encryption: %s, Use of compression: %s, Use of Half duplex communication: %s, Timeout: %u seconds. LH_NODE_INFO Session "%S": VPN Client details: (%s) +LH_VLAN_ID Session "%S": Assigned VLAN ID: %u LH_INVALID_SIGNATURE Session "%S": The connected client sent invalid protocol data. Unable to establish normal communication with client. First check for problems with the connections and cabling of the network connecting the client and the server and then check there is not a special transparent packet re-writing device installed. LH_END_SESSION Session "%S": The session has been terminated. The statistical information is as follows: Total outgoing data size: %I64u bytes, Total incoming data size: %I64u bytes. LH_BCAST_STORM Session "%S": A large volume of broadcast packets has been detected. There are cases where packets are discarded based on the policy. The source MAC address is %S, the source IP address is %S, the destination IP address is %S. The number of broadcast packets is equal to or larger than %u items per 1 second (note this information is the result of mechanical analysis of part of the packets and could be incorrect). diff --git a/src/bin/hamcore/strtable_ja.stb b/src/bin/hamcore/strtable_ja.stb index 68b7bfed..93f7319a 100644 --- a/src/bin/hamcore/strtable_ja.stb +++ b/src/bin/hamcore/strtable_ja.stb @@ -572,6 +572,7 @@ HUB_AO_DropBroadcastsInPrivacyFilterMode 送信元および宛先の両方のセ HUB_AO_DropArpInPrivacyFilterMode 送信元および宛先の両方のセッションがプライバシーフィルタモードの場合、ARP パケットを破棄します。 HUB_AO_SuppressClientUpdateNotification VPN Client のアップデート通知画面の表示を抑制します。 HUB_AO_FloodingSendQueueBufferQuota パケットの仮想 HUB 内におけるフラッディング動作時において消費することを許容する送信キューのバッファサイズの制限値 (バイト数) を指定します。クオータは、すべての接続中の VPN セッションの送信キューの合計長さに対してグローバルに適用されます。0 を指定すると無制限になります。このオプションは、フラッディングパケットが多発するネットワークにおいてメモリ消費量が増大する問題を解決するために利用できます。 +HUB_AO_AssignVLanIdByRadiusAttribute VLAN ID の動的割り当て機能を有効にします。VPN 接続するユーザーオブジェクトのセキュリティポリシーに VLAN ID が指定されていない場合は、各 VPN セッションはユーザー認証を行った RADIUS サーバーから返却される RADIUS 属性の値に基づき VLAN が割当てられます。RADIUS 属性のうち、 "Tunnel-Pvt-Group-ID" (ID = 81) の値が使用されます。データ型は文字列である必要があります。 # Caps 関係 @@ -1906,6 +1907,7 @@ LH_MAX_SESSION_2 コネクション "%S": VPN Server 上で管理すること LH_NEW_SESSION コネクション "%S": 新しいセッション "%S" が作成されました。(IP アドレス %S, ポート番号 %u, 物理レイヤのプロトコル: "%S") LH_SET_SESSION セッション "%S": パラメータが設定されました。最大 TCP コネクション数 %u, 暗号化の使用 %s, 圧縮の使用 %s, 半二重通信の使用 %s, タイムアウト %u 秒 LH_NODE_INFO セッション "%S": VPN Client の詳細: (%s) +LH_VLAN_ID セッション "%S": 割り当てられた VLAN ID: %u LH_INVALID_SIGNATURE セッション "%S": 接続してきたクライアントが無効なプロトコルデータを送信しました。クライアントとの通信が正常にできません。クライアントとこのサーバーとの間のネットワーク回線に異常が無いかどうか、特殊な透過型パケット書き換え装置を設置していないかどうか確認してください。 LH_END_SESSION セッション "%S": セッションが終了しました。統計情報は次の通りです。合計送信データサイズ: %I64u バイト, 合計受信データサイズ: %I64u バイト LH_BCAST_STORM セッション "%S": 大量のブロードキャストパケットを検出しました。ポリシーに従ってパケットを破棄する場合があります。送信元 MAC アドレスは %S, 送信元 IP アドレスは %S, 宛先 IP アドレスは %S です。ブロードキャストパケット数は 1 秒間に %u 個以上です (なおこの情報はパケットの一部を機械的に解析した結果であり、不正確な場合があります)。 diff --git a/src/bin/hamcore/vpn_driver.sys b/src/bin/hamcore/vpn_driver.sys index 3b808ece..8eeeb790 100644 Binary files a/src/bin/hamcore/vpn_driver.sys and b/src/bin/hamcore/vpn_driver.sys differ diff --git a/src/bin/hamcore/vpn_driver6.sys b/src/bin/hamcore/vpn_driver6.sys index 30173022..1ee84640 100644 Binary files a/src/bin/hamcore/vpn_driver6.sys and b/src/bin/hamcore/vpn_driver6.sys differ diff --git a/src/bin/hamcore/vpn_driver6_x64.sys b/src/bin/hamcore/vpn_driver6_x64.sys index 29420d1b..ac44717f 100644 Binary files a/src/bin/hamcore/vpn_driver6_x64.sys and b/src/bin/hamcore/vpn_driver6_x64.sys differ diff --git a/src/bin/hamcore/vpn_driver_x64.sys b/src/bin/hamcore/vpn_driver_x64.sys index 10b48c4f..69106bc4 100644 Binary files a/src/bin/hamcore/vpn_driver_x64.sys and b/src/bin/hamcore/vpn_driver_x64.sys differ diff --git a/src/bin/vpnweb.cab b/src/bin/vpnweb.cab index f89265e8..311e127a 100644 Binary files a/src/bin/vpnweb.cab and b/src/bin/vpnweb.cab differ diff --git a/src/bin/vpnweb.ocx b/src/bin/vpnweb.ocx index 605628f2..d7346e00 100644 Binary files a/src/bin/vpnweb.ocx and b/src/bin/vpnweb.ocx differ diff --git a/src/vpnweb/vpnweb.h b/src/vpnweb/vpnweb.h index f2df537c..7a4a0b3b 100644 --- a/src/vpnweb/vpnweb.h +++ b/src/vpnweb/vpnweb.h @@ -4,7 +4,7 @@ /* File created by MIDL compiler version 7.00.0500 */ -/* at Wed Oct 22 19:52:16 2014 +/* at Mon Nov 17 21:41:35 2014 */ /* Compiler settings for .\vpnweb.idl: Oicf, W1, Zp8, env=Win32 (32b run) diff --git a/src/vpnweb/vpnweb_i.c b/src/vpnweb/vpnweb_i.c index 7f4abf2d..b7b3059b 100644 --- a/src/vpnweb/vpnweb_i.c +++ b/src/vpnweb/vpnweb_i.c @@ -6,7 +6,7 @@ /* File created by MIDL compiler version 7.00.0500 */ -/* at Wed Oct 22 19:52:16 2014 +/* at Mon Nov 17 21:41:35 2014 */ /* Compiler settings for .\vpnweb.idl: Oicf, W1, Zp8, env=Win32 (32b run) diff --git a/src/vpnweb/vpnweb_p.c b/src/vpnweb/vpnweb_p.c index 173f5aa4..87dd62fd 100644 --- a/src/vpnweb/vpnweb_p.c +++ b/src/vpnweb/vpnweb_p.c @@ -4,7 +4,7 @@ /* File created by MIDL compiler version 7.00.0500 */ -/* at Wed Oct 22 19:52:16 2014 +/* at Mon Nov 17 21:41:35 2014 */ /* Compiler settings for .\vpnweb.idl: Oicf, W1, Zp8, env=Win32 (32b run)