mirror/ULib
1
0
Fork 0
mirror of https://github.com/stefanocasazza/ULib.git synced 2025-09-28 19:05:55 +08:00
Code Issues Releases Wiki Activity

sync

Browse Source
This commit is contained in:
stefanocasazza 2020-04-11 15:52:03 +02:00
parent 64c60ba371
commit ca1ad76e7c
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
examples/WiAuth/v2/wi_auth_declaration2.h
View File

@ -37,8 +37,9 @@ static uint64_t counter, device_counter, max_traffic_daily;
static uint8_t policySessionNotify, policySessionNotifyDefault;
static uint32_t addr, old_addr, ip_peer, created, lastUpdate, lastReset, idx, duration_privacy_policy, vec_logout[8192];
#define U_CLEAN_INTERVAL (60U * 60U) // 1h
#define U_MAX_TIME_NO_TRAFFIC (15U * 60U) // 15m
#define U_CLEAN_INTERVAL (60U * 60U) // 1h
#define U_MAX_TIME_NO_TRAFFIC (15U * 60U) // 15m
#define U_MAX_ELAPSED_TIME (100000U * 60U) // 69g
#define U_LOGGER(fmt,args...) ULog::log(file_WARNING->getFd(), U_CONSTANT_TO_PARAM("%v: " fmt), UClientImage_Base::request_uri->rep , ##args)
@ -702,9 +703,9 @@ static void writeSessionToLOG(const UString& lmac, const UString& label, const c
UString opt(200U);
uint32_t elapsed = u_now->tv_sec - created;
uint32_t elapsed = (u_now->tv_sec > created ? u_now->tv_sec - created : 0);
if (elapsed > U_ONE_DAY_IN_SECOND) elapsed = U_ONE_DAY_IN_SECOND;
if (elapsed > U_MAX_ELAPSED_TIME) elapsed = U_MAX_ELAPSED_TIME;
opt.snprintf(U_CONSTANT_TO_PARAM(", traffic: %llu, elapsed: %u"), counter/1024, elapsed/60);

2
include/ulib/container/vector.h
View File

@ -1023,7 +1023,7 @@ public:
UVector<void*>::move(source); // add to end and reset source
}
explicit UVector(const UVector<UString>& source) : UVector(source._length)
explicit UVector(const UVector<UString>& source) : UVector<UStringRep*>(source._length)
{
U_TRACE_CTOR(0, UVector<UString>, "copy ctor")

4
src/ulib/ssl/net/sslsocket.cpp
View File

@ -1058,7 +1058,11 @@ int USSLSocket::SPKIPinVerification(X509_STORE_CTX* context, void *arg)
UString *tls_pin = (UString *)arg;
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
STACK_OF(X509) *certChain = X509_STORE_CTX_get0_untrusted(context);
#else
STACK_OF(X509) *certChain; // TODO
#endif
X509 *workingCert = NULL;
bool result = false;