Changeset 2fe47aed9e6b48d212f996f025a5e423bea91e0e

Timestamp:

01/06/07 23:49:02 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

e4a7d37f518827991e7052f0f8411de7f1d6e6fd

Children:

f4fe94fc7580e639bec5d34dcc524a75c7f2105b

git-committer:

Philipp Kern <phil@0x539.de> / 2007-01-06T22:49:02Z+0000

Message:

[project @ Adjusted buffer wrappers to buffer's reusability]

Original author: Armin Burgmeier <armin@…>
Date: 2005-10-04 17:12:06+00:00

Files:

• inc/io/buffer_wrapper.hpp (modified) (3 diffs)
• src/hostprogressdialog.cpp (modified) (1 diff)
• src/io/buffer_wrapper.cpp (modified) (2 diffs)
• src/joinprogressdialog.cpp (modified) (1 diff)

inc/io/buffer_wrapper.hpp

@@ -210 +210 @@
 {
 public:
-#ifdef WIN32
-        client_buffer(Gtk::Window& window, const Glib::ustring& hostname,
-                     unsigned int port);
-#else
-        client_buffer(const Glib::ustring& hostname, unsigned int port);
-#endif
-        virtual ~client_buffer();
-
-protected:
+        typedef client net_type;
+
+#ifdef WIN32
+        client_buffer(Gtk::Window& window);
+#else
+        client_buffer();
+#endif
+
+protected:
+#ifdef WIN32
+        Gtk::Window& m_window;
+#endif
+        virtual net_type* new_net(const std::string& host, unsigned int port);
 };
 
@@ -226 +230 @@
 {
 public:
-#ifdef WIN32
-        server_buffer(Gtk::Window& window, unsigned int port);
-#else
-        server_buffer(unsigned int port);
-#endif
-        virtual ~server_buffer();
-
-protected:
+        typedef server net_type;
+
+#ifdef WIN32
+        server_buffer(Gtk::Window& window);
+#else
         server_buffer();
+#endif
+
+protected:
+#ifdef WIN32
+        Gtk::Window& m_window;
+#endif
+        net_type* new_net(unsigned int port);
 };
 
@@ -240 +248 @@
  */
 
-class host_buffer : virtual public obby::host_buffer
-{
-public:
-#ifdef WIN32
-        host_buffer(Gtk::Window& window, unsigned int port,
+class host_buffer : virtual public obby::host_buffer,
+                    virtual public server_buffer
+{
+public:
+        typedef host net_type;
+
+#ifdef WIN32
+        host_buffer(Gtk::Window& window
                    const Glib::ustring& username, int red, int green, int blue);
 #else
-        host_buffer(unsigned int port, const Glib::ustring& username, int red,
+        host_buffer(const Glib::ustring& username, int red,
                     int green, int blue);
 #endif
-        virtual ~host_buffer();
-
-protected:
-        host_buffer();
+
+protected:
+        net_type* new_net(unsigned int port);
 };
 

src/hostprogressdialog.cpp

@@ -57 +57 @@
                                 m_parent,
 #endif
-                                m_port, m_username,
+                                m_username,
                                 red, green, blue
                         )
                 );
+
+                //set_status_text("Creating session...");
+
+                m_buffer->open(m_port);
         }
         catch(net6::error& e)

src/io/buffer_wrapper.cpp

@@ -17 +17 @@
  */
 
-#include <cassert>
 #include <obby/format_string.hpp>
 #include "io/buffer_wrapper.hpp"
@@ -266 +265 @@
 
 #ifdef WIN32
-obby::io::client_buffer::client_buffer(Gtk::Window& window,
-                                       const Glib::ustring& hostname,
-                                       unsigned int port)
-#else
-obby::io::client_buffer::client_buffer(const Glib::ustring& hostname,
-                                       unsigned int port)
-#endif
- : obby::client_buffer()
+obby::io::client_buffer::client_buffer(Gtk::Window& window)
+#else
+obby::io::client_buffer::client_buffer()
+#endif
+#ifdef WIN32
+ : m_window(window)
+#endif
+{
+}
+
+obby::io::client_buffer::net_type*
+obby::io::client_buffer::new_net(const std::string& host, unsigned int port)
 {
         net6::ipv4_address addr(
-                net6::ipv4_address::create_from_hostname(hostname, port) );
-
-#ifdef WIN32
-        m_net.reset(new client(window, addr) );
-#else
-        m_net.reset(new client(addr) );
-#endif
-        register_signal_handlers();
-}
-
-obby::io::client_buffer::~client_buffer()
-{
-}
-
+                net6::ipv4_address::create_from_hostname(host, port)
+        );
+
+#ifdef WIN32
+        return new net_type(m_window, addr);
+#else
+        return new net_type(addr);
+#endif
+}
+
+#ifdef WIN32
+obby::io::server_buffer::server_buffer(Gtk::Window& window)
+#else
 obby::io::server_buffer::server_buffer()
