1 files changed, 34 insertions, 1 deletions
diff --git a/src/Net/ServerConnection.cpp b/src/Net/ServerConnection.cpp
index afbfcbb..dd25af1 100644
--- a/src/Net/ServerConnection.cpp
+++ b/src/Net/ServerConnection.cpp
@@ -27,6 +27,37 @@
 namespace Mad {
 namespace Net {
 
+void ServerConnection::connectionHeaderReceiveHandler(const void *data, unsigned long length) {
+  if(length != sizeof(ConnectionHeader))
+    // Error... disconnect
+    return;
+  
+  const ConnectionHeader *header = reinterpret_cast<const ConnectionHeader*>(data);
+  
+  if(header->m != 'M' || header->a != 'A' || header->d != 'D')
+    // Error... disconnect
+    return;
+  
+  if(header->protVerMin > 1 || header->protVerMax < 1)
+    // Unsupported protocol... disconnect
+    return;
+  
+  if(header->type == 'C')
+    daemon = false;
+  else if(header->type == 'D')
+    daemon = true;
+  else
+    // Error... disconnect
+    return;
+  
+  ConnectionHeader header2 = {'M', 'A', 'D', 0, 0, 1, 1, 0};
+  
+  rawSend(reinterpret_cast<unsigned char*>(&header2), sizeof(header2));
+  
+  connecting = false;
+  enterReceiveLoop();
+}
+
 void ServerConnection::listen(const IPAddress &address) throw(ConnectionException) {
   const int kx_list[] = {GNUTLS_KX_ANON_DH, 0};
   
@@ -69,6 +100,7 @@ void ServerConnection::listen(const IPAddress &address) throw(ConnectionExceptio
   *peer = IPAddress(address);
   
   connected = true;
+  connecting = true;
   
   gnutls_init(&session, GNUTLS_SERVER);
   
@@ -86,7 +118,7 @@ void ServerConnection::listen(const IPAddress &address) throw(ConnectionExceptio
     throw ConnectionException("gnutls_handshake()", gnutls_strerror(ret));
   }
   
-  enterReceiveLoop();
+  rawReceive(sizeof(ConnectionHeader), sigc::mem_fun(this, &ServerConnection::connectionHeaderReceiveHandler));
 }
 
 void ServerConnection::disconnect() {
@@ -103,6 +135,7 @@ void ServerConnection::disconnect() {
   delete peer;
   
   connected = false;
+  connecting = false;
 }
 
 bool ServerConnection::dataPending() const {