forked from mirrors/gecko-dev
1a1f42da37
This changeset is the result of adding modernize-use-default-member-init to tools/clang-tidy/config.yaml then proceeding to run `./mach static-analysis check netwerk/ --fix` I then went through the resulting fix and manually updated all of the member variables which were missed due to them having a non-trivial constructor. Note that the tool was only run on Linux, so code that only runs on some platforms may have been missed. The member variables that are still initialized in the contructor definition are: - bitfields (not all currently supported compilers allow default-member-init - variables that are initialized via a parameter - variables that use code not visible in the header file There are a few advantages to landing this change: - fewer lines of code - now declaration is in the same place as initialization this also makes it easier to see when looking at the header. - it makes it harder to miss initializing a member when adding a new contructor - variables that depend on an include guard look much nicer now Additionally I removed some unnecessary reinitialization of NetAddr members (it has a constructor that does that now), and changed nsWifiScannerDBus to use the thread-safe strtok_r instead of strtok. Differential Revision: https://phabricator.services.mozilla.com/D116980
88 lines
2.6 KiB
C++
88 lines
2.6 KiB
C++
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#ifndef SSLTokensCache_h_
|
|
#define SSLTokensCache_h_
|
|
|
|
#include "nsIMemoryReporter.h"
|
|
#include "nsClassHashtable.h"
|
|
#include "nsTArray.h"
|
|
#include "mozilla/Maybe.h"
|
|
#include "mozilla/StaticMutex.h"
|
|
#include "mozilla/StaticPrefs_network.h"
|
|
#include "mozilla/StaticPtr.h"
|
|
#include "nsXULAppAPI.h"
|
|
#include "TransportSecurityInfo.h"
|
|
#include "CertVerifier.h" // For EVStatus
|
|
|
|
namespace mozilla {
|
|
namespace net {
|
|
|
|
struct SessionCacheInfo {
|
|
SessionCacheInfo Clone() const;
|
|
|
|
psm::EVStatus mEVStatus = psm::EVStatus::NotEV;
|
|
uint16_t mCertificateTransparencyStatus =
|
|
nsITransportSecurityInfo::CERTIFICATE_TRANSPARENCY_NOT_APPLICABLE;
|
|
nsTArray<uint8_t> mServerCertBytes;
|
|
Maybe<nsTArray<nsTArray<uint8_t>>> mSucceededCertChainBytes;
|
|
Maybe<bool> mIsBuiltCertChainRootBuiltInRoot;
|
|
};
|
|
|
|
class SSLTokensCache : public nsIMemoryReporter {
|
|
public:
|
|
NS_DECL_THREADSAFE_ISUPPORTS
|
|
NS_DECL_NSIMEMORYREPORTER
|
|
|
|
friend class ExpirationComparator;
|
|
|
|
static nsresult Init();
|
|
static nsresult Shutdown();
|
|
|
|
static nsresult Put(const nsACString& aKey, const uint8_t* aToken,
|
|
uint32_t aTokenLen, nsITransportSecurityInfo* aSecInfo);
|
|
static nsresult Put(const nsACString& aKey, const uint8_t* aToken,
|
|
uint32_t aTokenLen, nsITransportSecurityInfo* aSecInfo,
|
|
PRUint32 aExpirationTime);
|
|
static nsresult Get(const nsACString& aKey, nsTArray<uint8_t>& aToken);
|
|
static bool GetSessionCacheInfo(const nsACString& aKey,
|
|
SessionCacheInfo& aResult);
|
|
static nsresult Remove(const nsACString& aKey);
|
|
static void Clear();
|
|
|
|
private:
|
|
SSLTokensCache();
|
|
virtual ~SSLTokensCache();
|
|
|
|
nsresult RemoveLocked(const nsACString& aKey);
|
|
|
|
void EvictIfNecessary();
|
|
void LogStats();
|
|
|
|
size_t SizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf) const;
|
|
|
|
static mozilla::StaticRefPtr<SSLTokensCache> gInstance;
|
|
static StaticMutex sLock;
|
|
|
|
uint32_t mCacheSize{0}; // Actual cache size in bytes
|
|
|
|
class TokenCacheRecord {
|
|
public:
|
|
uint32_t Size() const;
|
|
void Reset();
|
|
|
|
nsCString mKey;
|
|
PRUint32 mExpirationTime = 0;
|
|
nsTArray<uint8_t> mToken;
|
|
SessionCacheInfo mSessionCacheInfo;
|
|
};
|
|
|
|
nsClassHashtable<nsCStringHashKey, TokenCacheRecord> mTokenCacheRecords;
|
|
nsTArray<TokenCacheRecord*> mExpirationArray;
|
|
};
|
|
|
|
} // namespace net
|
|
} // namespace mozilla
|
|
|
|
#endif // SSLTokensCache_h_
|