# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1364988233 -28800
# Node ID 685d05f1cc5c1a2f21509c209397f423845af473
# Parent  a813e2752fdbd18f1601d19728d3d146e05bda8f
Just put the version string on the queue, don't use atomicio

diff -r a813e2752fdb -r 685d05f1cc5c common-session.c
--- a/common-session.c	Wed Apr 03 07:34:18 2013 +0800
+++ b/common-session.c	Wed Apr 03 19:23:53 2013 +0800
@@ -33,7 +33,6 @@
 #include "random.h"
 #include "kex.h"
 #include "channel.h"
-#include "atomicio.h"
 #include "runopts.h"
 
 static void checktimeouts();
@@ -50,8 +49,6 @@
 /* this is set when we get SIGINT or SIGTERM, the handler is in main.c */
 int exitflag = 0; /* GLOBAL */
 
-
-
 /* called only at the start of a session, set up initial state */
 void common_session_init(int sock_in, int sock_out) {
 
@@ -257,13 +254,12 @@
 	TRACE(("leave session_cleanup"))
 }
 
-
 void send_session_identification() {
-	/* write our version string, this blocks */
-	if (atomicio(write, ses.sock_out, LOCAL_IDENT "\r\n",
-				strlen(LOCAL_IDENT "\r\n")) == DROPBEAR_FAILURE) {
-		ses.remoteclosed();
-	}
+	buffer *writebuf = buf_new(strlen(LOCAL_IDENT "\r\n") + 1);
+	buf_putbytes(writebuf, LOCAL_IDENT "\r\n", strlen(LOCAL_IDENT "\r\n"));
+	buf_putbyte(writebuf, 0x0); // packet type
+	buf_setpos(writebuf, 0);
+	enqueue(&ses.writequeue, writebuf);
 }
 
 static void read_session_identification() {
diff -r a813e2752fdb -r 685d05f1cc5c process-packet.c
--- a/process-packet.c	Wed Apr 03 07:34:18 2013 +0800
+++ b/process-packet.c	Wed Apr 03 19:23:53 2013 +0800
@@ -48,7 +48,7 @@
 	TRACE2(("enter process_packet"))
 
 	type = buf_getbyte(ses.payload);
-	TRACE(("process_packet: packet type = %d", type))
+	TRACE(("process_packet: packet type = %d,  len %d", type, ses.payload->len))
 
 	ses.lastpacket = type;