From 776f93e7be1bfe2642a2d009c6dfda321006e31c Mon Sep 17 00:00:00 2001
From: Joseph Henry <joseph.henry@zerotier.com>
Date: Fri, 11 Sep 2015 14:12:27 -0400
Subject: closeConnection / closeClient changes

---
 netcon/NetconEthernetTap.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'netcon')

diff --git a/netcon/NetconEthernetTap.cpp b/netcon/NetconEthernetTap.cpp
index 0bcbf0a3..1def4791 100644
--- a/netcon/NetconEthernetTap.cpp
+++ b/netcon/NetconEthernetTap.cpp
@@ -195,8 +195,14 @@ NetconClient *NetconEthernetTap::getClientByPCB(struct tcp_pcb *pcb)
 
 void NetconEthernetTap::closeClient(NetconClient *client)
 {
-	// erase from clients vector
-	client->closeClient();
+	NetconConnection *temp_conn;
+	closeConnection(client->rpc);
+	for(size_t i=0; i<client->connections.size(); i++) {
+		temp_conn = client->connections[i];
+		closeConnection(client->connections[i]);
+		delete temp_conn;
+	}
+	delete client;
 }
 
 void NetconEthernetTap::closeConnection(NetconConnection *conn)
@@ -434,8 +440,7 @@ void NetconEthernetTap::nc_err(void *arg, err_t err)
 	NetconEthernetTap *tap = l->tap;
 	NetconConnection *c = tap->getConnectionByThisFD(tap->_phy.getDescriptor(l->sock));
   if(c) {
-    l->tap->closeConnection(c);
-		//tcp_close(c->pcb);
+    tap->closeConnection(c);
   }
   else {
     // can't locate connection object for PCB
-- 
cgit v1.2.3