1
0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-10 03:30:39 +03:00

Merge branch 'master' of github.com:SoftEtherVPN/SoftEtherVPN into 200101_fix_securenat_ecn

This commit is contained in:
Daiyuu Nobori 2020-01-01 19:59:42 +09:00
commit a49219db83
2 changed files with 13 additions and 1 deletions

View File

@ -1563,7 +1563,7 @@ void HubWatchDogThread(THREAD *t, void *param)
o2 = NewListFast(NULL); o2 = NewListFast(NULL);
// Send an ARP packet // Send an ARP packet
LockHashList(hub->IpTable); LockHashList(hub->MacHashTable);
{ {
num = LIST_NUM(hub->IpTable); num = LIST_NUM(hub->IpTable);
for (i = 0;i < LIST_NUM(hub->IpTable);i++) for (i = 0;i < LIST_NUM(hub->IpTable);i++)

View File

@ -82,6 +82,12 @@ IPC_ASYNC *NewIPCAsync(CEDAR *cedar, IPC_PARAM *param, SOCK_EVENT *sock_event)
Copy(&a->Param, param, sizeof(IPC_PARAM)); Copy(&a->Param, param, sizeof(IPC_PARAM));
if (param->ClientCertificate != NULL)
{
// Client certificate must be copied for async processing
a->Param.ClientCertificate = CloneX(param->ClientCertificate);
}
if (sock_event != NULL) if (sock_event != NULL)
{ {
a->SockEvent = sock_event; a->SockEvent = sock_event;
@ -200,6 +206,12 @@ void FreeIPCAsync(IPC_ASYNC *a)
ReleaseCedar(a->Cedar); ReleaseCedar(a->Cedar);
ReleaseTube(a->TubeForDisconnect); ReleaseTube(a->TubeForDisconnect);
if (a->Param.ClientCertificate != NULL)
{
FreeX(a->Param.ClientCertificate);
}
Free(a); Free(a);
} }