Changeset 9b6eca57342f7056dda0aa56262a4b5c399c1a77

Timestamp:

09/08/08 23:48:48 (5 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

33c52287f29995de28e64ad9533a4d3455bb2c3f

Children:

e7981e590143ccddaf3c19fe3d9297f0ace08a0f

git-committer:

Armin Burgmeier <armin@arbur.net> / 2008-09-08T23:48:48Z+0200

Message:

Use address from zeroconf for session connection, fixing link-local IPv6

2008-09-08 Armin Burgmeier <armin@…>

• inc/joindialog.hpp:
• src/joindialog.cpp: Added address column to zeroconf session list, return on get_address() if host and port matches the selection.

• inc/joinprogressdialog.hpp:
• src/joinprogressdialog.cpp: Take a net6::address* that is used for connection establishment when set (otherwise hostname/port).

• inc/window.hpp:
• src/window.cpp: Set address of JoinProgressDialog? from JoinDialog?.

Files:

• ChangeLog (modified) (1 diff)
• inc/joindialog.hpp (modified) (4 diffs)
• inc/joinprogressdialog.hpp (modified) (2 diffs)
• inc/window.hpp (modified) (1 diff)
• src/joindialog.cpp (modified) (5 diffs)
• src/joinprogressdialog.cpp (modified) (3 diffs)
• src/window.cpp (modified) (3 diffs)

ChangeLog

@@ +1 @@
+2008-09-08  Armin Burgmeier  <armin@0x539.de>
+
+        * inc/joindialog.hpp:
+        * src/joindialog.cpp: Added address column to zeroconf session list,
+        return on get_address() if host and port matches the selection.
+
+        * inc/joinprogressdialog.hpp:
+        * src/joinprogressdialog.cpp: Take a net6::address* that is used for
+        connection establishment when set (otherwise hostname/port).
+
+        * inc/window.hpp:
+        * src/window.cpp: Set address of JoinProgressDialog from JoinDialog.
+
 2008-09-08  Philipp Kern  <phil@0x539.de>
 

inc/joindialog.hpp

@@ -28 +28 @@
 #include "features.hpp"
 #include "colorsel.hpp"
+
+#include <net6/address.hpp>
+
 #ifdef WITH_ZEROCONF
 #include <gtkmm/box.h>
@@ -34 +37 @@
 #include <gtkmm/liststore.h>
 #include <sigc++/connection.h>
-#include <net6/address.hpp>
 #include <obby/zeroconf.hpp>
 #endif
@@ -53 +55 @@
                 Gtk::TreeModelColumn<Glib::ustring> host;
                 Gtk::TreeModelColumn<unsigned int> port;
+                Gtk::TreeModelColumn<net6::address*> address;
         };
 #endif
@@ -68 +71 @@
         Glib::ustring get_host() const;
         unsigned int get_port() const;
+        const net6::address* get_address();
         Glib::ustring get_name() const;
         Gdk::Color get_color() const;

inc/joinprogressdialog.hpp

@@ -36 +36 @@
                            Config::ParentEntry& config_entry,
                            const Glib::ustring& hostname,
-                           unsigned int port,
+                           unsigned int port,
+                           const net6::address* addr,
                            const Glib::ustring& username,
                            const Gdk::Color& color);
@@ -150 +151 @@
         Glib::ustring m_hostname;
         unsigned int m_port;
+        std::auto_ptr<net6::address> m_address;
         Glib::ustring m_username;
         Gdk::Color m_color;

inc/window.hpp

@@ -176 +176 @@
         bool session_join_impl(const Glib::ustring& host,
                                unsigned int port,
+                               const net6::address* addr,
                                const Glib::ustring& name,
                                const Gdk::Color& color);

src/joindialog.cpp

@@ -38 +38 @@
         add(host);
         add(port);
+        add(address);
 }
 #endif
