summaryrefslogtreecommitdiff
path: root/netcon/NetconEthernetTap.cpp
diff options
context:
space:
mode:
authorJoseph Henry <josephjah@gmail.com>2015-12-10 09:24:56 -0800
committerJoseph Henry <josephjah@gmail.com>2015-12-10 09:24:56 -0800
commit663a336b834355a558cc415abc4809fda329bd77 (patch)
treefa4a982c0035182c0c7a1230dc347d9663eb0e0b /netcon/NetconEthernetTap.cpp
parente506fda3e4d60063541abb46973a0cea0bc8e8b0 (diff)
downloadinfinitytier-663a336b834355a558cc415abc4809fda329bd77.tar.gz
infinitytier-663a336b834355a558cc415abc4809fda329bd77.zip
RPC cleanup + Temporary timing fix
Diffstat (limited to 'netcon/NetconEthernetTap.cpp')
-rw-r--r--netcon/NetconEthernetTap.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/netcon/NetconEthernetTap.cpp b/netcon/NetconEthernetTap.cpp
index 5a98c413..9d9c4e05 100644
--- a/netcon/NetconEthernetTap.cpp
+++ b/netcon/NetconEthernetTap.cpp
@@ -740,6 +740,7 @@ void NetconEthernetTap::phyOnUnixData(PhySocket *sock,void **uptr,void *data,uns
handle_getsockname(sock, uptr, &getsockname_rpc);
break;
default:
+ dwr(MSG_ERROR, "POSSIBLE RPC CORRUPTION. TRY AGAIN!\n");
break;
}
}
@@ -1191,7 +1192,7 @@ void NetconEthernetTap::handle_getsockname(PhySocket *sock, void **uptr, struct
int port = conn->addr->sin_port;
dwr(MSG_ERROR, " handle_getsockname(): returning address: %d.%d.%d.%d: %d\n", d[0],d[1],d[2],d[3], port);
*/
-
+
// Assemble address "command" to send to intercept
char retmsg[sizeof(struct sockaddr)];
memset(&retmsg, '\0', sizeof(retmsg));
@@ -1406,6 +1407,7 @@ TcpConnection * NetconEthernetTap::handle_socket(PhySocket *sock, void **uptr, s
close(fds[1]); // close other end of socketpair
// Once the client tells us what its fd is on the other end, we can then complete the mapping
new_conn->pending = true;
+ send_return_value(rpc_fd, 0, ERR_OK);
return new_conn;
}
else {