Make all server unlisten when then they finish.

Author: larsbrinkhoff

apps/discard.c

@@ -25,9 +25,17 @@ static void discard_server (int sock)
     if (ncp_read (connection, buffer, &size) == -1)
       fprintf (stderr, "NCP read error.\n");
     if (size <= 0)
-      return;
+      break;
     fprintf (stderr, "Read %d octets.\n", size);
   }
+
+  if (size == 0 && ncp_close (connection) == -1)
+    fprintf (stderr, "NCP close error.\n");
+
+  if (ncp_unlisten (sock) == -1) {
+    fprintf (stderr, "NCP unlisten error.\n");
+    exit (1);
+  }
 }
 
 static void usage (const char *argv0)

apps/echo.c

@@ -79,15 +79,24 @@ static void echo_server (int sock)
     if (ncp_read (connection, buffer, &size) == -1)
       fprintf (stderr, "NCP read error.\n");
     if (size <= 0)
-      return;
+      goto end;
     for (ptr = buffer; size > 0; ptr += n, size -= n) {
       n = size;
       if (ncp_write (connection, ptr, &n) == -1)
         fprintf (stderr, "NCP read error.\n");
       if (n <= 0)
-        return;
+        goto end;
     }
   }
+
+ end:
+  if (n == 0 && ncp_close (connection) == -1)
+    fprintf (stderr, "NCP close error.\n");
+
+  if (ncp_unlisten (sock) == -1) {
+    fprintf (stderr, "NCP unlisten error.\n");
+    exit (1);
+  }
 }
 
 static void usage (const char *argv0)

apps/finser.c

@@ -5,6 +5,8 @@
 #include <string.h>
 #include "ncp.h"
 
+#define SOCKET  0117
+
 int main (int argc, char **argv)
 {
   char command[1000];
@@ -26,7 +28,7 @@ int main (int argc, char **argv)
   }
 
   size = 8;
-  if (ncp_listen (0117, &size, &host, &connection) == -1) {
+  if (ncp_listen (SOCKET, &size, &host, &connection) == -1) {
     fprintf (stderr, "NCP listen error.\n");
     exit (1);
   }
@@ -47,9 +49,13 @@ int main (int argc, char **argv)
     exit (1);
   }
 
-  if (ncp_close (connection) == -1) {
+  if (ncp_close (connection) == -1)
     fprintf (stderr, "NCP close error.\n");
+
+  if (ncp_unlisten (SOCKET) == -1) {
+    fprintf (stderr, "NCP unlisten error.\n");
     exit (1);
   }
 
+  return 0;
 }

apps/gateway.c

@@ -183,8 +183,11 @@ static void ncp_to_tcp (int sock, const char *host, const char *port)
   fd = inet_connect (host, port);
   transport (fd, connection);
 
-  if (ncp_close (connection) == -1) {
+  if (ncp_close (connection) == -1)
     fprintf (stderr, "NCP close error.\n");
+
+  if (ncp_unlisten (sock) == -1) {
+    fprintf (stderr, "NCP unlisten error.\n");
     exit (1);
   }
 }

apps/telnet.c

@@ -456,8 +456,11 @@ static void telnet_server (int host, int sock,
   kill (reader_pid, SIGTERM);
   kill (writer_pid, SIGTERM);
 
-  if (ncp_close (connection) == -1) {
+  if (ncp_close (connection) == -1)
     fprintf (stderr, "NCP close error.\n");
+
+  if (ncp_unlisten (sock) == -1) {
+    fprintf (stderr, "NCP unlisten error.\n");
     exit (1);
   }
 }