1
0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2026-03-31 04:21:57 +03:00

Merge pull request #2161 from siddharth-narayan/radius-retry-timeout

Add RadiusRetryTimeout option
This commit is contained in:
Ilya Shipitsin
2026-02-18 07:54:10 +01:00
committed by GitHub
14 changed files with 123 additions and 27 deletions

View File

@ -1207,12 +1207,14 @@ PACK *HttpClientRecv(SOCK *s)
UINT size;
UCHAR *tmp;
HTTP_VALUE *v;
UINT num_noop = 0;
// Validate arguments
if (s == NULL)
{
return NULL;
}
START:
h = RecvHttpHeader(s);
if (h == NULL)
{
@ -1257,6 +1259,22 @@ PACK *HttpClientRecv(SOCK *s)
p = BufToPack(b);
FreeBuf(b);
// Client shouldn't receive a noop other than NOOP_IGNORE
// because it can't respond without a full new HTTP request
UINT noop = PackGetInt(p, "noop");
if (noop == NOOP_IGNORE) {
Debug("recv: noop ignore\n");
FreePack(p);
num_noop++;
if (num_noop > MAX_NOOP_PER_SESSION)
{
return NULL;
}
goto START;
}
return p;
}
@ -1365,13 +1383,14 @@ START:
FreeBuf(b);
// Determine whether it's a NOOP
if (PackGetInt(p, "noop") != 0)
UINT noop = PackGetInt(p, "noop");
if (noop == NOOP)
{
Debug("recv: noop\n");
FreePack(p);
p = PackError(0);
PackAddInt(p, "noop", 1);
PackAddInt(p, "noop", NOOP_IGNORE);
if (HttpServerSend(s, p) == false)
{
FreePack(p);
@ -1387,6 +1406,11 @@ START:
return NULL;
}
goto START;
} else if (noop == NOOP_IGNORE) {
Debug("recv: noop ignore\n");
FreePack(p);
goto START;
}

View File

@ -881,8 +881,6 @@ struct SSL_VERIFY_OPTION
X *SavedCert; // Saved server certificate
};
#define SSL_DEFAULT_CONNECT_TIMEOUT (15 * 1000) // SSL default timeout
// Header for TCP Pair
struct TCP_PAIR_HEADER
{

View File

@ -38,6 +38,8 @@
// The number of allowable NOOP
#define MAX_NOOP_PER_SESSION 30
#define NOOP 1
#define NOOP_IGNORE 2 // A noop, but don't send a response noop
// VALUE object
struct VALUE