Changeset e81168e085d99077d2eb610f736362d07f4cd7a0

Timestamp:

01/06/07 23:56:58 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

882c70800a8013d9e53928091ef8e445f5938708

Children:

8c777f1302af5966dc645563524507bfb5b9baae

git-committer:

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

Message:

[project @ Experimental patch for client-initiated encryption]

Original author: Philipp Kern <phil@…>
Date: 2006-02-14 20:53:46+00:00

Files:

• inc/gselector.hpp (modified) (1 diff)
• inc/window.hpp (modified) (1 diff)
• src/gselector.cpp (modified) (1 diff)
• src/window.cpp (modified) (3 diffs)

inc/gselector.hpp

@@ -42 +42 @@
         void add(const net6::socket& sock, net6::io_condition cond);
         void remove(const net6::socket& sock, net6::io_condition cond);
+        void set(const net6::socket& sock, net6::io_condition cond);
         net6::io_condition check(const net6::socket& sock,
                                  net6::io_condition mask) const;

inc/window.hpp

@@ -107 +107 @@
         // Obby signal handlers
         void on_obby_close();
+        void on_obby_encrypted();
 
         void on_obby_user_join(const obby::user& user);

src/gselector.cpp

@@ -134 +134 @@
 }
 
+void Gobby::GSelector::set(const net6::socket& sock, net6::io_condition cond)
+{
+        // TODO: Port add and remove to set
+        map_type::iterator iter = m_map.find(&sock);
+        if(cond == net6::IO_NONE && iter == m_map.end() )
+                return;
+        else if(cond == net6::IO_NONE)
+                remove(sock, ~cond);
+        else if(iter == m_map.end() )
+                add(sock, cond);
+        else
+        {
+                remove(sock, ~cond);
+                add(sock, cond);
+        }
+}
+
 net6::io_condition Gobby::GSelector::check(const net6::socket& sock,
                                            net6::io_condition mask) const

src/window.cpp

@@ -430 +430 @@
                         buffer->close_event().connect(
                                 sigc::mem_fun(*this, &Window::on_obby_close) );
+                        buffer->encrypted_event().connect(
+                                sigc::mem_fun(*this, &Window::on_obby_encrypted) );
+
+                        buffer->request_encryption();
 
                         obby::format_string str(_("Connected to %0%:%1%") );
@@ -915 +919 @@
 }
 
+void Gobby::Window::on_obby_encrypted()
+{
+        display_error("Connection now encrypted");
+}
+
 void Gobby::Window::on_obby_user_join(const obby::user& user)
 {
@@ -1177 +1186 @@
         dlg.run();
 }
+