Change some class naming conventions

This commit is contained in:
2023-09-15 13:28:18 -04:00
parent 40881ec284
commit cd3c82f2c4
20 changed files with 160 additions and 157 deletions

View File

@@ -85,7 +85,7 @@ static const char* dummy_key =
"HcKc9a4WXhC7yu79e5BnKWltHXY=\n"
"-----END PRIVATE KEY-----\n";
class FLpxSocketsI;
class FlxSocketsI;
/////////////////////////////////////////////////////////////////
//
@@ -96,11 +96,11 @@ class FLpxSocketsI;
class FLpxListener
{
public:
FLpxSocketsI *LSI;
FlxSocketsI *LSI;
int BoundPort;
FSocket* Socket;
FLpxListener(FLpxSocketsI *lsi, int bp, FSocket* sock);
FLpxListener(FlxSocketsI *lsi, int bp, FSocket* sock);
~FLpxListener();
void AcceptConnection();
@@ -122,7 +122,7 @@ enum EChanState {
class FLpxChannel
{
public:
FLpxSocketsI* LSI;
FlxSocketsI* LSI;
EChanState State;
int ChannelID;
FSocket* Socket;
@@ -172,7 +172,7 @@ public:
// buffer, that's inexplicable and therefore serious.
void CloseChannelIfSSLErrorIsSerious(int retval);
FLpxChannel(FLpxSocketsI *lsi, FSocket* sock, int chid, SSL_CTX* ctx, EChanState state);
FLpxChannel(FlxSocketsI *lsi, FSocket* sock, int chid, SSL_CTX* ctx, EChanState state);
FLpxChannel() : FLpxChannel(nullptr, nullptr, 0, nullptr, CHAN_INACTIVE) {}
~FLpxChannel() { }
};
@@ -183,7 +183,7 @@ public:
//
/////////////////////////////////////////////////////////////////
class FLpxSocketsI : public FLpxSockets
class FlxSocketsI : public FlxSockets
{
public:
// Fatal error status.
@@ -208,8 +208,8 @@ public:
SSL_CTX* ClientSecureCTX;
SSL_CTX* ClientInsecureCTX;
FLpxSocketsI(FLockedWrapper &w);
virtual ~FLpxSocketsI() override;
FlxSocketsI(FlxLockedWrapper &w);
virtual ~FlxSocketsI() override;
// Copy the trace to the DPrint output.
void DPrintTrace();
@@ -229,10 +229,10 @@ public:
void HandleSocketInputOutput();
// Force Close Everything.
virtual void ForceCloseEverything(FLockedWrapper& w);
virtual void ForceCloseEverything(FlxLockedWrapper& w);
// Main update routine.
virtual void Update(FLockedWrapper &w) override;
virtual void Update(FlxLockedWrapper &w) override;
};
/////////////////////////////////////////////////////////////////
@@ -506,7 +506,7 @@ static void BIODiscard(BIO* b, int nbytes, char* chbuf) {
/////////////////////////////////////////////////////////////////
#pragma optimize("", off)
FLpxChannel::FLpxChannel(FLpxSocketsI* lsi, FSocket* sock, int chid, SSL_CTX* ctx, EChanState st)
FLpxChannel::FLpxChannel(FlxSocketsI* lsi, FSocket* sock, int chid, SSL_CTX* ctx, EChanState st)
{
LSI = lsi;
ChannelID = chid;
@@ -767,7 +767,7 @@ void FLpxChannel::Advance()
//
/////////////////////////////////////////////////////////////////
FLpxListener::FLpxListener(FLpxSocketsI *lsi, int bp, FSocket *sock)
FLpxListener::FLpxListener(FlxSocketsI *lsi, int bp, FSocket *sock)
{
LSI = lsi;
BoundPort = bp;
@@ -804,7 +804,7 @@ void FLpxListener::AcceptConnection()
/////////////////////////////////////////////////////////////////
void FLpxSocketsI::SetError(const std::string& s)
void FlxSocketsI::SetError(const std::string& s)
{
if (FatalError.empty()) {
FatalError = s;
@@ -812,7 +812,7 @@ void FLpxSocketsI::SetError(const std::string& s)
}
FLpxSocketsI::FLpxSocketsI(FLockedWrapper &w)
FlxSocketsI::FlxSocketsI(FlxLockedWrapper &w)
{
// We retain this pointer only so long as we have the wrapper lock.
Luprex = w.Get();
@@ -857,7 +857,7 @@ FLpxSocketsI::FLpxSocketsI(FLockedWrapper &w)
Luprex = nullptr;
}
void FLpxSocketsI::ForceCloseEverything(FLockedWrapper& w)
void FlxSocketsI::ForceCloseEverything(FlxLockedWrapper& w)
{
// We retain this pointer only so long as we have the wrapper lock.
Luprex = w.Get();
@@ -877,7 +877,7 @@ void FLpxSocketsI::ForceCloseEverything(FLockedWrapper& w)
Luprex = nullptr;
}
FLpxSocketsI::~FLpxSocketsI()
FlxSocketsI::~FlxSocketsI()
{
checkf(Channels.IsEmpty(), TEXT("Must call ForceCloseEverything before destructor"));
@@ -900,7 +900,7 @@ FLpxSocketsI::~FLpxSocketsI()
// TODO: Be more thorough.
}
void FLpxSocketsI::DPrintTrace()
void FlxSocketsI::DPrintTrace()
{
char* data;
int ndata = BIO_get_mem_data(TraceBIO, &data);
@@ -909,7 +909,7 @@ void FLpxSocketsI::DPrintTrace()
BIO_reset(TraceBIO);
}
bool FLpxSocketsI::ListeningOnPort(int p)
bool FlxSocketsI::ListeningOnPort(int p)
{
for (const FLpxListener& l : Listeners)
{
@@ -918,7 +918,7 @@ bool FLpxSocketsI::ListeningOnPort(int p)
return false;
}
void FLpxSocketsI::HandleListenPorts()
void FlxSocketsI::HandleListenPorts()
{
uint32_t nports; const uint32_t* ports;
Luprex->get_listen_ports(Luprex, &nports, &ports);
@@ -941,7 +941,7 @@ void FLpxSocketsI::HandleListenPorts()
}
void FLpxSocketsI::HandleNewOutgoingSockets()
void FlxSocketsI::HandleNewOutgoingSockets()
{
uint32_t nchids; const uint32_t* chids;
Luprex->get_new_outgoing(Luprex, &nchids, &chids);
@@ -980,7 +980,7 @@ void FLpxSocketsI::HandleNewOutgoingSockets()
}
void FLpxSocketsI::RemoveInactiveChannels()
void FlxSocketsI::RemoveInactiveChannels()
{
int i = 0;
int n = Channels.Num();
@@ -1003,7 +1003,7 @@ void FLpxSocketsI::RemoveInactiveChannels()
void FLpxSocketsI::HandleSocketInputOutput()
void FlxSocketsI::HandleSocketInputOutput()
{
for (FLpxListener& listener : Listeners)
{
@@ -1020,7 +1020,7 @@ void FLpxSocketsI::HandleSocketInputOutput()
RemoveInactiveChannels();
}
void FLpxSocketsI::Update(FLockedWrapper &w)
void FlxSocketsI::Update(FlxLockedWrapper &w)
{
// We retain this pointer only so long as we have the wrapper lock.
Luprex = w.Get();
@@ -1032,7 +1032,7 @@ void FLpxSocketsI::Update(FLockedWrapper &w)
Luprex = nullptr;
}
FLpxSockets* FLpxSockets::Create(FLockedWrapper &w)
FlxSockets* FlxSockets::Create(FlxLockedWrapper &w)
{
return new FLpxSocketsI(w);
return new FlxSocketsI(w);
}