Lock the SSH transport pipe when producing our identification string.

wanproxy · Dec 23, 2016 · 7fed4c5 · 7fed4c5
1 parent 98b19f5
commit 7fed4c5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/ssh/ssh_session.h b/ssh/ssh_session.h
@@ -72,6 +72,10 @@ namespace SSH {
 		{ }
 	};
 
+	/*
+	 * XXX
+	 * Is the Session adequately locked?
+	 */
 	struct Session {
 		Role role_;
 

diff --git a/ssh/ssh_transport_pipe.cc b/ssh/ssh_transport_pipe.cc
@@ -64,6 +64,8 @@ SSH::TransportPipe::TransportPipe(Session *session)
 	Buffer identification_string("SSH-2.0-WANProxy " + (std::string)log_);
 	session_->local_version(identification_string);
 	identification_string.append("\r\n");
+
+	ScopedLock _(&mtx_);
 	produce(&identification_string);
 }