Changeset 47eacc32f1c58d8b7506672c4bf60f06a6b509bf

Timestamp:

01/06/07 23:47:34 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

ab042e610ec8465af4744f07b6ec79925be3bd2c

Children:

4a2cffcccc9521265333d37f29697b890e28dcb5

git-committer:

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

Message:

[project @ Adjusted buffer wrapper because peer has been renamed to user in net6]

Original author: Armin Burgmeier <armin@…>
Date: 2005-09-06 12:31:28+00:00

Files:

• inc/io/buffer_wrapper.hpp (modified) (5 diffs)
• src/document.cpp (modified) (1 diff)
• src/io/buffer_wrapper.cpp (modified) (8 diffs)

inc/io/buffer_wrapper.hpp

@@ -84 +84 @@
         };
 
-        typedef std::map<const net6::server::peer*, main_connection*>
-                peer_map_type;
+        typedef std::map<const net6::user*, main_connection*>
+                user_map_type;
 
         /** Constructs a new server object. Note that you have to perform a call
@@ -117 +117 @@
         virtual void reopen(unsigned int port);
 
-        /** Sends a packet to the given peer.
-         */
-        virtual void send(const net6::packet& pack, net6::host::peer& to);
-
-protected:
-        /** Called when a new peer has connected to the server. This callback
-         * is used to create a new main_connection for this peer and storing it
-         * in the peer map.
-         */
-        virtual void on_connect(net6::host::peer& new_peer);
+        /** Sends a packet to all currently connected users.
+         */
+        virtual void send(const net6::packet& pack);
+
+        /** Sends a packet to the given user.
+         */
+        virtual void send(const net6::packet& pack, const net6::user& to);
+
+protected:
+        /** Called when a new user has connected to the server. This callback
+         * is used to create a new main_connection for this user and storing it
+         * in the user map.
+         */
+        virtual void on_connect(const net6::user& new_user);
 
         /** Called when a all data in the send queue of a client connection has
          * been sent. This is used to remove the IO_OUT flag.
          */
-        virtual void on_send_event(net6::host::peer& to);
+        virtual void on_send_event(net6::user& to);
 
         /** Deletes the main_connection on connection loss.
          */
-        virtual void remove_client(net6::host::peer* client);
-
-        /** Returns the iterator for the given peer. If this peer is not present
-         * in the map (which should never occur), host::Error is thrown.
-         */
-        peer_map_type::iterator get_peer_iter(const net6::server::peer& peer);
+        virtual void remove_client(const net6::user* client);
+
+        /** Returns the iterator for the given user. If this user is not present
+         * in the map (which should never occur), server::Error is thrown.
+         */
+        user_map_type::iterator get_user_iter(const net6::user& user);
 
 #ifdef WIN32
@@ -146 +150 @@
 #endif
         std::auto_ptr<main_connection> m_serv_connection;
-        peer_map_type m_peer_map;
+        user_map_type m_user_map;
 private:
         void shutdown_impl();
@@ -154 +158 @@
 /** The host is bit tricky:
  * We derive from io::server to get all the IO handling and from net6::host to
- * get the underlaying host with its local peer.
+ * get the underlaying host with its local user.
  */
 
@@ -185 +189 @@
         virtual ~host();
 
-        /** Sends a packet to the given peer. No packet will be send if to
+        /** Sends a packet to all connected users.
+         */
+        virtual void send(const net6::packet& pack);
+
+        /** Sends a packet to the given user. No packet will be sent if to
          * is the local user.
          */
-        virtual void send(const net6::packet& pack, net6::host::peer& to);
+        virtual void send(const net6::packet& pack, const net6::user& to);
 protected:
         /** Called when a all data in the send queue of a client connection has
          * been sent. This is used to remove the IO_OUT flag.
          */
-        virtual void on_send_event(net6::host::peer& to);
+        virtual void on_send_event(net6::user& to);
 };
 

src/document.cpp

@@ -660 +660 @@
         // queue_draw() after the apply_tag call, but it did not help
         // - Armin
-        for(int i = 0; i < 2; ++ i)
+//      for(int i = 0; i < 2; ++ i)
+//      // Applying once seems to work now?
+//      // - Armin (29.07.2005)
                 buffer->apply_tag(tag, begin, end);
 }

src/io/buffer_wrapper.cpp

@@ -96 +96 @@
 
         // Remove client main_connections
