Remove writeConnFailedFromScratch()
It is static and only used from a single place, so let's inline it.
diff --git a/common/rfb/SConnection.cxx b/common/rfb/SConnection.cxx
index 6b4a5c4..a79abee 100644
--- a/common/rfb/SConnection.cxx
+++ b/common/rfb/SConnection.cxx
@@ -260,15 +260,6 @@
throw ConnFailedException(str);
}
-void SConnection::writeConnFailedFromScratch(const char* msg,
- rdr::OutStream* os)
-{
- os->writeBytes("RFB 003.003\n", 12);
- os->writeU32(0);
- os->writeString(msg);
- os->flush();
-}
-
void SConnection::setAccessRights(AccessRights ar)
{
accessRights = ar;
diff --git a/common/rfb/SConnection.h b/common/rfb/SConnection.h
index 7148294..92ddff7 100644
--- a/common/rfb/SConnection.h
+++ b/common/rfb/SConnection.h
@@ -154,13 +154,6 @@
// ConnFailedException.
void throwConnFailedException(const char* format, ...) __printf_attr(2, 3);
- // writeConnFailedFromScratch() sends a conn failed message to an OutStream
- // without the need to negotiate the protocol version first. It actually
- // does this by assuming that the client will understand version 3.3 of the
- // protocol.
- static void writeConnFailedFromScratch(const char* msg,
- rdr::OutStream* os);
-
SMsgReader* reader() { return reader_; }
SMsgWriter* writer() { return writer_; }
diff --git a/common/rfb/VNCServerST.cxx b/common/rfb/VNCServerST.cxx
index cf2a114..038da3d 100644
--- a/common/rfb/VNCServerST.cxx
+++ b/common/rfb/VNCServerST.cxx
@@ -126,8 +126,13 @@
if (blHosts->isBlackmarked(address.buf)) {
connectionsLog.error("blacklisted: %s", address.buf);
try {
- SConnection::writeConnFailedFromScratch("Too many security failures",
- &sock->outStream());
+ rdr::OutStream& os = sock->outStream();
+
+ // Shortest possible way to tell a client it is not welcome
+ os.writeBytes("RFB 003.003\n", 12);
+ os.writeU32(0);
+ os.writeString("Too many security failures");
+ os.flush();
} catch (rdr::Exception&) {
}
sock->shutdown();