Working on g++ compatibility

[invirt/third/libt4.git] / rpc / connection.h

diff --git a/rpc/connection.h b/rpc/connection.h
index 87d17e4..8f7d494 100644 (file)
--- a/rpc/connection.h
+++ b/rpc/connection.h
@@ -21,24 +21,18 @@ class connection_delegate {
 
 class connection : private aio_callback, public enable_shared_from_this<connection> {
     public:
 
 class connection : private aio_callback, public enable_shared_from_this<connection> {
     public:

-        struct charbuf {
-            string buf;
-            size_t solong = 0; // number of bytes written or read so far
-        };
-
-        connection(connection_delegate *m1, socket_t && f1, int lossytest=0);
+        connection(connection_delegate * delegate, socket_t && f1, int lossytest=0);

         ~connection();
 
         ~connection();
 

-        int channo() { return fd_; }
-        bool isdead() { lock ml(m_); return dead_; }
-        void closeconn();
+        bool isdead() { return dead_; }

 
         bool send(const string & b);
 
 
         bool send(const string & b);
 

-        time_point<steady_clock> create_time() const { return create_time_; }
-

         static shared_ptr<connection> to_dst(const sockaddr_in &dst, connection_delegate *mgr, int lossy=0);
 
         static shared_ptr<connection> to_dst(const sockaddr_in &dst, connection_delegate *mgr, int lossy=0);
 

+        const time_point<steady_clock> create_time = steady_clock::now();
+        const file_t fd;
+

     private:
         void write_cb(int s);
         void read_cb(int s);
     private:
         void write_cb(int s);
         void read_cb(int s);

@@ -46,15 +40,17 @@ class connection : private aio_callback, public enable_shared_from_this<connecti
         bool readpdu();
         bool writepdu();
 
         bool readpdu();
         bool writepdu();
 

-        connection_delegate *mgr_;
-        const file_t fd_;
+        connection_delegate * delegate_;

         bool dead_ = false;
 
         bool dead_ = false;
 

+        struct charbuf {
+            string buf;
+            size_t solong = 0; // number of bytes written or read so far
+        };
+

         charbuf wpdu_;
         charbuf rpdu_;
 
         charbuf wpdu_;
         charbuf rpdu_;
 

-        time_point<steady_clock> create_time_;
-

         int waiters_ = 0;
         int lossy_ = 0;
 
         int waiters_ = 0;
         int lossy_ = 0;
 

@@ -63,10 +59,10 @@ class connection : private aio_callback, public enable_shared_from_this<connecti
         cond send_wait_;
 };
 
         cond send_wait_;
 };
 

-class tcpsconn : private aio_callback {
+class connection_listener : private aio_callback {

     public:
     public:

-        tcpsconn(connection_delegate *m1, in_port_t port, int lossytest=0);
-        ~tcpsconn();
+        connection_listener(connection_delegate * delegate, in_port_t port, int lossytest=0);
+        ~connection_listener();

         inline in_port_t port() { return port_; }
     private:
         void write_cb(int) {}
         inline in_port_t port() { return port_; }
     private:
         void write_cb(int) {}

@@ -76,7 +72,7 @@ class tcpsconn : private aio_callback {
         mutex m_;
 
         socket_t tcp_; // listens for connections
         mutex m_;
 
         socket_t tcp_; // listens for connections

-        connection_delegate *mgr_;
+        connection_delegate * delegate_;

         int lossy_;
         map<int, shared_ptr<connection>> conns_;
 };
         int lossy_;
         map<int, shared_ptr<connection>> conns_;
 };