From 965896b93239ca6d736cd52a7d218496b6236959 Mon Sep 17 00:00:00 2001
From: Jeff Becker <ampernand@gmail.com>
Date: Sun, 18 Dec 2016 12:56:34 -0500
Subject: [PATCH] fix sam crash on exit and datagram crash with no outbound
 tunnel

---
 Datagram.cpp |  2 +-
 SAM.cpp      | 28 ++++++++++++----------------
 SAM.h        |  1 -
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/Datagram.cpp b/Datagram.cpp
index f8437108..7066a153 100644
--- a/Datagram.cpp
+++ b/Datagram.cpp
@@ -310,7 +310,7 @@ namespace datagram
 		std::vector<i2p::tunnel::TunnelMessageBlock> send;
 		auto routingPath = GetSharedRoutingPath();
 		// if we don't have a routing path we will drop all queued messages
-		if(routingPath)
+		if(routingPath && routingPath->outboundTunnel && routingPath->remoteLease)
 		{
 			for (const auto & msg : m_SendQueue)
 			{
diff --git a/SAM.cpp b/SAM.cpp
index 5b21af51..5bf9a74b 100644
--- a/SAM.cpp
+++ b/SAM.cpp
@@ -710,11 +710,6 @@ namespace client
 	{
 		PumpBacklog();
 	}
-		
-	SAMSession::~SAMSession ()
-	{
-		i2p::client::context.DeleteLocalDestination (localDestination);
-	}
 
 	void SAMSession::AcceptI2P(std::shared_ptr<i2p::stream::Stream> stream)
 	{
@@ -767,18 +762,19 @@ namespace client
 
 	void SAMSession::CloseStreams ()
 	{
+		m_BacklogPumper.cancel();
 		localDestination->GetService().post([&] () {
-				std::lock_guard<std::mutex> lock(m_SocketsMutex);
-				for (auto& sock : m_Sockets) {
-					sock->CloseStream();
-				}
-				for(auto & stream : m_Backlog) {
-						stream->Close();
-				}
-				// XXX: should this be done inside locked parts?
-				m_Sockets.clear();
-				m_Backlog.clear();
-			});
+			std::lock_guard<std::mutex> lock(m_SocketsMutex);
+			for (auto& sock : m_Sockets) {
+				sock->CloseStream();
+			}
+			for(auto & stream : m_Backlog) {
+				stream->Close();
+			}
+			m_Sockets.clear();
+			m_Backlog.clear();
+			i2p::client::context.DeleteLocalDestination (localDestination);
+		});
 	}
 
 	SAMBridge::SAMBridge (const std::string& address, int port):
diff --git a/SAM.h b/SAM.h
index 810a1bb0..7d7d6d3a 100644
--- a/SAM.h
+++ b/SAM.h
@@ -165,7 +165,6 @@ namespace client
 		}
 
 		SAMSession (std::shared_ptr<ClientDestination> dest);
-		~SAMSession ();
 
 		void AcceptI2P(std::shared_ptr<i2p::stream::Stream> stream);