Make API support connection byte size.

Author: larsbrinkhoff

apps/discard.c

@@ -13,7 +13,8 @@ static void discard_server (int sock)
   int host, connection, size;
   char buffer[1000];
 
-  if (ncp_listen (sock, &host, &connection) == -1) {
+  size = 8;
+  if (ncp_listen (sock, &size, &host, &connection) == -1) {
     fprintf (stderr, "NCP listen error.\n");
     exit (1);
   }

apps/echo.c

@@ -10,11 +10,12 @@
 
 static void echo_client (int host, int sock)
 {
-  int connection, n;
+  int connection, n, byte_size;
   char buffer[1000], *ptr;
   ssize_t size;
 
-  switch (ncp_open (host, sock, &connection)) {
+  size = 8;
+  switch (ncp_open (host, sock, &byte_size, &connection)) {
   case 0:
     break;
   case -1:
@@ -66,7 +67,8 @@ static void echo_server (int sock)
   int host, connection, size, n;
   char buffer[1000], *ptr;
 
-  if (ncp_listen (sock, &host, &connection) == -1) {
+  size = 8;
+  if (ncp_listen (sock, &size, &host, &connection) == -1) {
     fprintf (stderr, "NCP listen error.\n");
     exit (1);
   }

apps/finger.c

@@ -27,7 +27,8 @@ int main (int argc, char **argv)
 
   printf ("Finger host %03o.\n", host);
 
-  switch (ncp_open (host, 0117, &connection)) {
+  size = 8;
+  switch (ncp_open (host, 0117, &size, &connection)) {
   case 0:
     break;
   case -1:

apps/finser.c

@@ -23,7 +23,8 @@ int main (int argc, char **argv)
     exit (1);
   }
 
-  if (ncp_listen (0117, &host, &connection) == -1) {
+  size = 8;
+  if (ncp_listen (0117, &size, &host, &connection) == -1) {
     fprintf (stderr, "NCP listen error.\n");
     exit (1);
   }

apps/gateway.c

@@ -138,7 +138,7 @@ static void tcp_to_ncp (const char *port, const char *host, const char *sock)
 {
   char *foreign_host;
   int connection, foreign_port;
-  int fd, s;
+  int fd, s, size;
 
   s = inet_server (port);
   fd = inet_accept (s, &foreign_host, &foreign_port);
@@ -148,7 +148,8 @@ static void tcp_to_ncp (const char *port, const char *host, const char *sock)
   int ncp_host = atoi (host);
   int ncp_sock = atoi (sock);
 
-  switch (ncp_open (ncp_host, ncp_sock, &connection)) {
+  size = 8;
+  switch (ncp_open (ncp_host, ncp_sock, &size, &connection)) {
   case 0:
     break;
   case -1:
@@ -170,9 +171,10 @@ static void tcp_to_ncp (const char *port, const char *host, const char *sock)
 
 static void ncp_to_tcp (int sock, const char *host, const char *port)
 {
-  int fd, ncp_host, connection;
+  int fd, ncp_host, connection, size;
 
-  if (ncp_listen (sock, &ncp_host, &connection) == -1) {
+  size = 8;
+  if (ncp_listen (sock, &size, &ncp_host, &connection) == -1) {
     fprintf (stderr, "NCP listen error.\n");
     exit (1);
   }

apps/telnet.c

@@ -313,13 +313,14 @@ static void telnet_client (int host, int sock,
                            void (*process) (unsigned char, int, int),
                            const unsigned char *options)
 {
-  int connection;
+  int connection, byte_size;
   int reader_fd, writer_fd;
   size_t size;
 
   printf ("TELNET to host %03o.\n", host);
 
-  switch (ncp_open (host, sock, &connection)) {
+  byte_size = 8;
+  switch (ncp_open (host, sock, &byte_size, &connection)) {
   case 0:
     break;
   case -1:
@@ -392,7 +393,9 @@ static void telnet_server (int sock, void (*process) (unsigned char, int, int),
   char *banner;
 
   fprintf (stderr, "Listening to socket %d.\n", sock);
-  if (ncp_listen (sock, &host, &connection) == -1) {
+
+  size = 8;
+  if (ncp_listen (sock, &size, &host, &connection) == -1) {
     fprintf (stderr, "NCP listen error.\n");
     exit (1);
   }

src/ICP

@@ -0,0 +1,84 @@
+
+
+Server
+
+1. incoming RTS1
+2. reply STR1
+3. wait for ALL
+4. data S
+5. CLS
+6. be ready to accept new STR2+RTS2
+7. send new STR3+RTS3
+8. wait for reply STR2+RTS2
+
+After RTS1, send STR1.
+After STR1, expect ALL.
+After ALL, send data S, send CLS.
+After send data S, expect CLS, RTS2, STR2.
+
+Client
+
+1. send RTS1
+2. wait for STR1
+3. be ready accept new STR2+RTS2
+4. send ALL
+5. wait for data
+6. send new STR3+RTS3
+7. wait for reply STR2+RTS2
+
+Send RTS1, expect STR1, STR2, RTS2.
+After STR1, send ALL, expect data S, STR2, RTS2.
+After data S, send CLS, send STR2, send RTS2, expect STR2, expect RTS2.
+
+RTS->STR->ALL->data->CLS
+
+RTS->STR2+STR2
+
+Server
+
+  Incoming RTS:
+  - ICP initial (first message)
+  - or ICP primary
+  Incoming STR:
+  - ICP primary
+  Incoming ALL:
+  - ICP
+  - or not
+  Incoming CLS:
+  - ICP
+  - remote closing
+  - reply to CLS
+
+Client
+
+  Incoming STR:
+  - ICP initial (reply to first RTS)
+  - or ICP primary
+  Incoming RTS:
+  - ICP primary
+  Incoming data:
+  - ICP
+  - or not
+  Incoming CLS:
+  - ICP
+  - remote closing
+  - reply to CLS
+
+Both
+
+  Incoming RTS:
+  - If listening to L, start ICP.
+  - Else new connection.
+  Incoming STR:
+  - Confirm start ICP.
+  - Else new connection.
+  Incoming ALL:
+  - Allocation for ICP.
+  - Else allocation for regular data.
+  Incoming data:
+  - S for ICP.
+  - Else regular data.
+  Incoming CLS:
+  - Close ICP link.
+  - Remote closing link.
+  - Confirm closing link.

src/libncp.c

@@ -109,33 +109,36 @@ static int u32 (uint8_t *data)
   return (data[0] << 24) | (data[1] << 16) | (data[2] << 8) | data[3];
 }
 
-int ncp_open (int host, unsigned socket, int *connection)
+int ncp_open (int host, unsigned socket, int *size, int *connection)
 {
   type (WIRE_OPEN);
   add (host);
   add (socket >> 24);
   add (socket >> 16);
   add (socket >> 8);
   add (socket);
+  add (*size);
   if (transact () == -1)
     return -1;
   if (message[1] != host)
     return -1;
   if (u32 (message + 2) != socket)
     return -1;
-  if (message[7] == 255)
+  if (message[8] == 255)
     return -2;
   *connection = message[6];
+  *size = message[7];
   return 0;
 }
 
-int ncp_listen (unsigned socket, int *host, int *connection)
+int ncp_listen (unsigned socket, int *size, int *host, int *connection)
 {
   type (WIRE_LISTEN);
   add (socket >> 24);
   add (socket >> 16);
   add (socket >> 8);
   add (socket);
+  add (*size);
   if (transact () == -1)
     return -1;
   if (message[1] == 0)
@@ -144,6 +147,7 @@ int ncp_listen (unsigned socket, int *host, int *connection)
     return -1;
   *host = message[1];
   *connection = message[6];
+  *size = message[7];
   return 0;
 }