Versione finale del client ECHO su TCP, con esempio di uso della funzione

[gapil.git] / sources / TCP_echo.c

diff --git a/sources/TCP_echo.c b/sources/TCP_echo.c
index 57d61840120e90adc83a046a274b62e4a3f1a9a4..691911e0c57c0c23b38ac742d7fa4a3d707d9ff0 100644 (file)
--- a/sources/TCP_echo.c
+++ b/sources/TCP_echo.c
@@ -26,7 +26,7 @@
  *
  * Usage: echo -h give all info's
  *
- * $Id: TCP_echo.c,v 1.10 2003/10/19 10:38:27 piccardi Exp $
+ * $Id: TCP_echo.c,v 1.11 2003/10/20 22:44:16 piccardi Exp $
  *
  ****************************************************************/
 /* 
@@ -142,16 +142,21 @@ void ClientEcho(FILE * filein, int socket)
     int nread, nwrite; 
     int maxfd;
     fd_set fset;
+    int eof = 0;
     /* initialize file descriptor set */
     FD_ZERO(&fset);
     maxfd = max(fileno(filein), socket) + 1;
     while (1) {
        FD_SET(socket, &fset);         /* set for the socket */
-       FD_SET(fileno(filein), &fset); /* set for the standard input */
+       if (eof == 0) {
+           FD_SET(fileno(filein), &fset); /* set for the standard input */
+       }
        select(maxfd, &fset, NULL, NULL, NULL); /* wait for read ready */
        if (FD_ISSET(fileno(filein), &fset)) {  /* if ready on stdin */
            if (fgets(sendbuff, MAXLINE, filein) == NULL) { /* if no input */
-               return;                /* we stopped client */
+               eof = 1;               /* EOF on input */
+               shutdown(socket, SHUT_WR);      /* close write half */
+               FD_CLR(fileno(filein), &fset);  /* no more interest on stdin */
            } else {                   /* else we have to write to socket */
                nwrite = FullWrite(socket, sendbuff, strlen(sendbuff)); 
                if (nwrite < 0) {      /* on error stop */
@@ -167,8 +172,12 @@ void ClientEcho(FILE * filein, int socket)
                return;
            }
            if (nread == 0) { /* server closed connection, stop */
-               printf("EOF sul socket\n");
-               return;
+               if (eof == 1) {
+                   return;
+               } else {
+                   printf("EOF prematuro sul socket\n");
+                   return;
+               }
            }
            recvbuff[nread] = 0;   /* else read is ok, write on stdout */
            if (fputs(recvbuff, stdout) == EOF) {