Lots more clean-ups

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

diff --git a/rpc/connection.h b/rpc/connection.h
index 882c1e0..3e19a93 100644 (file)
--- a/rpc/connection.h
+++ b/rpc/connection.h
@@ -6,6 +6,7 @@
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include "pollmgr.h"
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include "pollmgr.h"

+#include "file.h"

 
 constexpr size_t size_t_max = numeric_limits<size_t>::max();
 
 
 constexpr size_t size_t_max = numeric_limits<size_t>::max();
 

@@ -49,7 +50,7 @@ class connection : public aio_callback {
         bool writepdu();
 
         chanmgr *mgr_;
         bool writepdu();
 
         chanmgr *mgr_;

-        const int fd_;
+        const file_t fd_;

         bool dead_ = false;
 
         charbuf wpdu_;
         bool dead_ = false;
 
         charbuf wpdu_;

@@ -69,17 +70,17 @@ class connection : public aio_callback {
 
 class tcpsconn {
     public:
 
 class tcpsconn {
     public:

-        tcpsconn(chanmgr *m1, unsigned int port, int lossytest=0);
+        tcpsconn(chanmgr *m1, in_port_t port, int lossytest=0);

         ~tcpsconn();
         ~tcpsconn();

-        inline unsigned int port() { return port_; }
+        inline in_port_t port() { return port_; }

         void accept_conn();
     private:
         void accept_conn();
     private:

-        unsigned int port_;
+        in_port_t port_;

         mutex m_;
         thread th_;
         mutex m_;
         thread th_;

-        int pipe_[2];
+        file_t pipe_[2];

 
 

-        int tcp_; //file desciptor for accepting connection
+        socket_t tcp_; // listens for connections

         chanmgr *mgr_;
         int lossy_;
         map<int, connection *> conns_;
         chanmgr *mgr_;
         int lossy_;
         map<int, connection *> conns_;