So many changes. Broken.

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

diff --git a/rsmtest_client.cc b/rsmtest_client.cc
index f008228..48744d3 100644 (file)
--- a/rsmtest_client.cc
+++ b/rsmtest_client.cc
@@ -1,39 +1,21 @@
 // RPC stubs for clients to talk to rsmtest_server
 
-#include "rsmtest_client.h"
-#include "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)
-{
-  sockaddr_in dstsock;
-  make_sockaddr(dst.c_str(), &dstsock);
-  cl = new rpcc(dstsock);
-  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;
 }
 
-int
-rsmtest_client::net_repair(int heal)
-{
-  int r;
-  int ret = cl->call(rsm_test_protocol::net_repair, heal, r);
-  VERIFY (ret == rsm_test_protocol::OK);
-  return r;
+rsm_test_protocol::status rsmtest_client::net_repair(int heal) {
+    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;
 }
 
-int
-rsmtest_client::breakpoint(int b)
-{
-  int r;
-  int ret = cl->call(rsm_test_protocol::breakpoint, b, r);
-  VERIFY (ret == rsm_test_protocol::OK);
-  return r;
+rsm_test_protocol::status rsmtest_client::breakpoint(int b) {
+    rsm_test_protocol::status r = rsm_test_protocol::ERR;
+    VERIFY (cl->call(rsm_test_protocol::breakpoint, r, b) == rsm_test_protocol::OK);
+    return r;
 }
-
-