wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-01 19:54:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

always try most recent used session on row first for match

Browse Source
This commit is contained in:
toddouska
2013-04-29 20:08:21 -07:00
parent 8c1310e376
commit 1e6119bb0d
1 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/ssl.c
View File

@@ -3703,6 +3703,7 @@ CYASSL_SESSION* GetSessionClient(CYASSL* ssl, const byte* id, int len)
CYASSL_SESSION* ret = NULL; CYASSL_SESSION* ret = NULL;
word32 row; word32 row;
int idx; int idx;
int count;
CYASSL_ENTER("GetSessionClient"); CYASSL_ENTER("GetSessionClient");
@@ -3716,31 +3717,34 @@ CYASSL_SESSION* GetSessionClient(CYASSL* ssl, const byte* id, int len)
CYASSL_MSG("Lock session mutex failed"); CYASSL_MSG("Lock session mutex failed");
return NULL; return NULL;
} }
/* start from most recently used */ /* start from most recently used */
if (ClientCache[row].totalCount >= SESSIONS_PER_ROW) count = min((word32)ClientCache[row].totalCount, SESSIONS_PER_ROW);
idx = SESSIONS_PER_ROW - 1; idx = ClientCache[row].nextIdx - 1;
else if (idx < 0)
idx = ClientCache[row].nextIdx - 1; idx = SESSIONS_PER_ROW - 1; /* if back to front, the previous was end */
for (; idx >= 0; idx--) { for (; count > 0; --count, idx = idx ? idx - 1 : SESSIONS_PER_ROW - 1) {
CYASSL_SESSION* current; CYASSL_SESSION* current;
ClientSession clSess; ClientSession clSess;
if (idx >= SESSIONS_PER_ROW) /* client could have restarted, idx */ if (idx >= SESSIONS_PER_ROW || idx < 0) { /* sanity check */
break; /* would be word32(-1) and seg fault */ CYASSL_MSG("Bad idx");
break;
}
clSess = ClientCache[row].Clients[idx]; clSess = ClientCache[row].Clients[idx];
current = &SessionCache[clSess.serverRow].Sessions[clSess.serverIdx]; current = &SessionCache[clSess.serverRow].Sessions[clSess.serverIdx];
if (XMEMCMP(current->serverID, id, len) == 0) { if (XMEMCMP(current->serverID, id, len) == 0) {
CYASSL_MSG("Found a clientid match");
if (LowResTimer() < (current->bornOn + current->timeout)) { if (LowResTimer() < (current->bornOn + current->timeout)) {
CYASSL_MSG("Session valid");
ret = current; ret = current;
break;
} else { } else {
CYASSL_MSG("Session timed out"); CYASSL_MSG("Session timed out"); /* could have more for id */
} }
break;
} else { } else {
CYASSL_MSG("ServerID not a match from client table"); CYASSL_MSG("ServerID not a match from client table");
} }
@@ -3760,6 +3764,7 @@ CYASSL_SESSION* GetSession(CYASSL* ssl, byte* masterSecret)
const byte* id = NULL; const byte* id = NULL;
word32 row; word32 row;
int idx; int idx;
int count;
if (ssl->options.sessionCacheOff) if (ssl->options.sessionCacheOff)
return NULL; return NULL;
@@ -3778,25 +3783,33 @@ CYASSL_SESSION* GetSession(CYASSL* ssl, byte* masterSecret)
return 0; return 0;
/* start from most recently used */ /* start from most recently used */
if (SessionCache[row].totalCount >= SESSIONS_PER_ROW) count = min((word32)SessionCache[row].totalCount, SESSIONS_PER_ROW);
idx = SESSIONS_PER_ROW - 1; idx = SessionCache[row].nextIdx - 1;
else if (idx < 0)
idx = SessionCache[row].nextIdx - 1; idx = SESSIONS_PER_ROW - 1; /* if back to front, the previous was end */
for (; idx >= 0; idx--) { for (; count > 0; --count, idx = idx ? idx - 1 : SESSIONS_PER_ROW - 1) {
CYASSL_SESSION* current; CYASSL_SESSION* current;
if (idx >= SESSIONS_PER_ROW) /* server could have restarted, idx */ if (idx >= SESSIONS_PER_ROW || idx < 0) { /* sanity check */
break; /* would be word32(-1) and seg fault */ CYASSL_MSG("Bad idx");
break;
}
current = &SessionCache[row].Sessions[idx]; current = &SessionCache[row].Sessions[idx];
if (XMEMCMP(current->sessionID, id, ID_LEN) == 0) { if (XMEMCMP(current->sessionID, id, ID_LEN) == 0) {
CYASSL_MSG("Found a session match");
if (LowResTimer() < (current->bornOn + current->timeout)) { if (LowResTimer() < (current->bornOn + current->timeout)) {
CYASSL_MSG("Session valid");
ret = current; ret = current;
if (masterSecret) if (masterSecret)
XMEMCPY(masterSecret, current->masterSecret, SECRET_LEN); XMEMCPY(masterSecret, current->masterSecret, SECRET_LEN);
} else {
CYASSL_MSG("Session timed out");
} }
break; break; /* no more sessionIDs whether valid or not that match */
} else {
CYASSL_MSG("SessionID not a match as this idx");
} }
} }