chore: Adjust Clang-format linter rules
120 Column Lines Block Indent for Bracket Align Custom Line Break Rules No Single Line Functions
This commit is contained in:
@ -45,36 +45,35 @@
|
||||
// ClientProxyUnknown
|
||||
//
|
||||
|
||||
ClientProxyUnknown::ClientProxyUnknown(
|
||||
deskflow::IStream *stream, double timeout, Server *server,
|
||||
IEventQueue *events)
|
||||
ClientProxyUnknown::ClientProxyUnknown(deskflow::IStream *stream, double timeout, Server *server, IEventQueue *events)
|
||||
: m_stream(stream),
|
||||
m_proxy(NULL),
|
||||
m_ready(false),
|
||||
m_server(server),
|
||||
m_events(events) {
|
||||
m_events(events)
|
||||
{
|
||||
assert(m_server != NULL);
|
||||
|
||||
m_events->adoptHandler(
|
||||
Event::kTimer, this,
|
||||
new TMethodEventJob<ClientProxyUnknown>(
|
||||
this, &ClientProxyUnknown::handleTimeout, NULL));
|
||||
Event::kTimer, this, new TMethodEventJob<ClientProxyUnknown>(this, &ClientProxyUnknown::handleTimeout, NULL)
|
||||
);
|
||||
m_timer = m_events->newOneShotTimer(timeout, this);
|
||||
addStreamHandlers();
|
||||
|
||||
LOG((CLOG_DEBUG1 "saying hello"));
|
||||
ProtocolUtil::writef(
|
||||
m_stream, kMsgHello, kProtocolMajorVersion, kProtocolMinorVersion);
|
||||
ProtocolUtil::writef(m_stream, kMsgHello, kProtocolMajorVersion, kProtocolMinorVersion);
|
||||
}
|
||||
|
||||
ClientProxyUnknown::~ClientProxyUnknown() {
|
||||
ClientProxyUnknown::~ClientProxyUnknown()
|
||||
{
|
||||
removeHandlers();
|
||||
removeTimer();
|
||||
delete m_stream;
|
||||
delete m_proxy;
|
||||
}
|
||||
|
||||
ClientProxy *ClientProxyUnknown::orphanClientProxy() {
|
||||
ClientProxy *ClientProxyUnknown::orphanClientProxy()
|
||||
{
|
||||
if (m_ready) {
|
||||
removeHandlers();
|
||||
ClientProxy *proxy = m_proxy;
|
||||
@ -85,13 +84,15 @@ ClientProxy *ClientProxyUnknown::orphanClientProxy() {
|
||||
}
|
||||
}
|
||||
|
||||
void ClientProxyUnknown::sendSuccess() {
|
||||
void ClientProxyUnknown::sendSuccess()
|
||||
{
|
||||
m_ready = true;
|
||||
removeTimer();
|
||||
m_events->addEvent(Event(m_events->forClientProxyUnknown().success(), this));
|
||||
}
|
||||
|
||||
void ClientProxyUnknown::sendFailure() {
|
||||
void ClientProxyUnknown::sendFailure()
|
||||
{
|
||||
delete m_proxy;
|
||||
m_proxy = NULL;
|
||||
m_ready = false;
|
||||
@ -100,50 +101,49 @@ void ClientProxyUnknown::sendFailure() {
|
||||
m_events->addEvent(Event(m_events->forClientProxyUnknown().failure(), this));
|
||||
}
|
||||
|
||||
void ClientProxyUnknown::addStreamHandlers() {
|
||||
void ClientProxyUnknown::addStreamHandlers()
|
||||
{
|
||||
assert(m_stream != NULL);
|
||||
|
||||
m_events->adoptHandler(
|
||||
m_events->forIStream().inputReady(), m_stream->getEventTarget(),
|
||||
new TMethodEventJob<ClientProxyUnknown>(
|
||||
this, &ClientProxyUnknown::handleData));
|
||||
new TMethodEventJob<ClientProxyUnknown>(this, &ClientProxyUnknown::handleData)
|
||||
);
|
||||
m_events->adoptHandler(
|
||||
m_events->forIStream().outputError(), m_stream->getEventTarget(),
|
||||
new TMethodEventJob<ClientProxyUnknown>(
|
||||
this, &ClientProxyUnknown::handleWriteError));
|
||||
new TMethodEventJob<ClientProxyUnknown>(this, &ClientProxyUnknown::handleWriteError)
|
||||
);
|
||||
m_events->adoptHandler(
|
||||
m_events->forIStream().inputShutdown(), m_stream->getEventTarget(),
|
||||
new TMethodEventJob<ClientProxyUnknown>(
|
||||
this, &ClientProxyUnknown::handleDisconnect));
|
||||
new TMethodEventJob<ClientProxyUnknown>(this, &ClientProxyUnknown::handleDisconnect)
|
||||
);
|
||||
m_events->adoptHandler(
|
||||
m_events->forIStream().outputShutdown(), m_stream->getEventTarget(),
|
||||
new TMethodEventJob<ClientProxyUnknown>(
|
||||
this, &ClientProxyUnknown::handleWriteError));
|
||||
new TMethodEventJob<ClientProxyUnknown>(this, &ClientProxyUnknown::handleWriteError)
|
||||
);
|
||||
}
|
||||
|
||||
void ClientProxyUnknown::addProxyHandlers() {
|
||||
void ClientProxyUnknown::addProxyHandlers()
|
||||
{
|
||||
assert(m_proxy != NULL);
|
||||
|
||||
m_events->adoptHandler(
|
||||
m_events->forClientProxy().ready(), m_proxy,
|
||||
new TMethodEventJob<ClientProxyUnknown>(
|
||||
this, &ClientProxyUnknown::handleReady));
|
||||
new TMethodEventJob<ClientProxyUnknown>(this, &ClientProxyUnknown::handleReady)
|
||||
);
|
||||
m_events->adoptHandler(
|
||||
m_events->forClientProxy().disconnected(), m_proxy,
|
||||
new TMethodEventJob<ClientProxyUnknown>(
|
||||
this, &ClientProxyUnknown::handleDisconnect));
|
||||
new TMethodEventJob<ClientProxyUnknown>(this, &ClientProxyUnknown::handleDisconnect)
|
||||
);
|
||||
}
|
||||
|
||||
void ClientProxyUnknown::removeHandlers() {
|
||||
void ClientProxyUnknown::removeHandlers()
|
||||
{
|
||||
if (m_stream != NULL) {
|
||||
m_events->removeHandler(
|
||||
m_events->forIStream().inputReady(), m_stream->getEventTarget());
|
||||
m_events->removeHandler(
|
||||
m_events->forIStream().outputError(), m_stream->getEventTarget());
|
||||
m_events->removeHandler(
|
||||
m_events->forIStream().inputShutdown(), m_stream->getEventTarget());
|
||||
m_events->removeHandler(
|
||||
m_events->forIStream().outputShutdown(), m_stream->getEventTarget());
|
||||
m_events->removeHandler(m_events->forIStream().inputReady(), m_stream->getEventTarget());
|
||||
m_events->removeHandler(m_events->forIStream().outputError(), m_stream->getEventTarget());
|
||||
m_events->removeHandler(m_events->forIStream().inputShutdown(), m_stream->getEventTarget());
|
||||
m_events->removeHandler(m_events->forIStream().outputShutdown(), m_stream->getEventTarget());
|
||||
}
|
||||
if (m_proxy != NULL) {
|
||||
m_events->removeHandler(m_events->forClientProxy().ready(), m_proxy);
|
||||
@ -151,7 +151,8 @@ void ClientProxyUnknown::removeHandlers() {
|
||||
}
|
||||
}
|
||||
|
||||
void ClientProxyUnknown::removeTimer() {
|
||||
void ClientProxyUnknown::removeTimer()
|
||||
{
|
||||
if (m_timer != NULL) {
|
||||
m_events->deleteTimer(m_timer);
|
||||
m_events->removeHandler(Event::kTimer, this);
|
||||
@ -159,7 +160,8 @@ void ClientProxyUnknown::removeTimer() {
|
||||
}
|
||||
}
|
||||
|
||||
void ClientProxyUnknown::initProxy(const String &name, int major, int minor) {
|
||||
void ClientProxyUnknown::initProxy(const String &name, int major, int minor)
|
||||
{
|
||||
if (major == 1) {
|
||||
switch (minor) {
|
||||
case 0:
|
||||
@ -206,7 +208,8 @@ void ClientProxyUnknown::initProxy(const String &name, int major, int minor) {
|
||||
}
|
||||
}
|
||||
|
||||
void ClientProxyUnknown::handleData(const Event &, void *) {
|
||||
void ClientProxyUnknown::handleData(const Event &, void *)
|
||||
{
|
||||
LOG((CLOG_DEBUG1 "parsing hello reply"));
|
||||
|
||||
String name("<unknown>");
|
||||
@ -239,9 +242,7 @@ void ClientProxyUnknown::handleData(const Event &, void *) {
|
||||
initProxy(name, major, minor);
|
||||
|
||||
// the proxy is created and now proxy now owns the stream
|
||||
LOG(
|
||||
(CLOG_DEBUG1 "created proxy for client \"%s\" version %d.%d",
|
||||
name.c_str(), major, minor));
|
||||
LOG((CLOG_DEBUG1 "created proxy for client \"%s\" version %d.%d", name.c_str(), major, minor));
|
||||
m_stream = NULL;
|
||||
|
||||
// wait until the proxy signals that it's ready or has disconnected
|
||||
@ -249,38 +250,38 @@ void ClientProxyUnknown::handleData(const Event &, void *) {
|
||||
return;
|
||||
} catch (XIncompatibleClient &e) {
|
||||
// client is incompatible
|
||||
LOG(
|
||||
(CLOG_WARN "client \"%s\" has incompatible version %d.%d)",
|
||||
name.c_str(), e.getMajor(), e.getMinor()));
|
||||
ProtocolUtil::writef(
|
||||
m_stream, kMsgEIncompatible, kProtocolMajorVersion,
|
||||
kProtocolMinorVersion);
|
||||
LOG((CLOG_WARN "client \"%s\" has incompatible version %d.%d)", name.c_str(), e.getMajor(), e.getMinor()));
|
||||
ProtocolUtil::writef(m_stream, kMsgEIncompatible, kProtocolMajorVersion, kProtocolMinorVersion);
|
||||
} catch (XBadClient &) {
|
||||
// client not behaving
|
||||
LOG((CLOG_WARN "protocol error from client \"%s\"", name.c_str()));
|
||||
ProtocolUtil::writef(m_stream, kMsgEBad);
|
||||
} catch (XBase &e) {
|
||||
// misc error
|
||||
LOG(
|
||||
(CLOG_WARN "error communicating with client \"%s\": %s", name.c_str(),
|
||||
e.what()));
|
||||
LOG((CLOG_WARN "error communicating with client \"%s\": %s", name.c_str(), e.what()));
|
||||
}
|
||||
sendFailure();
|
||||
}
|
||||
|
||||
void ClientProxyUnknown::handleWriteError(const Event &, void *) {
|
||||
void ClientProxyUnknown::handleWriteError(const Event &, void *)
|
||||
{
|
||||
LOG((CLOG_NOTE "error communicating with new client"));
|
||||
sendFailure();
|
||||
}
|
||||
|
||||
void ClientProxyUnknown::handleTimeout(const Event &, void *) {
|
||||
void ClientProxyUnknown::handleTimeout(const Event &, void *)
|
||||
{
|
||||
LOG((CLOG_NOTE "new client is unresponsive"));
|
||||
sendFailure();
|
||||
}
|
||||
|
||||
void ClientProxyUnknown::handleDisconnect(const Event &, void *) {
|
||||
void ClientProxyUnknown::handleDisconnect(const Event &, void *)
|
||||
{
|
||||
LOG((CLOG_NOTE "new client disconnected"));
|
||||
sendFailure();
|
||||
}
|
||||
|
||||
void ClientProxyUnknown::handleReady(const Event &, void *) { sendSuccess(); }
|
||||
void ClientProxyUnknown::handleReady(const Event &, void *)
|
||||
{
|
||||
sendSuccess();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user