X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/24bebc0ecf83446c7371eff69042322aab34976a..ba03b19875aa2e3586e49b10904563cdd3b91de0:/rpc/connection.h diff --git a/rpc/connection.h b/rpc/connection.h index 2a01e46..1eb625b 100644 --- a/rpc/connection.h +++ b/rpc/connection.h @@ -5,7 +5,6 @@ #include #include #include -#include #include "pollmgr.h" constexpr size_t size_t_max = numeric_limits::max(); @@ -16,18 +15,15 @@ class connection; 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 { - 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); @@ -37,7 +33,7 @@ class connection : public aio_callback { 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); @@ -46,6 +42,7 @@ class connection : public aio_callback { int ref() { lock rl(ref_m_); return refno_; } int compare(connection *another); + private: bool readpdu(); @@ -62,7 +59,7 @@ class connection : public aio_callback { int waiters_ = 0; int refno_ = 1; - const int lossy_; + int lossy_ = 0; mutex m_; mutex ref_m_; @@ -72,12 +69,12 @@ class connection : public aio_callback { class tcpsconn { public: - tcpsconn(chanmgr *m1, unsigned int port, int lossytest=0); + tcpsconn(chanmgr *m1, in_port_t port, int lossytest=0); ~tcpsconn(); - inline unsigned int port() { return port_; } + inline in_port_t port() { return port_; } void accept_conn(); private: - unsigned int port_; + in_port_t port_; mutex m_; thread th_; int pipe_[2];