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 275d570c1739d423f9a79fdcae0826f200add939..691911e0c57c0c23b38ac742d7fa4a3d707d9ff0 100644 (file)
--- a/sources/TCP_echo.c
+++ b/sources/TCP_echo.c
@@ -1,4 +1,4 @@
-/* TCP_echo1.c
+/* TCP_echo.c

  * 
  * Copyright (C) 2001-2003 Simone Piccardi
  * 
  * 
  * Copyright (C) 2001-2003 Simone Piccardi
  * 


@@ -18,7 +18,7 @@
  */
 /****************************************************************
  *
  */
 /****************************************************************
  *

- * Program ElemEchoTCPClient.c
+ * Program TCP_echo.c

  * Simple TCP client for echo service (port 7)
  *
  * Author: Simone Piccardi
  * Simple TCP client for echo service (port 7)
  *
  * Author: Simone Piccardi


@@ -26,7 +26,7 @@
  *
  * Usage: echo -h give all info's
  *
  *
  * Usage: echo -h give all info's
  *

- * $Id: TCP_echo.c,v 1.5 2003/07/27 23:41:04 piccardi Exp $
+ * $Id: TCP_echo.c,v 1.11 2003/10/20 22:44:16 piccardi Exp $

  *
  ****************************************************************/
 /* 
  *
  ****************************************************************/
 /* 


@@ -40,6 +40,8 @@
 #include <errno.h>      /* include error codes */
 #include <string.h>     /* include erroro strings definitions */
 
 #include <errno.h>      /* include error codes */
 #include <string.h>     /* include erroro strings definitions */
 

+#include "macros.h"
+

 #define MAXLINE 256
 void usage(void);
 void ClientEcho(FILE * filein, int socket);
 #define MAXLINE 256
 void usage(void);
 void ClientEcho(FILE * filein, int socket);


@@ -115,7 +117,6 @@ int main(int argc, char *argv[])
            perror("Cannot set linger");
            exit(1);
        }
            perror("Cannot set linger");
            exit(1);
        }

-       return 0;

     }
     /* do read/write operations */
     ClientEcho(stdin, sock);
     }
     /* do read/write operations */
     ClientEcho(stdin, sock);


@@ -139,19 +140,50 @@ void ClientEcho(FILE * filein, int socket)
 {
     char sendbuff[MAXLINE+1], recvbuff[MAXLINE+1];
     int nread, nwrite; 
 {
     char sendbuff[MAXLINE+1], recvbuff[MAXLINE+1];
     int nread, nwrite; 

-    while (fgets(sendbuff, MAXLINE, filein) != NULL) {
-       nwrite = FullWrite(socket, sendbuff, strlen(sendbuff)); 
-       if (nwrite < 0) {
-           printf("Errore in scrittura %s", strerror(errno));
+    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 */
+       if (eof == 0) {
+           FD_SET(fileno(filein), &fset); /* set for the standard input */

        }
        }

-       nread = FullRead(socket, recvbuff, strlen(sendbuff));
-       if (nread < 0) {
-           printf("Errore in lettura %s", strerror(errno));
+       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 */
+               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 */
+                   printf("Errore in scrittura: %s", strerror(errno));
+                   return;
+               }
+           }

        }
        }

-       recvbuff[nread] = 0;
-       if (fputs(recvbuff, stdout) == EOF) {
-           perror("Errore in scrittura su terminale");
+       if (FD_ISSET(socket, &fset)) { /* if ready on socket */ 
+           nread = read(socket, recvbuff, strlen(sendbuff)); /* do read */
+           if (nread < 0) {  /* error condition, stop client */
+               printf("Errore in lettura: %s\n", strerror(errno));
+               return;
+           }
+           if (nread == 0) { /* server closed connection, stop */
+               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) {
+               perror("Errore in scrittura su terminale");
+               return;
+           }

        }
     }
        }
     }

-    return;

 }
 }