-        peer_map_type::iterator iter;
-        for(iter = m_peer_map.begin(); iter != m_peer_map.end(); ++ iter)
+        user_map_type::iterator iter;
+        for(iter = m_user_map.begin(); iter != m_user_map.end(); ++ iter)
                 delete iter->second;
 }
@@ -117 +117 @@
 }
 
-void obby::io::server::send(const net6::packet& pack, net6::server::peer& to)
+void obby::io::server::send(const net6::packet& pack)
+{
+        // Call base function
+        net6::server::send(pack);
+}
+
+void obby::io::server::send(const net6::packet& pack, const net6::user& to)
 {
         // Add Glib::IO_OUT event
-        peer_map_type::iterator iter = get_peer_iter(to);
+        user_map_type::iterator iter = get_user_iter(to);
         iter->second->add_events(main_connection::IO_OUT);
 
@@ -127 +133 @@
 }
 
-void obby::io::server::on_connect(net6::server::peer& new_peer)
+void obby::io::server::on_connect(const net6::user& new_user)
 {
         // Build main_connection
@@ -134 +140 @@
                 m_window,
 #endif
-                new_peer.get_socket(),
+                new_user.get_connection().get_socket(),
                 main_connection::IO_IN | main_connection::IO_ERROR
         );
 
-        // Insert into peer map
-        m_peer_map[&new_peer] = conn;
-
-        // Call base function
-        net6::server::on_connect(new_peer);
-}
-
-void obby::io::server::on_send_event(net6::server::peer& to)
-{
-        // Find peer in peer map
-        peer_map_type::iterator iter = get_peer_iter(to);
+        // Insert into user map
+        m_user_map[&new_user] = conn;
+
+        // Call base function
+        net6::server::on_connect(new_user);
+}
+
+void obby::io::server::on_send_event(net6::user& to)
+{
+        // Find user in user map
+        user_map_type::iterator iter = get_user_iter(to);
         main_connection* conn = iter->second;
 
@@ -158 +164 @@
 }
 
-void obby::io::server::remove_client(net6::server::peer* peer)
-{
-        // Find peer in peer map
-        peer_map_type::iterator iter = get_peer_iter(*peer);
+void obby::io::server::remove_client(const net6::user* user)
+{
+        // Find user in user map
+        user_map_type::iterator iter = get_user_iter(*user);
 
         // Remove main_connection
         delete iter->second;
-        m_peer_map.erase(iter);
-
-        // Call base function
-        net6::server::remove_client(peer);
-}
-
-obby::io::server::peer_map_type::iterator
-obby::io::server::get_peer_iter(const net6::server::peer& peer)
-{
-        // Find peer
-        peer_map_type::iterator iter = m_peer_map.find(&peer);
+        m_user_map.erase(iter);
+
+        // Call base function
+        net6::server::remove_client(user);
+}
+
+obby::io::server::user_map_type::iterator
+obby::io::server::get_user_iter(const net6::user& user)
+{
+        // Find user
+        user_map_type::iterator iter = m_user_map.find(&user);
 
         // Not found?
-        if(iter == m_peer_map.end() )
+        if(iter == m_user_map.end() )
         {
                 // Should not happen...
-                obby::format_string str(
-                        _("Peer %0% (%1%) not found in peer list") );
-                str << peer.get_name() << peer.get_address().get_name();
-                throw Error(Error::PEER_NOT_FOUND, str.str() );
+                throw Error(
+                        Error::PEER_NOT_FOUND,
+                        "obby::io::server::get_user_iter"
+                );
         }
 
@@ -238 +244 @@
 }
 
-void obby::io::host::send(const net6::packet& pack, net6::host::peer& to)
+void obby::io::host::send(const net6::packet& pack)
+{
+        // Call base function from server
+        server::send(pack);
+}
+
+void obby::io::host::send(const net6::packet& pack, const net6::user& to)
 {
         // Prevent from sendint packets to ourselves
@@ -246 +258 @@
 }
 
-void obby::io::host::on_send_event(net6::host::peer& to)
+void obby::io::host::on_send_event(net6::user& to)
 {
         // Prevent from sending packets to ourselves
@@ -327 +339 @@
         m_server = host;
 
-        assert(host->get_self() != NULL);
-        m_self = m_usertable.add_user(*host->get_self(), red, green, blue);
+        m_self = m_usertable.add_user(host->get_self(), red, green, blue);
         register_signal_handlers();
 }