X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/5a5c578e2e358a121cdb9234a6cb11c4ecfbf323..e478ac59e66e89cbc174e781ac715c8644539947:/rpc/rpc.cc diff --git a/rpc/rpc.cc b/rpc/rpc.cc index ad3fcd9..32b25ab 100644 --- a/rpc/rpc.cc +++ b/rpc/rpc.cc @@ -63,8 +63,6 @@ #include #include -#include "jsl_log.h" - const rpcc::TO rpcc::to_max = { 120000 }; const rpcc::TO rpcc::to_min = { 1000 }; @@ -73,6 +71,8 @@ inline void set_rand_seed() { srandom((uint32_t)now.time_since_epoch().count()^(uint32_t)getpid()); } +static sockaddr_in make_sockaddr(const string &hostandport); + rpcc::rpcc(const string & d, bool retrans) : dst_(make_sockaddr(d)), srv_nonce_(0), bind_done_(false), xid_(1), lossytest_(0), retrans_(retrans), reachable_(true), chan_(NULL), destroy_wait_ (false), xid_rep_done_(-1) @@ -88,23 +88,19 @@ rpcc::rpcc(const string & d, bool retrans) : } char *loss_env = getenv("RPC_LOSSY"); - if(loss_env != NULL){ + if(loss_env) lossytest_ = atoi(loss_env); - } // xid starts with 1 and latest received reply starts with 0 xid_rep_window_.push_back(0); - jsl_log(JSL_DBG_2, "rpcc::rpcc cltn_nonce is %d lossy %d\n", - clt_nonce_, lossytest_); + IF_LEVEL(2) LOG("cltn_nonce is " << clt_nonce_ << " lossy " << lossytest_); } // IMPORTANT: destruction should happen only when no external threads // are blocked inside rpcc or will use rpcc in the future -rpcc::~rpcc() -{ - jsl_log(JSL_DBG_2, "rpcc::~rpcc delete nonce %d channo=%d\n", - clt_nonce_, chan_?chan_->channo():-1); +rpcc::~rpcc() { + IF_LEVEL(2) LOG("delete nonce " << clt_nonce_ << " channo=" << (chan_?chan_->channo():-1)); if(chan_){ chan_->closeconn(); chan_->decref(); @@ -112,9 +108,7 @@ rpcc::~rpcc() VERIFY(calls_.size() == 0); } -int -rpcc::bind(TO to) -{ +int rpcc::bind(TO to) { unsigned int r; int ret = call_timeout(rpc_const::bind, to, r, 0); if(ret == 0){ @@ -122,22 +116,19 @@ rpcc::bind(TO to) bind_done_ = true; srv_nonce_ = r; } else { - jsl_log(JSL_DBG_2, "rpcc::bind %s failed %d\n", - inet_ntoa(dst_.sin_addr), ret); + IF_LEVEL(2) LOG("bind " << inet_ntoa(dst_.sin_addr) << " failed " << ret); } return ret; }; // Cancel all outstanding calls - void -rpcc::cancel(void) -{ +void rpcc::cancel(void) { lock ml(m_); - LOG("rpcc::cancel: force callers to fail"); + LOG("force callers to fail"); for(auto &p : calls_){ caller *ca = p.second; - jsl_log(JSL_DBG_2, "rpcc::cancel: force caller to fail\n"); + IF_LEVEL(2) LOG("force caller to fail"); { lock cl(ca->m); ca->done = true; @@ -150,13 +141,10 @@ rpcc::cancel(void) destroy_wait_ = true; destroy_wait_c_.wait(ml); } - LOG("rpcc::cancel: done"); + LOG("done"); } -int -rpcc::call1(proc_t proc, marshall &req, unmarshall &rep, - TO to) -{ +int rpcc::call1(proc_t proc, marshall &req, string &rep, TO to) { caller ca(0, &rep); int xid_rep; @@ -165,7 +153,7 @@ rpcc::call1(proc_t proc, marshall &req, unmarshall &rep, if((proc != rpc_const::bind && !bind_done_) || (proc == rpc_const::bind && bind_done_)){ - jsl_log(JSL_DBG_1, "rpcc::call1 rpcc has not been bound to dst or binding twice\n"); + IF_LEVEL(1) LOG("rpcc has not been bound to dst or binding twice"); return rpc_const::bind_failure; } @@ -176,7 +164,7 @@ rpcc::call1(proc_t proc, marshall &req, unmarshall &rep, ca.xid = xid_++; calls_[ca.xid] = &ca; - req.pack_req_header({ca.xid, proc, clt_nonce_, srv_nonce_, xid_rep_window_.front()}); + req.pack_header(request_header{ca.xid, proc, clt_nonce_, srv_nonce_, xid_rep_window_.front()}); xid_rep = xid_rep_window_.front(); } @@ -203,13 +191,12 @@ rpcc::call1(proc_t proc, marshall &req, unmarshall &rep, } } if (forgot.isvalid()) - ch->send((char *)forgot.buf.c_str(), forgot.buf.size()); - ch->send(req.cstr(), req.size()); + ch->send(forgot.buf); + ch->send(req); } - else jsl_log(JSL_DBG_1, "not reachable\n"); - jsl_log(JSL_DBG_2, - "rpcc::call1 %u just sent req proc %x xid %d clt_nonce %d\n", - clt_nonce_, proc, ca.xid, clt_nonce_); + else IF_LEVEL(1) LOG("not reachable"); + IF_LEVEL(2) LOG(clt_nonce_ << " just sent req proc " << hex << proc << + " xid " << dec << ca.xid << " clt_nonce " << clt_nonce_); } transmit = false; // only send once on a given channel } @@ -226,14 +213,14 @@ rpcc::call1(proc_t proc, marshall &req, unmarshall &rep, { lock cal(ca.m); while (!ca.done){ - jsl_log(JSL_DBG_2, "rpcc:call1: wait\n"); + IF_LEVEL(2) LOG("wait"); if(ca.c.wait_until(cal, nextdeadline) == cv_status::timeout){ - jsl_log(JSL_DBG_2, "rpcc::call1: timeout\n"); + IF_LEVEL(2) LOG("timeout"); break; } } if(ca.done){ - jsl_log(JSL_DBG_2, "rpcc::call1: reply received\n"); + IF_LEVEL(2) LOG("reply received"); break; } } @@ -264,7 +251,7 @@ rpcc::call1(proc_t proc, marshall &req, unmarshall &rep, { lock ml(m_); if (!dup_req_.isvalid()) { - dup_req_.buf.assign(req.cstr(), req.size()); + dup_req_.buf = req; dup_req_.xid = ca.xid; } if (xid_rep > xid_rep_done_) @@ -273,10 +260,9 @@ rpcc::call1(proc_t proc, marshall &req, unmarshall &rep, lock cal(ca.m); - jsl_log(JSL_DBG_2, - "rpcc::call1 %u call done for req proc %x xid %d %s:%d done? %d ret %d \n", - clt_nonce_, proc, ca.xid, inet_ntoa(dst_.sin_addr), - ntohs(dst_.sin_port), ca.done, ca.intret); + IF_LEVEL(2) LOG(clt_nonce_ << " call done for req proc " << hex << proc << + " xid " << dec << ca.xid << " " << inet_ntoa(dst_.sin_addr) << ":" << + ntoh(dst_.sin_port) << " done? " << ca.done << " ret " << ca.intret); if(ch) ch->decref(); @@ -309,14 +295,14 @@ rpcc::get_refconn(connection **ch) // // this function keeps no reference for connection *c bool -rpcc::got_pdu(connection *, char *b, size_t sz) +rpcc::got_pdu(connection *, const string & b) { - unmarshall rep(b, sz); + unmarshall rep(b, true); reply_header h; - rep.unpack_reply_header(&h); + rep.unpack_header(h); if(!rep.ok()){ - jsl_log(JSL_DBG_1, "rpcc:got_pdu unmarshall header failed!!!\n"); + IF_LEVEL(1) LOG("unmarshall header failed!!!"); return true; } @@ -325,18 +311,17 @@ rpcc::got_pdu(connection *, char *b, size_t sz) update_xid_rep(h.xid); if(calls_.find(h.xid) == calls_.end()){ - jsl_log(JSL_DBG_2, "rpcc::got_pdu xid %d no pending request\n", h.xid); + IF_LEVEL(2) LOG("xid " << h.xid << " no pending request"); return true; } caller *ca = calls_[h.xid]; lock cl(ca->m); if(!ca->done){ - ca->un->take_in(rep); + *ca->rep = b; ca->intret = h.ret; if(ca->intret < 0){ - jsl_log(JSL_DBG_2, "rpcc::got_pdu: RPC reply error for xid %d intret %d\n", - h.xid, ca->intret); + IF_LEVEL(2) LOG("RPC reply error for xid " << h.xid << " intret " << ca->intret); } ca->done = 1; } @@ -368,22 +353,18 @@ compress: } } -rpcs::rpcs(unsigned int p1, size_t count) - : port_(p1), counting_(count), curr_counts_(count), lossytest_(0), reachable_ (true) +rpcs::rpcs(in_port_t p1, size_t count) + : port_(p1), counting_(count), curr_counts_(count), reachable_ (true) { set_rand_seed(); nonce_ = (unsigned int)random(); - jsl_log(JSL_DBG_2, "rpcs::rpcs created with nonce %d\n", nonce_); - - char *loss_env = getenv("RPC_LOSSY"); - if(loss_env != NULL){ - lossytest_ = atoi(loss_env); - } + IF_LEVEL(2) LOG("created with nonce " << nonce_); reg(rpc_const::bind, &rpcs::rpcbind, this); - dispatchpool_ = new ThrPool(6,false); + dispatchpool_ = new ThrPool(6, false); - listener_ = new tcpsconn(this, port_, lossytest_); + char *loss_env = getenv("RPC_LOSSY"); + listener_ = new tcpsconn(this, port_, loss_env ? atoi(loss_env) : 0); } rpcs::~rpcs() @@ -395,14 +376,14 @@ rpcs::~rpcs() } bool -rpcs::got_pdu(connection *c, char *b, size_t sz) +rpcs::got_pdu(connection *c, const string & b) { - if(!reachable_){ - jsl_log(JSL_DBG_1, "rpcss::got_pdu: not reachable\n"); - return true; - } + if(!reachable_){ + IF_LEVEL(1) LOG("not reachable"); + return true; + } - djob_t *j = new djob_t(c, b, sz); + djob_t *j = new djob_t{c, b}; c->incref(); bool succ = dispatchpool_->addJob(bind(&rpcs::dispatch, this, j)); if(!succ || !reachable_){ @@ -440,8 +421,8 @@ rpcs::updatestat(proc_t proc) if(clt.second.size() > maxrep) maxrep = clt.second.size(); } - jsl_log(JSL_DBG_1, "REPLY WINDOW: clients %d total reply %lu max per client %lu\n", - (int) reply_window_.size()-1, totalrep, maxrep); + IF_LEVEL(1) LOG("REPLY WINDOW: clients " << (reply_window_.size()-1) << " total reply " << + totalrep << " max per client " << maxrep); curr_counts_ = counting_; } } @@ -450,34 +431,32 @@ void rpcs::dispatch(djob_t *j) { connection *c = j->conn; - unmarshall req(j->buf, j->sz); + unmarshall req(j->buf, true); delete j; request_header h; - req.unpack_req_header(&h); + req.unpack_header(h); proc_t proc = h.proc; if(!req.ok()){ - jsl_log(JSL_DBG_1, "rpcs:dispatch unmarshall header failed!!!\n"); + IF_LEVEL(1) LOG("unmarshall header failed!!!"); c->decref(); return; } - jsl_log(JSL_DBG_2, - "rpcs::dispatch: rpc %d (proc %x, last_rep %d) from clt %u for srv instance %u \n", - h.xid, proc, h.xid_rep, h.clt_nonce, h.srv_nonce); + IF_LEVEL(2) LOG("rpc " << h.xid << " (proc " << hex << proc << ", last_rep " << + dec << h.xid_rep << ") from clt " << h.clt_nonce << " for srv instance " << h.srv_nonce); marshall rep; - reply_header rh(h.xid,0); + reply_header rh{h.xid,0}; // is client sending to an old instance of server? if(h.srv_nonce != 0 && h.srv_nonce != nonce_){ - jsl_log(JSL_DBG_2, - "rpcs::dispatch: rpc for an old server instance %u (current %u) proc %x\n", - h.srv_nonce, nonce_, h.proc); + IF_LEVEL(2) LOG("rpc for an old server instance " << h.srv_nonce << + " (current " << nonce_ << ") proc " << hex << h.proc); rh.ret = rpc_const::oldsrv_failure; - rep.pack_reply_header(rh); - c->send(rep.cstr(),rep.size()); + rep.pack_header(rh); + c->send(rep); return; } @@ -486,10 +465,9 @@ rpcs::dispatch(djob_t *j) { lock pl(procs_m_); if(procs_.count(proc) < 1){ - fprintf(stderr, "rpcs::dispatch: unknown proc %x.\n", - proc); + cerr << "unknown proc " << hex << proc << "." << endl; c->decref(); - VERIFY(0); + VERIFY(0); return; } @@ -497,8 +475,7 @@ rpcs::dispatch(djob_t *j) } rpcs::rpcstate_t stat; - char *b1 = nullptr; - size_t sz1 = 0; + string b1; if(h.clt_nonce){ // have i seen this client before? @@ -508,9 +485,8 @@ rpcs::dispatch(djob_t *j) if(reply_window_.find(h.clt_nonce) == reply_window_.end()){ VERIFY (reply_window_[h.clt_nonce].size() == 0); // create reply_window_[h.clt_nonce].push_back(reply_t(-1)); // store starting reply xid - jsl_log(JSL_DBG_2, - "rpcs::dispatch: new client %u xid %d chan %d, total clients %d\n", - h.clt_nonce, h.xid, c->channo(), (int)reply_window_.size()-1); + IF_LEVEL(2) LOG("new client " << h.clt_nonce << " xid " << h.xid << + " chan " << c->channo() << ", total clients " << (reply_window_.size()-1)); } } @@ -527,39 +503,36 @@ rpcs::dispatch(djob_t *j) } } - stat = checkduplicate_and_update(h.clt_nonce, h.xid, - h.xid_rep, &b1, &sz1); + stat = checkduplicate_and_update(h.clt_nonce, h.xid, h.xid_rep, b1); } else { // this client does not require at most once logic stat = NEW; } - switch (stat){ + switch (stat) { case NEW: // new request - if(counting_){ + if (counting_){ updatestat(proc); } rh.ret = (*f)(req, rep); if (rh.ret == rpc_const::unmarshal_args_failure) { - fprintf(stderr, "rpcs::dispatch: failed to" - " unmarshall the arguments. You are" - " probably calling RPC 0x%x with wrong" - " types of arguments.\n", proc); + cerr << "failed to unmarshall the arguments. You are " << + "probably calling RPC 0x" << hex << proc << " with the wrong " << + "types of arguments." << endl; VERIFY(0); } VERIFY(rh.ret >= 0); - rep.pack_reply_header(rh); - rep.take_buf(&b1,&sz1); + rep.pack_header(rh); + b1 = rep; - jsl_log(JSL_DBG_2, - "rpcs::dispatch: sending and saving reply of size %lu for rpc %d, proc %x ret %d, clt %u\n", - sz1, h.xid, proc, rh.ret, h.clt_nonce); + IF_LEVEL(2) LOG("sending and saving reply of size " << b1.size() << " for rpc " << + h.xid << ", proc " << hex << proc << " ret " << dec << rh.ret << ", clt " << h.clt_nonce); - if(h.clt_nonce > 0){ + if (h.clt_nonce > 0) { // only record replies for clients that require at-most-once logic - add_reply(h.clt_nonce, h.xid, b1, sz1); + add_reply(h.clt_nonce, h.xid, b1); } // get the latest connection to the client @@ -572,23 +545,18 @@ rpcs::dispatch(djob_t *j) } } - c->send(b1, sz1); - if(h.clt_nonce == 0){ - // reply is not added to at-most-once window, free it - free(b1); - } + c->send(rep); break; case INPROGRESS: // server is working on this request break; case DONE: // duplicate and we still have the response - c->send(b1, sz1); + c->send(b1); break; case FORGOTTEN: // very old request and we don't have the response anymore - jsl_log(JSL_DBG_2, "rpcs::dispatch: very old request %d from %u\n", - h.xid, h.clt_nonce); + IF_LEVEL(2) LOG("very old request " << h.xid << " from " << h.clt_nonce); rh.ret = rpc_const::atmostonce_failure; - rep.pack_reply_header(rh); - c->send(rep.cstr(),rep.size()); + rep.pack_header(rh); + c->send(rep); break; } c->decref(); @@ -606,11 +574,11 @@ rpcs::dispatch(djob_t *j) // returns one of: // NEW: never seen this xid before. // INPROGRESS: seen this xid, and still processing it. -// DONE: seen this xid, previous reply returned in *b and *sz. +// DONE: seen this xid, previous reply returned in b. // FORGOTTEN: might have seen this xid, but deleted previous reply. rpcs::rpcstate_t rpcs::checkduplicate_and_update(unsigned int clt_nonce, int xid, - int xid_rep, char **b, size_t *sz) + int xid_rep, string & b) { lock rwl(reply_window_m_); @@ -625,10 +593,8 @@ rpcs::checkduplicate_and_update(unsigned int clt_nonce, int xid, if (past_xid_rep < xid_rep || past_xid_rep == -1) { // scan for deletion candidates - for (; it != l.end() && it->xid < xid_rep; it++) { - if (it->cb_present) - free(it->buf); - } + while (it != l.end() && it->xid < xid_rep) + it++; l.erase(start, it); l.begin()->xid = xid_rep; } @@ -644,12 +610,10 @@ rpcs::checkduplicate_and_update(unsigned int clt_nonce, int xid, if (it != l.end() && it->xid == xid) { if (it->cb_present) { // return information about the remembered reply - *b = it->buf; - *sz = it->sz; + b = it->buf; return DONE; - } else { - return INPROGRESS; } + return INPROGRESS; } else { // remember that a new request has arrived l.insert(it, reply_t(xid)); @@ -658,14 +622,11 @@ rpcs::checkduplicate_and_update(unsigned int clt_nonce, int xid, } // rpcs::dispatch calls add_reply when it is sending a reply to an RPC, -// and passes the return value in b and sz. -// add_reply() should remember b and sz. -// free_reply_window() and checkduplicate_and_update is responsible for -// calling free(b). -void -rpcs::add_reply(unsigned int clt_nonce, int xid, - char *b, size_t sz) -{ +// and passes the return value in b. +// add_reply() should remember b. +// free_reply_window() and checkduplicate_and_update are responsible for +// cleaning up the remembered values. +void rpcs::add_reply(unsigned int clt_nonce, int xid, const string & b) { lock rwl(reply_window_m_); // remember the RPC reply value list &l = reply_window_[clt_nonce]; @@ -674,150 +635,27 @@ rpcs::add_reply(unsigned int clt_nonce, int xid, for (it++; it != l.end() && it->xid < xid; it++); // there should already be an entry, so whine if there isn't if (it == l.end() || it->xid != xid) { - fprintf(stderr, "Could not find reply struct in add_reply"); - l.insert(it, reply_t(xid, b, sz)); + cerr << "Could not find reply struct in add_reply" << endl; + l.insert(it, reply_t(xid, b)); } else { - *it = reply_t(xid, b, sz); + *it = reply_t(xid, b); } } void rpcs::free_reply_window(void) { lock rwl(reply_window_m_); - for (auto clt : reply_window_) { - for (auto it : clt.second){ - if (it.cb_present) - free(it.buf); - } - clt.second.clear(); - } reply_window_.clear(); } int rpcs::rpcbind(unsigned int &r, int) { - jsl_log(JSL_DBG_2, "rpcs::rpcbind called return nonce %u\n", nonce_); + IF_LEVEL(2) LOG("called return nonce " << nonce_); r = nonce_; return 0; } -marshall & -operator<<(marshall &m, uint8_t x) { - m.rawbyte(x); - return m; -} - -marshall & -operator<<(marshall &m, uint16_t x) { - x = hton(x); - m.rawbytes((char *)&x, 2); - return m; -} - -marshall & -operator<<(marshall &m, uint32_t x) { - x = hton(x); - m.rawbytes((char *)&x, 4); - return m; -} - -marshall & operator<<(marshall &m, int32_t x) { return m << (uint32_t) x; } -marshall & operator<<(marshall &m, int8_t x) { return m << (uint8_t)x; } -marshall & operator<<(marshall &m, bool x) { return m << (uint8_t)x; } -marshall & operator<<(marshall &m, int16_t x) { return m << (uint16_t)x; } -marshall & operator<<(marshall &m, uint64_t x) { return m << (uint32_t)(x>>32) << (uint32_t)x; } - -marshall & -operator<<(marshall &m, const string &s) { - m << (unsigned int) s.size(); - m.rawbytes(s.data(), s.size()); - return m; -} - -void marshall::pack_req_header(const request_header &h) { - size_t saved_sz = index_; - //leave the first 4-byte empty for channel to fill size of pdu - index_ = sizeof(rpc_sz_t); - *this << h.xid << h.proc << h.clt_nonce << h.srv_nonce << h.xid_rep; - index_ = saved_sz; -} - -void marshall::pack_reply_header(const reply_header &h) { - size_t saved_sz = index_; - //leave the first 4-byte empty for channel to fill size of pdu - index_ = sizeof(rpc_sz_t); - *this << h.xid << h.ret; - index_ = saved_sz; -} - -// take the contents from another unmarshall object -void -unmarshall::take_in(unmarshall &another) -{ - if(buf_) - free(buf_); - another.take_buf(&buf_, &sz_); - index_ = RPC_HEADER_SZ; - ok_ = sz_ >= RPC_HEADER_SZ?true:false; -} - -inline bool -unmarshall::ensure(size_t n) { - if (index_+n > sz_) - ok_ = false; - return ok_; -} - -inline uint8_t -unmarshall::rawbyte() -{ - if (!ensure(1)) - return 0; - return (uint8_t)buf_[index_++]; -} - -void -unmarshall::rawbytes(string &ss, size_t n) -{ - VERIFY(ensure(n)); - ss.assign(buf_+index_, n); - index_ += n; -} - -template -void -unmarshall::rawbytes(T &t) -{ - const size_t n = sizeof(T); - VERIFY(ensure(n)); - memcpy(&t, buf_+index_, n); - t = ntoh(t); - index_ += n; -} - -unmarshall & operator>>(unmarshall &u, bool &x) { x = (bool)u.rawbyte(); return u; } -unmarshall & operator>>(unmarshall &u, uint8_t &x) { x = u.rawbyte(); return u; } -unmarshall & operator>>(unmarshall &u, int8_t &x) { x = (int8_t)u.rawbyte(); return u; } -unmarshall & operator>>(unmarshall &u, uint16_t &x) { u.rawbytes(x); return u; } -unmarshall & operator>>(unmarshall &u, int16_t &x) { u.rawbytes(x); return u; } -unmarshall & operator>>(unmarshall &u, uint32_t &x) { u.rawbytes(x); return u; } -unmarshall & operator>>(unmarshall &u, int32_t &x) { u.rawbytes(x); return u; } -unmarshall & operator>>(unmarshall &u, size_t &x) { uint32_t xx; u.rawbytes(xx); x = xx; return u; } -unmarshall & operator>>(unmarshall &u, uint64_t &x) { u.rawbytes(x); return u; } -unmarshall & operator>>(unmarshall &u, int64_t &x) { u.rawbytes(x); return u; } -unmarshall & operator>>(unmarshall &u, string &s) { - unsigned sz = u.grab(); - if(u.ok()) - u.rawbytes(s, sz); - return u; -} - -bool operator<(const sockaddr_in &a, const sockaddr_in &b){ - return ((a.sin_addr.s_addr < b.sin_addr.s_addr) || - ((a.sin_addr.s_addr == b.sin_addr.s_addr) && - ((a.sin_port < b.sin_port)))); -} +static sockaddr_in make_sockaddr(const string &host, const string &port); -/*---------------auxilary function--------------*/ -sockaddr_in make_sockaddr(const string &hostandport) { +static sockaddr_in make_sockaddr(const string &hostandport) { auto colon = hostandport.find(':'); if (colon == string::npos) return make_sockaddr("127.0.0.1", hostandport); @@ -825,7 +663,7 @@ sockaddr_in make_sockaddr(const string &hostandport) { return make_sockaddr(hostandport.substr(0, colon), hostandport.substr(colon+1)); } -sockaddr_in make_sockaddr(const string &host, const string &port) { +static sockaddr_in make_sockaddr(const string &host, const string &port) { sockaddr_in dst; bzero(&dst, sizeof(dst)); dst.sin_family = AF_INET; @@ -838,12 +676,12 @@ sockaddr_in make_sockaddr(const string &host, const string &port) { struct hostent *hp = gethostbyname(host.c_str()); if (!hp || hp->h_length != 4 || hp->h_addrtype != AF_INET) { - fprintf(stderr, "cannot find host name %s\n", host.c_str()); + cerr << "cannot find host name " << host << endl; exit(1); } memcpy(&a, hp->h_addr_list[0], sizeof(in_addr_t)); dst.sin_addr.s_addr = a.s_addr; } - dst.sin_port = hton((uint16_t)stoi(port)); + dst.sin_port = hton((in_port_t)stoi(port)); return dst; }