Changeset be1b56bbd438ae97c8e3d71f1bdfb610749fbf9f

Timestamp:

07/09/07 22:54:30 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

0b2867fe24ca70a931a026e7f628fd391b42c557

Children:

2270de3b6315c289b39835cf98ecb546946dce43

git-committer:

Philipp Kern <phil@0x539.de> / 2007-07-09T20:54:30Z+0000

Message:

2007-07-09 Philipp Kern <phil@…>

• inc/joindialog.hpp:
• src/joindialog.cpp: add support for IPv6 autodiscovery

Files:

• ChangeLog (modified) (1 diff)
• inc/joindialog.hpp (modified) (1 diff)
• src/joindialog.cpp (modified) (3 diffs)

ChangeLog

@@ +1 @@
+2007-07-09  Philipp Kern  <phil@0x539.de>
+
+        * inc/joindialog.hpp:
+        * src/joindialog.cpp: add support for IPv6 autodiscovery
+
 2007-07-09  Armin Burgmeier  <armin@0x539.de>
 

inc/joindialog.hpp

@@ -82 +82 @@
         Gtk::TreeModel::iterator find_entry(const std::string& name) const;
 #ifndef WITH_AVAHI
-        virtual bool on_timer();
+        bool on_timer();
 #endif
-        virtual void on_discover(const std::string& name,
-                                 const net6::ipv4_address& addr);
-        virtual void on_leave(const std::string& name);
-        virtual void on_change();
+// The template function is implemented in the source file, thus it's private.
+private:
+        template <typename addr_type>
+        void on_discover(const std::string& name,
+                         const addr_type& addr);
+
+protected:
+        void on_leave(const std::string& name);
+        void on_change();
 
         virtual void on_show();

src/joindialog.cpp

@@ -125 +125 @@
                 m_ep_discover.add(m_session_view);
 
-                m_zeroconf->discover_event().connect(
-                        sigc::mem_fun(*this, &JoinDialog::on_discover));
+                m_zeroconf->discover_event().connect(sigc::mem_fun(
+                        *this,
+                        &JoinDialog::on_discover<net6::ipv4_address>));
+                m_zeroconf->discover6_event().connect(sigc::mem_fun(
+                        *this,
+                        &JoinDialog::on_discover<net6::ipv6_address>));
                 m_zeroconf->leave_event().connect(
                         sigc::mem_fun(*this, &JoinDialog::on_leave) );
@@ -223 +227 @@
 #endif
 
+template <typename addr_type>
 void Gobby::JoinDialog::on_discover(const std::string& name,
-                                    const net6::ipv4_address& addr)
+                                    const addr_type& addr)
 {
         // Ignore entries which introduce user names which are already in
@@ -230 +235 @@
         if(find_entry(name) != m_session_list->children().end() )
                 return;
+
         Gtk::TreeModel::Row row = *(m_session_list->append() );
         row[m_session_cols.name] = name;
         row[m_session_cols.host] = addr.get_name();
+        // Generic addresses do not bear ports, thus the passed addr_type
+        // must implement get_port().
         row[m_session_cols.port] = addr.get_port();
+
         m_ep_discover.set_expanded(true);
 }