Implement initial connection protocol.

Author: larsbrinkhoff

src/ncp.c

@@ -54,6 +54,11 @@
 #define ERR_SOCKET      4 //Request on a non-existent socket.
 #define ERR_CONNECT     5 //Socket (link) not connected.
 
+#define ICP_NONE            0
+#define ICP_SERVER_LISTEN   1
+#define ICP_SERVER_STR      2
+#define ICP_SERVER_SOCKET   3
+
 #define CONNECTIONS 20
 
 static int fd;
@@ -71,6 +76,7 @@ struct
 {
   client_t client;
   int host;
+  int icp;
   struct { int link, size; uint32_t lsock, rsock; } rcv, snd;
 } connection[CONNECTIONS];
 
@@ -168,6 +174,7 @@ static void destroy (int i)
     connection[i].snd.size = connection[i].rcv.size = -1;
   connection[i].rcv.lsock = connection[i].rcv.rsock =
     connection[i].snd.lsock = connection[i].snd.rsock = 0;
+  connection[i].icp = ICP_NONE;
 }
 
 static void send_imp (int flags, int type, int destination, int link, int id,
@@ -277,7 +284,7 @@ void ncp_rts (uint8_t destination, uint32_t lsock, uint32_t rsock, uint8_t link)
 void ncp_all (uint8_t destination, uint8_t link, uint16_t msg_space, uint32_t bit_space)
 {
   packet[22] = link;
-  packet[23] = msg_space >> 16;
+  packet[23] = msg_space >> 8;
   packet[24] = msg_space;
   packet[25] = bit_space >> 24;
   packet[26] = bit_space >> 16;
@@ -438,13 +445,16 @@ static int process_rts (uint8_t source, uint8_t *data)
 {
   int i;
   uint32_t lsock, rsock;
+  uint8_t link;
+
   rsock = sock (&data[0]);
   lsock = sock (&data[4]);
+  link = data[8];
 
-  fprintf (stderr, "NCP: Recieved RTS %u:%u from %03o.\n",
-           lsock, rsock, source);
+  fprintf (stderr, "NCP: Received RTS sockets %u:%u link %u from %03o.\n",
+           lsock, rsock, link, source);
 
-  if (data[8] < LINK_MIN || data[8] > LINK_MAX) {
+  if (link < LINK_MIN || link > LINK_MAX) {
     ncp_err (source, ERR_PARAM, data - 1, 10);
     return 9;
   }
@@ -468,18 +478,23 @@ static int process_rts (uint8_t source, uint8_t *data)
       fprintf (stderr, "NCP: Listening to %u: connection %d.\n", lsock, i);
     }
   }
-  connection[i].snd.link = data[8]; //Send link.
-  if (connection[i].rcv.size == -1) {
+  connection[i].snd.link = link; //Send link.
+  if (connection[i].icp == ICP_SERVER_LISTEN) {
+    connection[i].rcv.size = 32; //Send byte size for ICP.
+    connection[i].icp = ICP_SERVER_STR;
+    ncp_str (connection[i].host, lsock, rsock, connection[i].rcv.size);
+  }
+  else if (connection[i].rcv.size == -1) {
     connection[i].rcv.size = 8; //Send byte size.
     ncp_str (connection[i].host, lsock, rsock, connection[i].rcv.size);
     if (connection[i].rcv.link != -1) {
       fprintf (stderr, "NCP: Completing incoming RFC.\n");
-      reply_listen (source, connection[i].snd.lsock, i);
+      //reply_listen (source, connection[i].snd.lsock, i);
     }
   } else {
     if (connection[i].snd.size != -1) {
       fprintf (stderr, "NCP: Completing outgoing RFC.\n");
-      reply_open (source, connection[i].rcv.rsock, i);
+      //reply_open (source, connection[i].rcv.rsock, i);
     }
   }
 
@@ -490,17 +505,15 @@ static int process_str (uint8_t source, uint8_t *data)
 {
   int i;
   uint32_t lsock, rsock;
+  uint8_t size;
+
   rsock = sock (&data[0]);
   lsock = sock (&data[4]);
+  size = data[8];
 
   fprintf (stderr, "NCP: Recieved STR %u:%u from %03o.\n",
            lsock, rsock, source);
 
-  if (data[8] < LINK_MIN || data[8] > LINK_MAX) {
-    ncp_err (source, ERR_PARAM, data - 1, 10);
-    return 9;
-  }
-
   if (find_listen (lsock) == -1) {
     i = find_sockets (source, lsock, rsock);
     if (i == -1) {
@@ -520,7 +533,7 @@ static int process_str (uint8_t source, uint8_t *data)
       fprintf (stderr, "NCP: Listening to %u: connection %d.\n", lsock, i);
     }
   }
-  connection[i].snd.size = data[8]; //Receive byte size.
+  connection[i].snd.size = size; //Receive byte size.
   if (connection[i].rcv.link == -1) {
     connection[i].rcv.link = 42; //Receive link.
     ncp_rts (connection[i].host, lsock, rsock, connection[i].rcv.link);
@@ -578,12 +591,26 @@ static int process_cls (uint8_t source, uint8_t *data)
 static int process_all (uint8_t source, uint8_t *data)
 {
   int i;
+  uint8_t link = data[0];
+
   fprintf (stderr, "NCP: Recieved ALL from %03o, link %u.\n",
-           source, data[0]);
-  i = find_link (source, data[0]);
-  if (i == -1)
+           source, link);
+  i = find_link (source, link);
+  if (i == -1) {
     ncp_err (source, ERR_SOCKET, data - 1, 10);
-  return 9;
+  } else if (connection[i].icp == ICP_SERVER_STR) {
+    uint8_t tmp[4];
+    uint32_t s = 0200;
+    tmp[0] = (s >> 24) & 0xFF;
+    tmp[1] = (s >> 16) & 0xFF;
+    tmp[2] = (s >>  8) & 0xFF;
+    tmp[3] = (s >>  0) & 0xFF;
+    fprintf (stderr, "NCP: Send socket %u for ICP.\n", s);
+    send_imp (0, IMP_REGULAR, connection[i].host, connection[i].snd.link,
+              0, 0, &tmp, 4);
+    connection[i].icp = ICP_SERVER_SOCKET;
+  }
+  return 7;
 }
 
 static int process_gvb (uint8_t source, uint8_t *data)
@@ -761,13 +788,17 @@ static int (*ncp_messages[]) (uint8_t source, uint8_t *data) =
 static void process_ncp (uint8_t source, uint8_t *data, uint16_t count)
 {
   int i = 0, n;
+  fprintf (stderr, "Process NCP: %u bytes.\n", count);
   while (i < count) {
     uint8_t type = data[i++];
+    fprintf (stderr, "Process NCP: type %u.\n", type);
     if (type > NCP_MAX) {
+      fprintf (stderr, "Process NCP: bad type.\n");
       ncp_err (source, ERR_OPCODE, data - 1, 10);
       return;
     }
     n = ncp_messages[type] (source, &data[i]);
+    fprintf (stderr, "Process NCP: %d bytes data => %d.\n", n, i + n);
     if (i + n > count)
       ncp_err (source, ERR_SHORT, data - 1, count - i + 1);
     i += n;
@@ -1013,6 +1044,12 @@ static void app_open (void)
   memcpy (&connection[i].client.addr, &client, len);
   connection[i].client.len = len;
 
+  // Send ICP RTS.
+  // Wait for STR.
+  // Send ALL.
+  // Wait for data with remote socket.
+  // Wait for CLS / send CLS.
+
   // Send RFC messages.
   ncp_rts (connection[i].host, connection[i].rcv.lsock,
            connection[i].rcv.rsock, connection[i].rcv.link);
@@ -1041,6 +1078,7 @@ static void app_listen (void)
   listening[i].sock = socket;
   memcpy (&connection[i].client.addr, &client, len);
   connection[i].client.len = len;
+  connection[i].icp = ICP_SERVER_LISTEN;
 }
 
 static void app_read (void)