Merge branch 'SoftEtherVPN:master' into master

This commit is contained in:
weidi authored and GitHub committed 2021-12-26 11:51:55 +01:00
commit 3c7d78a1bf
6 files changed
+250 -8

No files matched your search

+1 -1
View File
@@ -91,7 +91,7 @@ struct IP
#define CmpIpAddr(ip1, ip2) (Cmp((ip1)->address, (ip2)->address, sizeof((ip1)->address)))
#define IsIP6(ip) (IsIP4(ip) == false)
#define IsIP6(ip) (ip && IsIP4(ip) == false)
#define IsZeroIp(ip) (IsZeroIP(ip))
// IPv6 address (different format)
+1 -1
View File
@@ -28,7 +28,7 @@ struct PROXY_PARAM_IN
char Username[PROXY_MAX_USERNAME_LEN + 1];
char Password[PROXY_MAX_PASSWORD_LEN + 1];
UINT Timeout;
char HttpCustomHeader[HTTP_CUSTOM_HEADER_MAX_SIZE + 1];
char HttpCustomHeader[HTTP_CUSTOM_HEADER_MAX_SIZE];
char HttpUserAgent[HTTP_HEADER_USER_AGENT_MAX_SIZE + 1];
#ifdef OS_WIN32
void *Hwnd;