-{
-}
-
-#ifdef WIN32
-obby::io::server_buffer::server_buffer(Gtk::Window& window, unsigned int port)
-#else
-obby::io::server_buffer::server_buffer(unsigned int port)
-#endif
- : obby::buffer(), obby::server_buffer()
-{
-#ifdef WIN32
-        net6::server* server = new io::server(window, port, false);
-#else
-        net6::server* server = new io::server(port, false);
-#endif
-        m_net.reset(server);
-
-        register_signal_handlers();
-}
-
-obby::io::server_buffer::~server_buffer()
-{
-}
-
-obby::io::host_buffer::host_buffer()
- : obby::host_buffer()
-{
-}
-
-#ifdef WIN32
-obby::io::host_buffer::host_buffer(Gtk::Window& window, unsigned int port,
+#endif
+#ifdef WIN32
+ : m_window(window)
+#endif
+{
+}
+
+obby::io::server_buffer::net_type*
+obby::io::server_buffer::new_net(unsigned int port)
+{
+#ifdef WIN32
+        return new io::server(m_window, port);
+#else
+        return new io::server(port);
+#endif
+}
+
+#ifdef WIN32
+obby::io::host_buffer::host_buffer(Gtk::Window& window,
                                    const Glib::ustring& username, int red,
                                    int green, int blue)
 #else
-obby::io::host_buffer::host_buffer(unsigned int port,
-                                   const Glib::ustring& username, int red,
+obby::io::host_buffer::host_buffer(const Glib::ustring& username, int red,
                                    int green, int blue)
 #endif
- : obby::host_buffer()
-{
-#ifdef WIN32
-        net6::host* host = new io::host(window, port, username, false);
-#else
-        net6::host* host = new io::host(port, username, false);
-#endif
-
-        m_net.reset(host);
-
-        m_self = m_user_table.add_user(host->get_self(), red, green, blue);
-        register_signal_handlers();
-}
-
-obby::io::host_buffer::~host_buffer()
-{
-}
-
+ : obby::host_buffer(username, red, green, blue),
+#ifdef WIN32
+   server_buffer(window),
+#else
+   server_buffer()
+#endif
+{
+}
+
+obby::io::host_buffer::net_type*
+obby::io::host_buffer::new_net(unsigned int port)
+{
+#ifdef WIN32
+        return new net_type(window, port, m_username);
+#else
+        return new net_type(port, m_username);
+#endif
+}
+

src/joinprogressdialog.cpp

@@ -80 +80 @@
                         new obby::io::client_buffer(
 #ifdef WIN32
-                                m_parent,
+                                m_parent
 #endif
-                                m_hostname,
-                                m_port
                         )
                 );
+
+                // Connect to remote host
+                m_buffer->connect(m_hostname, m_port);
         }
         catch(net6::error& e)