Changeset fefa5bc807db6ab6aa6ba440358b53f047cf5293 for src/buffer_wrapper_generic.cpp

Timestamp:

01/06/07 23:31:12 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

3e51f8e95a8bf974bbe8260eb166457743115f9d

Children:

4e4b30464aab06db06dfcfd1e51882c9fca8992f

git-committer:

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

Message:

[project @ Adjusted buffer_wrapper for net6 API corrections]

Original author: Armin Burgmeier <armin@…>
Date: 2005-04-15 20:00:12+00:00

Files:

• src/buffer_wrapper_generic.cpp (modified) (5 diffs)

src/buffer_wrapper_generic.cpp

@@ -65 +65 @@
 
         if(condition & (Glib::IO_ERR | Glib::IO_HUP | Glib::IO_NVAL) )
-                sock.error_event().emit(sock, net6::socket::IOERROR);
+                sock.io_event().emit(net6::socket::IOERROR);
 
         if(condition & (Glib::IO_IN) )
-                sock.read_event().emit(sock, net6::socket::INCOMING);
+                sock.io_event().emit(net6::socket::INCOMING);
 
         if(condition & (Glib::IO_OUT) )
-                sock.write_event().emit(sock, net6::socket::OUTGOING);
+                sock.io_event().emit(net6::socket::OUTGOING);
 
         return true;
@@ -92 +92 @@
 }
 
-void Gobby::Client::on_client_send(const net6::packet& pack)
+void Gobby::Client::on_send_event(const net6::packet& pack)
 {
         if(conn.send_queue_size() == 0)
                 m_ioconn.remove_connect(Glib::IO_OUT);
-        net6::client::on_client_send(pack);
+        net6::client::on_send_event(pack);
 }
 
@@ -159 +159 @@
 }
 
-void Gobby::Host::on_join(net6::host::peer& new_peer)
+void Gobby::Host::on_connect(net6::host::peer& new_peer)
 {
         // Build IOConnection
@@ -174 +174 @@
 }
 
-void Gobby::Host::on_client_send(const net6::packet& pack,
-                                 net6::host::peer& to)
+void Gobby::Host::on_send_event(const net6::packet& pack,
+                                net6::host::peer& to)
 {
         // Find peer in peer map
@@ -186 +186 @@
 
         // Call base function
-        net6::host::on_client_send(pack, to);
+        net6::host::on_send_event(pack, to);
 }