Config file reader. We async_resolve.

CMakeLists.txt

@@ -30,6 +30,6 @@ set(CMAKE_CXX_EXTENSIONS ON)
 FIND_PACKAGE( Boost 1.60 COMPONENTS program_options REQUIRED )
 INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIR} )
 
-ADD_EXECUTABLE( twproxy twproxy.cpp)
+ADD_EXECUTABLE( twproxy twproxy.cpp config.cpp)
 TARGET_LINK_LIBRARIES( twproxy ${Boost_LIBRARIES} pthread )
 

config.cpp

@@ -0,0 +1,55 @@
+#include "config.h"
+#include <fstream>
+#include <iostream>
+
+// just in case if I need it.
+void string_trim(std::string &value) {
+  while (*value.begin() == ' ')
+    value.erase(value.begin());
+  while (*(value.end() - 1) == ' ')
+    value.erase(value.end() - 1);
+}
+
+/*
+#include <algorithm>
+void string_toupper(std::string &str) {
+std::transform(str.begin(), str.end(),str.begin(), ::toupper);
+}
+*/
+
+std::map<std::string, std::string> yaml_parse(std::string filename) {
+  std::map<std::string, std::string> results;
+  std::string line;
+  std::ifstream file(filename);
+  if (!file.is_open())
+    return results;
+
+  while (std::getline(file, line)) {
+    if (line.empty())
+      continue;
+    if (line[0] == '#' || line[0] == ';' || line[0] == ':' || line[0] == '%' ||
+        line[0] == '-')
+      continue;
+
+    // We're going for YAML-like here
+    // # comment
+    // ; comment
+    // KEY: value
+    // KEY: "value is in here"
+
+    size_t pos = line.find(": ");
+    if (pos != std::string::npos) {
+      // Ok, we found something
+      std::string key = line.substr(0, pos);
+      std::string value = line.substr(pos + 2);
+
+      if (value[0] == '"' && value[value.size() - 1] == '"') {
+        value = value.substr(1, value.size() - 2);
+      }
+      // std::cout << "KEY[" << key << "] : (" << value << ")" << std::endl;
+      results[key] = value;
+    }
+  }
+
+  return results;
+}

config.h

@@ -0,0 +1,5 @@
+
+#include <map>
+#include <string>
+
+std::map<std::string, std::string> yaml_parse(std::string filename);

twproxy.cpp

@@ -14,28 +14,8 @@
 #include <cstdlib>
 #include <iostream>
 
-// #include <boost/json.hpp>
-// #include <boost/json/src.hpp>
-
-// <boost/json.hpp>
-#ifdef WORKING_JSON
-json::value parse_file(char const *filename) {
-  file f(filename, "r");
-  json::stream_parser p;
-  json::error_code ec;
-  do {
-    char buf[4096];
-    auto const nread = f.read(buf, sizeof(buf));
-    p.write(buf, nread, ec);
-  } while (!f.eof());
-  if (ec)
-    return nullptr;
-  p.finish(ec);
-  if (ec)
-    return nullptr;
-  return p.release();
-}
-#endif
+#include "config.h"
+
 
 class session : public std::enable_shared_from_this<session> {
 public:
@@ -53,10 +33,15 @@ public:
   }
 
   ~session() { std::cout << "~session" << std::endl; }
+
   void parse_auth(void) {
     // how many nulls should I be seeing?
     // \0user\0pass\0terminal/SPEED\0
     // Maybe in the future I'll care about parsing this out.  I don't right now.
+
+    // Ok, yes I do!  If I don't have a proper rlogin value here, it isn't going
+    // to work when I try to connect to the rlogin server.
+
     if (rlogin_auth.size() > 10)
       rlogin_name = rlogin_auth.c_str() + 1;
     else
@@ -70,7 +55,7 @@ public:
 
     if (!error) {
       for (boost::asio::ip::tcp::endpoint const &endpoint : results) {
-        std::cout << "GOT: " <<  endpoint << "\n";
+        std::cout << "GOT: " << endpoint << "\n";
       }
     } else {
       std::cout << "Unable to resolve?" << std::endl;
@@ -170,7 +155,8 @@ private:
   boost::asio::ip::tcp::socket socket_;
   boost::asio::io_service &io_service_;
   boost::asio::ip::tcp::resolver resolver_;
-
+  boost::asio::ip::tcp::socket server_;
+  
   // std::string read_buffer;
   char read_buffer[1024];
   std::string rlogin_auth;
@@ -179,6 +165,14 @@ private:
   std::string port;
 };
 
+/*
+maybe move the resolver part to the server, so I don't need io_service?
+
+I'm not sure what the socket connection part is going to need just yet,
+so I probably won't move that just yet.  [NNY!]
+
+*/
+
 class server {
 
 public:
@@ -216,16 +210,33 @@ int main(int argc, char *argv[]) {
     return EXIT_FAILURE;
   }
 
+  std::map<std::string, std::string> config = yaml_parse(argv[1]);
+
+  /*
   try {
     // Parse the file as JSON
-    // config = parse_file( argv[1] );
+    config = yaml_parse( argv[1] );
 
   } catch (std::exception const &e) {
     std::cerr << "Caught exception: " << e.what() << std::endl;
     return EXIT_FAILURE;
   }
+  */
+
+  bool config_ok = true;
+
+  for (const char *key : {"server", "host", "port"}) {
+    auto pos = config.find(key);
+    if (pos == config.end()) {
+      config_ok = false;
+      std::cout << "Config file missing: " << key << std::endl;
+    }
+  }
+  if (!config_ok)
+    return 2;
 
-  int port = 9999; // 2002;
+  int port = std::stoi(config["server"]);
+  // int port = 9999; // 2002;
 
   try {
 
@@ -234,7 +245,8 @@ int main(int argc, char *argv[]) {
     boost::asio::ip::tcp::endpoint endpoint(boost::asio::ip::tcp::v4(),
                                             port); // std::atoi(argv[i]));
     // connect to the BBS
-    server s(io_service, endpoint, "127.0.0.1", "2023");
+    server s(io_service, endpoint, config["host"], config["port"]);
+    //"127.0.0.1", "2023");
 
     io_service.run();
   } catch (std::exception &e) {