Added server_telnet to config. Can now telnet.

session.cpp

@@ -18,8 +18,9 @@
 
 Session::Session(boost::asio::ip::tcp::socket socket,
                  boost::asio::io_service &io_service, std::string hostname,
-                 std::string port)
-    : socket_(std::move(socket)),
+                 std::string port, bool server_telnet_)
+    : server_telnet{server_telnet_},
+      socket_(std::move(socket)),
       io_service_{io_service},
       resolver_{io_service},
       server_{io_service},
@@ -39,7 +40,7 @@ Session::Session(boost::asio::ip::tcp::socket socket,
   director.to_server = boost::bind(&Session::to_server, this, _1);
   director.to_client = boost::bind(&Session::to_client, this, _1);
   director.post = boost::bind(&Session::post, this, _1);
-  
+
   // too soon!
   // director.username = rlogin_name;
 
@@ -111,14 +112,16 @@ void Session::on_connect(const boost::system::error_code error) {
     BUGZ_LOG(info) << "Connected to " << host;
     to_client("Connected...\n\r");
     connected = true;
-    if (rlogin_auth[0] != 0) {
-      // Ok, the rlogin information was junk --
-      to_client("Let me make up some fake rlogin data for you...\n\r");
-      char temp[] = "\0test\0test\0terminal/9600\0";
-      std::string tmp(temp, sizeof(temp));
-      to_server(tmp);
-    } else {
-      to_server(rlogin_auth);
+    if (!server_telnet) {
+      if (rlogin_auth[0] != 0) {
+        // Ok, the rlogin information was junk --
+        to_client("Let me make up some fake rlogin data for you...\n\r");
+        char temp[] = "\0test\0test\0terminal/9600\0";
+        std::string tmp(temp, sizeof(temp));
+        to_server(tmp);
+      } else {
+        to_server(rlogin_auth);
+      }
     }
 
     server_read();
@@ -318,6 +321,33 @@ void Session::on_server_prompt(const std::string &prompt,
   std::string temp = repr(prompt);
   BUGZ_LOG(warning) << "SP: [" << temp << "]";
   director.server_prompt(prompt, raw_prompt);
+  if (server_telnet) {
+    std::string ayt = std::string( (const char *)"\x00\xff\xfd\xf6", 4 );
+    std::string ayt_resp = std::string((const char *)"\xff\xfb\x00", 3);
+    std::string ayt2 = std::string( (const char *)"\xff\xfb\x00", 3);
+    std::string ayt2_resp = std::string((const char *)"\xff\xfd\x00", 3);
+
+    /*
+    for( const char & c : prompt ) {
+      BUGZ_LOG(fatal) << "IS? " << (unsigned int)c << " " << std::hex << (unsigned int)c;
+    }
+
+    for( const char & c : ayt ) {
+      BUGZ_LOG(fatal) << "AYT? " << (unsigned int)c << " " << std::hex << (unsigned int)c;
+    }
+    */
+
+    if (prompt == ayt) {
+      to_server(ayt_resp);
+      BUGZ_LOG(fatal) << "AYT?";
+      server_prompt.clear();
+    }
+    if (prompt == ayt2) {
+      to_server(ayt2_resp);
+      BUGZ_LOG(fatal) << "AYT2??";
+      server_prompt.clear();
+    }
+  }
 }
 
 void Session::on_prompt_timeout(const boost::system::error_code error) {
@@ -629,8 +659,10 @@ void Session::stayin_alive(const boost::system::error_code error) {
 
 Server::Server(boost::asio::io_service &io_service,
                const boost::asio::ip::tcp::endpoint &endpoint,
-               const std::string &host, const std::string &port)
-    : io_service_{io_service},
+               const std::string &host, const std::string &port,
+               bool server_telnet_)
+    : server_telnet{server_telnet_},
+      io_service_{io_service},
       acceptor_{io_service_, endpoint},
       signal_{io_service, SIGUSR1, SIGTERM},
       host_{host},
@@ -670,7 +702,8 @@ void Server::do_accept(void) {
                                 boost::asio::ip::tcp::socket socket) {
     if (!ec) {
       BUGZ_LOG(info) << "Server::do_accept()";
-      std::make_shared<Session>(std::move(socket), io_service_, host_, port_)
+      std::make_shared<Session>(std::move(socket), io_service_, host_, port_,
+                                server_telnet)
           ->start();
     }
 
@@ -680,5 +713,3 @@ void Server::do_accept(void) {
     }
   });
 }
-
-

session.h

@@ -24,7 +24,7 @@ class Session : public std::enable_shared_from_this<Session> {
  public:
   Session(boost::asio::ip::tcp::socket socket,
           boost::asio::io_service &io_service, std::string hostname,
-          std::string port);
+          std::string port, bool server_telnet_);
 
   ~Session();
 
@@ -45,6 +45,7 @@ class Session : public std::enable_shared_from_this<Session> {
   // these move to Director
   // bool show_client = true;
   bool talk_direct = true;
+  bool server_telnet;
 
   void post(notifyFunc nf);
 
@@ -193,13 +194,14 @@ class Server {
  public:
   Server(boost::asio::io_service &io_service,
          const boost::asio::ip::tcp::endpoint &endpoint,
-         const std::string &host, const std::string &port);
+         const std::string &host, const std::string &port, bool server_telnet_);
   ~Server();
 
  private:
   void do_accept(void);
   void on_signal(const boost::system::error_code &ec, int signal);
 
+  bool server_telnet;
   boost::asio::io_service &io_service_;
   boost::asio::ip::tcp::acceptor acceptor_;
   boost::asio::signal_set signal_;

twproxy.cpp

@@ -50,8 +50,7 @@ void init_logging(void) {
 
   // "proxy-%Y-%m-%d.log"
   std::string log_filename = "proxy.log";
-  if (CONFIG["log_file"])
-    log_filename = CONFIG["log_file"].as<std::string>();
+  if (CONFIG["log_file"]) log_filename = CONFIG["log_file"].as<std::string>();
 
   //  = from_config("log_file", "proxy.log");
   // "%I:%M:%S.%f %p"
@@ -74,8 +73,7 @@ void init_logging(void) {
   }
 
   std::cout << "Logging to: ";
-  if (console)
-    std::cout << "console + ";
+  if (console) std::cout << "console + ";
   std::cout << log_filename << " level: " << log_level
             << " flush: " << log_autoflush << " format: " << log_timeformat
             << std::endl;
@@ -120,7 +118,7 @@ int main(int argc, char *argv[]) {
   bool config_ok = true;
 
   // for (const char *key : {"server", "host", "port"}) {
-  for (auto key : {"server", "host", "port", "db"}) {
+  for (auto key : {"server", "host", "port"}) {
     if (!CONFIG[key]) {
       config_ok = false;
       std::cout << "Config file missing: " << key << std::endl;
@@ -134,24 +132,29 @@ int main(int argc, char *argv[]) {
     BUGZ_LOG(info) << "Config: " << key << " : " << value;
   }
 
-  if (!config_ok)
-    return EXIT_FAILURE;
+  if (!config_ok) return EXIT_FAILURE;
 
   int port = CONFIG["server"].as<int>();
   // int port = 9999; // 2002;
 
   try {
+    bool telnet = false;
+
+    if (CONFIG["server_telnet"]) {
+      telnet = true;
+      BUGZ_LOG(fatal) << "Connect to server via TELNET";
+    }
 
     boost::asio::io_service io_service;
 
     boost::asio::ip::tcp::endpoint endpoint(boost::asio::ip::tcp::v4(),
-                                            port); // std::atoi(argv[i]));
+                                            port);  // std::atoi(argv[i]));
     // connect to the game server
     std::string host = CONFIG["host"].as<std::string>();
     std::string port = CONFIG["port"].as<std::string>();
     BUGZ_LOG(fatal) << "host: " << host << " port: " << port;
 
-    Server serve(io_service, endpoint, host, port);
+    Server serve(io_service, endpoint, host, port, telnet);
 
     io_service.run();
   } catch (std::exception &e) {