This is mostly broken. director is session.

So I need to delete the director.
I'm going to try to have the dispatchers
work with session.  (.. still not sure
how parameters/return values will work
now ..)

Try and see.

CMakeLists.txt

@@ -33,6 +33,6 @@ FIND_PACKAGE( Boost 1.60 COMPONENTS program_options log_setup log REQUIRED )
 INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIR} )
 
 
-ADD_EXECUTABLE( twproxy twproxy.cpp config.cpp session.cpp director.cpp )
+ADD_EXECUTABLE( twproxy twproxy.cpp config.cpp session.cpp director.cpp dispatchers.cpp )
 TARGET_LINK_LIBRARIES( twproxy ${Boost_LIBRARIES} pthread )
 

director.cpp

@@ -1,17 +1,12 @@
 #include "director.h"
 
-Dispatch::Dispatch(Director &dir) : d{dir} {};
 
-// virtuals
-void Dispatch::server_line(const std::string &line){};
-void Dispatch::server_prompt(const std::string &prompt){};
-void Dispatch::client_input(const std::string &input){};
-
-void Dispatch::to_server(const std::string &send) { d.to_server(send); }
-void Dispatch::to_client(const std::string &send) { d.to_client(send); }
-const std::string &Dispatch::get_prompt(void) { return d.get_prompt(); }
-
-Director::Director(Session &s) : session{s} {}
+Director::Director(Session &s) : session{s} {
+  server_line_(nullptr);
+  server_prompt_(nullptr);
+  client_input_(nullptr);
+  to_client_ = true;
+}
 
 void Director::server_line(const std::string &line) {
   if (server_line_)

director.h

@@ -3,7 +3,6 @@
 
 #include <functional>
 #include <string>
-#include "session.h"
 
 typedef std::function<void(const std::string &)> stringFunc;
 
@@ -15,25 +14,8 @@ struct OldValues {
 };
 
 class Director;
-
-// possibly setup a timer to call Dispatch.
-
-class Dispatch {
-protected:
-  OldValues original;
-  Director &d;
-
-public:
-  Dispatch(Director &);
-
-  virtual void server_line(const std::string &line);
-  virtual void server_prompt(const std::string &prompt);
-  virtual void client_input(const std::string &input);
-
-  const std::string & get_prompt(void);
-  void to_server(const std::string &send);
-  void to_client(const std::string &send);
-};
+#include "session.h"
+#include "dispatchers.h"
 
 class Director {
 private:
@@ -50,7 +32,7 @@ public:
   // since it has direct access to us.
   void to_server(const std::string &send);
   void to_client(const std::string &send);
-  const std::string& get_prompt(void);
+  const std::string &get_prompt(void);
 
   void set_server_line(stringFunc new_sl);
   void set_server_prompt(stringFunc new_sp);

dispatchers.cpp

@@ -0,0 +1,28 @@
+#include "dispatchers.h"
+
+#include "logging.h"
+
+Dispatch::Dispatch(Director &dir) : d{dir} {};
+
+// virtuals
+/*
+void Dispatch::server_line(const std::string &line){};
+void Dispatch::server_prompt(const std::string &prompt){};
+void Dispatch::client_input(const std::string &input){};
+*/
+
+void Dispatch::to_server(const std::string &send) { d.to_server(send); }
+void Dispatch::to_client(const std::string &send) { d.to_client(send); }
+const std::string &Dispatch::get_prompt(void) { return d.get_prompt(); }
+
+CoreDispatch::CoreDispatch(Director &d) : Dispatch{d} {
+    d.set_server_line( [this](const std::string &s){ server_line(s); } );
+    d.set_server_prompt( [this](const std::string &s){ server_prompt(s); } );
+    d.set_client_input( [this](const std::string &s){ client_input(s); } );
+}
+
+void CoreDispatch::server_line(const std::string &line) {}
+void CoreDispatch::server_prompt(const std::string &prompt) {}
+void CoreDispatch::client_input(const std::string &input) {
+    BUGZ_LOG(warning) << "Got: " << input << " prompt=" << get_prompt();
+}

dispatchers.h

@@ -0,0 +1,34 @@
+#ifndef DISPATCHERS_H
+#define DISPATCHERS_H
+
+#include "director.h"
+
+// possibly setup a timer to call Dispatch.
+
+class Dispatch {
+protected:
+  OldValues original;
+  Director &d;
+
+public:
+  Dispatch(Director &);
+
+  virtual void server_line(const std::string &line) = 0;
+  virtual void server_prompt(const std::string &prompt) = 0;
+  virtual void client_input(const std::string &input) = 0;
+
+  const std::string &get_prompt(void);
+  void to_server(const std::string &send);
+  void to_client(const std::string &send);
+};
+
+class CoreDispatch : public Dispatch {
+public:
+  CoreDispatch(Director &d);
+
+  void server_line(const std::string &line) override;
+  void server_prompt(const std::string &prompt) override;
+  void client_input(const std::string &input) override;
+};
+
+#endif

logging.h

@@ -0,0 +1,10 @@
+#include <boost/log/trivial.hpp>
+#include <iomanip>
+
+const char *trim_path(const char *filepath);
+
+#define BUGZ_LOG(severity)                                                     \
+  BOOST_LOG_TRIVIAL(severity)                                                  \
+      << "(" << std::setw(15) << trim_path(__FILE__) << ":" << std::setw(4)    \
+      << std::left << __LINE__ << ") "
+      

session.cpp

@@ -2,13 +2,15 @@
 #include <iostream>
 
 #include <boost/format.hpp>
-#include <boost/log/core.hpp>
-#include <boost/log/trivial.hpp>
+// #include <boost/log/core.hpp>
+// #include <boost/log/trivial.hpp>
+
 
 #include <regex>
 
 #include "config.h"
 #include "session.h"
+#include "logging.h"
 
 #include <string>
 
@@ -67,7 +69,7 @@ std::string clean_string(const std::string &source) {
 Session::Session(boost::asio::ip::tcp::socket socket,
                  boost::asio::io_service &io_service, std::string hostname,
                  std::string port)
-    : socket_(std::move(socket)), io_service_{io_service},
+    : direct{this}, socket_(std::move(socket)), io_service_{io_service},
       resolver_{io_service}, server_{io_service}, timer_{io_service},
       keep_alive_{io_service}, host{hostname}, port{port} {
   // server_sent = 0;

session.h

@@ -6,6 +6,11 @@
 #include <map>
 #include <string>
 
+class Session;
+#include "director.h"
+
+#include "dispatchers.h"
+
 #define MAX_BUFFER 256
 
 /*
@@ -39,6 +44,7 @@ public:
   const std::string & get_prompt(void);
 
 private:
+  Director direct;
   void set_timer(void);
   void reset_timer(void);
   void on_timer(const boost::system::error_code error);
@@ -167,6 +173,7 @@ private:
   std::string port_;
 };
 
+#ifdef NEVERMORE
 // The simple way to get the boost logging to log file and line number
 // information.  [Let the BUGZ_LOG macro do it!]
 #include <iomanip>
@@ -178,5 +185,6 @@ const char *trim_path(const char *filepath);
   BOOST_LOG_TRIVIAL(severity)                                                  \
       << "(" << std::setw(15) << trim_path(__FILE__) << ":" << std::setw(4)    \
       << std::left << __LINE__ << ") "
+#endif
 
 #endif

twproxy.cpp

@@ -24,6 +24,7 @@
 
 #include "config.h"
 #include "session.h"
+#include "logging.h"
 
 // #define BOOST_ASIO_ENABLE_HANDLER_TRACKING