Lots more clean-ups

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

diff --git a/rpc/connection.h b/rpc/connection.h
index 2a01e46..3e19a93 100644 (file)
--- a/rpc/connection.h
+++ b/rpc/connection.h
@@ -5,8 +5,8 @@
 #include <sys/types.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <sys/types.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>

-#include <cstddef>

 #include "pollmgr.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();
 

@@ -16,18 +16,15 @@ class connection;
 
 class chanmgr {
     public:
 
 class chanmgr {
     public:

-        virtual bool got_pdu(connection *c, char *b, size_t sz) = 0;
+        virtual bool got_pdu(connection *c, const string & b) = 0;

         virtual ~chanmgr() {}
 };
 
 class connection : public aio_callback {
     public:
         struct charbuf {
         virtual ~chanmgr() {}
 };
 
 class connection : public aio_callback {
     public:
         struct charbuf {

-            charbuf(): buf(NULL), sz(0), solong(0) {}
-            charbuf (char *b, size_t s) : buf(b), sz(s), solong(0){}
-            char *buf;
-            size_t sz;
-            size_t solong; // number of bytes written or read so far
+            string buf;
+            size_t solong = 0; // number of bytes written or read so far

         };
 
         connection(chanmgr *m1, int f1, int lossytest=0);
         };
 
         connection(chanmgr *m1, int f1, int lossytest=0);

@@ -37,7 +34,7 @@ class connection : public aio_callback {
         bool isdead();
         void closeconn();
 
         bool isdead();
         void closeconn();
 

-        bool send(char *b, size_t sz);
+        bool send(const string & b);

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

@@ -46,13 +43,14 @@ class connection : public aio_callback {
         int ref() { lock rl(ref_m_); return refno_; }
 
         int compare(connection *another);
         int ref() { lock rl(ref_m_); return refno_; }
 
         int compare(connection *another);

+

     private:
 
         bool readpdu();
         bool writepdu();
 
         chanmgr *mgr_;
     private:
 
         bool readpdu();
         bool writepdu();
 
         chanmgr *mgr_;

-        const int fd_;
+        const file_t fd_;

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

@@ -62,7 +60,7 @@ class connection : public aio_callback {
 
         int waiters_ = 0;
         int refno_ = 1;
 
         int waiters_ = 0;
         int refno_ = 1;

-        const int lossy_;
+        int lossy_ = 0;

 
         mutex m_;
         mutex ref_m_;
 
         mutex m_;
         mutex ref_m_;

@@ -72,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_;