AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-22 17:39:53 +03:00
Code Releases Activity

Fixing VS2015 quirks

Browse Source
This commit is contained in:
Evengard 2020-05-12 18:51:55 +03:00
parent 2cfe031398
commit cbbac659a3
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Cedar/IPC.c
View File

@ -2284,6 +2284,8 @@ UINT64 IPCIPv6GetServerEui(IPC *ipc)
UCHAR destMacAddress[6]; UCHAR destMacAddress[6];
IPV6_ADDR linkLocal; IPV6_ADDR linkLocal;
BUF *packet; BUF *packet;
UINT64 giveup_time = Tick64() + (UINT64)(IPC_IPV6_RA_MAX_RETRIES * IPC_IPV6_RA_INTERVAL);
UINT64 timeout_retry = 0;
Zero(&linkLocal, sizeof(IPV6_ADDR)); Zero(&linkLocal, sizeof(IPV6_ADDR));
@ -2304,9 +2306,6 @@ UINT64 IPCIPv6GetServerEui(IPC *ipc)
packet = BuildICMPv6RouterSoliciation(&senderV6, &destV6, ipc->MacAddress, 0); packet = BuildICMPv6RouterSoliciation(&senderV6, &destV6, ipc->MacAddress, 0);
UINT64 giveup_time = Tick64() + (UINT64)(IPC_IPV6_RA_MAX_RETRIES * IPC_IPV6_RA_INTERVAL);
UINT64 timeout_retry = 0;
while (LIST_NUM(ipc->IPv6RouterAdvs) == 0) while (LIST_NUM(ipc->IPv6RouterAdvs) == 0)
{ {
UINT64 now = Tick64(); UINT64 now = Tick64();
@ -2570,6 +2569,11 @@ void IPCIPv6SendUnicast(IPC *ipc, void *data, UINT size, IP *next_ip)
BUF *neighborSolicit; BUF *neighborSolicit;
UCHAR destMacAddress[6]; UCHAR destMacAddress[6];
IPV6_ADDR solicitAddress; IPV6_ADDR solicitAddress;
CHAR tmp[MAX_SIZE];
UCHAR *copy;
BLOCK *blk;
Zero(&solicitAddress, sizeof(IPV6_ADDR)); Zero(&solicitAddress, sizeof(IPV6_ADDR));
Copy(&solicitAddress.Value[13], &header->DestAddress.Value[13], 3); Copy(&solicitAddress.Value[13], &header->DestAddress.Value[13], 3);
solicitAddress.Value[0] = 0xFF; solicitAddress.Value[0] = 0xFF;
@ -2585,9 +2589,9 @@ void IPCIPv6SendUnicast(IPC *ipc, void *data, UINT size, IP *next_ip)
FreeBuf(neighborSolicit); FreeBuf(neighborSolicit);
CHAR tmp[MAX_SIZE];
UCHAR *copy = Clone(data, size); copy = Clone(data, size);
BLOCK *blk = NewBlock(copy, size, 0); blk = NewBlock(copy, size, 0);
InsertQueue(ndtMatch->PacketQueue, blk); InsertQueue(ndtMatch->PacketQueue, blk);
IPToStr6(tmp, MAX_SIZE, next_ip); IPToStr6(tmp, MAX_SIZE, next_ip);