X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/2546a41ad36fdc9ef6471cb35a1d56930ae1b527..ab9eee5d7f1fbe7a3fe6229d4a78136efb14371b:/rsmtest_client.cc

diff --git a/rsmtest_client.cc b/rsmtest_client.cc
index 0c56f8a..48744d3 100644
--- a/rsmtest_client.cc
+++ b/rsmtest_client.cc
@@ -1,30 +1,21 @@
 // RPC stubs for clients to talk to rsmtest_server
 
-#include "rsmtest_client.h"
-#include "rpc/rpc.h"
+#include "include/rsmtest_client.h"
 #include <arpa/inet.h>
 
-#include <sstream>
-#include <iostream>
-#include <stdio.h>
-
-rsmtest_client::rsmtest_client(std::string dst) : cl(dst) {
-    if (cl.bind() < 0)
-        printf("rsmtest_client: call bind\n");
+rsmtest_client::rsmtest_client(string dst) {
+    if (!(cl = rpcc::bind_cached(dst)))
+        LOG << "could not bind to " << dst;
 }
 
 rsm_test_protocol::status rsmtest_client::net_repair(int heal) {
-    rsm_test_protocol::status r;
-    auto ret = (rsm_test_protocol::status)cl.call(rsm_test_protocol::net_repair, r, heal);
-    VERIFY (ret == rsm_test_protocol::OK);
+    rsm_test_protocol::status r = rsm_test_protocol::ERR;
+    VERIFY (cl->call(rsm_test_protocol::net_repair, r, heal) == rsm_test_protocol::OK);
     return r;
 }
 
 rsm_test_protocol::status rsmtest_client::breakpoint(int b) {
-    rsm_test_protocol::status r;
-    auto ret = (rsm_test_protocol::status)cl.call(rsm_test_protocol::breakpoint, r, b);
-    VERIFY (ret == rsm_test_protocol::OK);
+    rsm_test_protocol::status r = rsm_test_protocol::ERR;
+    VERIFY (cl->call(rsm_test_protocol::breakpoint, r, b) == rsm_test_protocol::OK);
     return r;
 }
-
-