Clean-ups to types.

[invirt/third/libt4.git] / rpc / rpc.cc

diff --git a/rpc/rpc.cc b/rpc/rpc.cc
index 62003dd..32b25ab 100644 (file)
--- a/rpc/rpc.cc
+++ b/rpc/rpc.cc
@@ -262,7 +262,7 @@ int rpcc::call1(proc_t proc, marshall &req, string &rep, TO to) {
 
     IF_LEVEL(2) LOG(clt_nonce_ << " call done for req proc " << hex << proc <<
                     " xid " << dec << ca.xid << " " << inet_ntoa(dst_.sin_addr) << ":" <<
 
     IF_LEVEL(2) LOG(clt_nonce_ << " call done for req proc " << hex << proc <<
                     " xid " << dec << ca.xid << " " << inet_ntoa(dst_.sin_addr) << ":" <<

-                    ntohs(dst_.sin_port) << " done? " << ca.done << " ret " << ca.intret);
+                    ntoh(dst_.sin_port) << " done? " << ca.done << " ret " << ca.intret);

 
     if(ch)
         ch->decref();
 
     if(ch)
         ch->decref();

@@ -353,7 +353,7 @@ compress:
     }
 }
 
     }
 }
 

-rpcs::rpcs(unsigned int p1, size_t count)
+rpcs::rpcs(in_port_t p1, size_t count)

   : port_(p1), counting_(count), curr_counts_(count), reachable_ (true)
 {
     set_rand_seed();
   : port_(p1), counting_(count), curr_counts_(count), reachable_ (true)
 {
     set_rand_seed();

@@ -682,6 +682,6 @@ static sockaddr_in make_sockaddr(const string &host, const string &port) {
         memcpy(&a, hp->h_addr_list[0], sizeof(in_addr_t));
         dst.sin_addr.s_addr = a.s_addr;
     }
         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;
 }
     return dst;
 }