@@ -185 +186 @@
 Gobby::JoinDialog::~JoinDialog()
 {
+#ifdef WITH_ZEROCONF
+        const Gtk::TreeModel::Children& children = m_session_list->children();
+        for(Gtk::TreeIter iter = children.begin();
+            iter != children.end(); ++ iter)
+        {
+                net6::address* addr = (*iter)[m_session_cols.address];
+                delete addr;
+        }
+#endif
 }
 
@@ -195 +205 @@
 {
         return static_cast<unsigned int>(m_ent_port.get_value() );
+}
+
+const net6::address* Gobby::JoinDialog::get_address()
+{
+#ifdef WITH_ZEROCONF
+        // m_session_view.get_selection() is not const, therefore this function
+        // cannot be const.
+        Gtk::TreeModel::iterator iter =
+                m_session_view.get_selection()->get_selected();
+        if(iter != m_session_list->children().end())
+        {
+                // Use address with port info if selected from zeroconf
+                if(get_host() == (*iter)[m_session_cols.host] &&
+                   get_port() == (*iter)[m_session_cols.port])
+                {
+                        return (*iter)[m_session_cols.address];
+                }
+        }
+#endif
+        return NULL;
 }
 
@@ -277 +307 @@
         // must implement get_port().
         row[m_session_cols.port] = addr.get_port();
+        row[m_session_cols.address] = addr.clone();
 
         m_ep_discover.set_expanded(true);
@@ -285 +316 @@
         Gtk::TreeModel::iterator iter = find_entry(name);
         if(iter == m_session_list->children().end() ) return;
+
+        net6::address* addr = (*iter)[m_session_cols.address];
+        delete addr;
+
         m_session_list->erase(iter);
 }

src/joinprogressdialog.cpp

@@ -301 +301 @@
 Gobby::JoinProgressDialog::JoinProgressDialog(Gtk::Window& parent,
                                               Config::ParentEntry& config_entry,
-                                              const Glib::ustring& hostname,
+                                              const Glib::ustring& hostname,
                                               unsigned int port,
+                                              const net6::address* addr,
                                               const Glib::ustring& username,
                                               const Gdk::Color& color):
         ProgressDialog(_("Joining obby session..."), parent),
         m_config_entry(config_entry), m_hostname(hostname), m_port(port),
-        m_username(username), m_color(color), m_got_welcome(false),
-        m_got_done(false)
+        m_address(addr ? addr->clone() : NULL), m_username(username),
+        m_color(color), m_got_welcome(false), m_got_done(false)
 {
         obby::format_string str("Connecting to %0%...");
@@ -329 +330 @@
 #endif
         // Connection data
-        Glib::ustring hostname = m_hostname; // Remote host name
-        unsigned int port = m_port; // TCP port number
+        const Glib::ustring hostname = m_hostname;
+        unsigned int port = m_port;
+        std::auto_ptr<net6::address> address(
+                m_address.get() ? m_address->clone() : NULL);
 
         // Dialog may be closed now
@@ -364 +367 @@
                         sigc::mem_fun(*this, &JoinProgressDialog::on_close) );
 
-                // Establish connection
-                buffer->connect(hostname, port);
+                if(address.get())
+                        // Establish connection
+                        buffer->connect(*address);
+                else
+                        buffer->connect(hostname, port);
         }
         catch(net6::error& e)

src/window.cpp

@@ -1239 +1239 @@
                 Glib::ustring host = m_join_dlg->get_host();
                 unsigned int port = m_join_dlg->get_port();
+                const net6::address* addr = m_join_dlg->get_address();
                 Glib::ustring name = m_join_dlg->get_name();
                 Gdk::Color color = m_join_dlg->get_color();
 
-                if(session_join_impl(host, port, name, color) )
+                if(session_join_impl(host, port, addr, name, color) )
                         break;
                 else
@@ -1304 +1305 @@
 bool Gobby::Window::session_join_impl(const Glib::ustring& host,
                                       unsigned int port,
+                                      const net6::address* addr,
                                       const Glib::ustring& name,
                                       const Gdk::Color& color)
@@ -1312 +1314 @@
                 host,
                 port,
+                addr,
                 name,
                 color