Corretto echo per un errore nel settaggio di SO_LINGER, immesso

[gapil.git] / sources / TCP_echo.c

diff --git a/sources/TCP_echo.c b/sources/TCP_echo.c
index be6842babd90358dffab5bbd4526dabe07ee65bf..7fdb8370202a60be91ce204e49903756d7b69fa0 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.1 2003/06/23 13:58:36 piccardi Exp $
+ * $Id: TCP_echo.c,v 1.7 2003/08/03 18:12:47 piccardi Exp $
  *
  ****************************************************************/
 /* 
@@ -37,6 +37,8 @@
 #include <arpa/inet.h>   /* IP addresses conversion utiliites */
 #include <sys/socket.h>  /* socket library */
 #include <stdio.h>      /* include standard I/O library */
+#include <errno.h>      /* include error codes */
+#include <string.h>     /* include erroro strings definitions */
 
 #define MAXLINE 256
 void usage(void);
@@ -106,6 +108,7 @@ int main(int argc, char *argv[])
     }
     /* check if resetting on close is required */
     if (reset) {
+       printf("Setting reset on close \n");
        ling.l_onoff = 1;
        ling.l_linger = 0;      
        if (setsockopt(sock, SOL_SOCKET, SO_LINGER, &ling, sizeof(ling))) {
@@ -113,7 +116,7 @@ int main(int argc, char *argv[])
            exit(1);
        }
     }
-    /* read daytime from server */
+    /* do read/write operations */
     ClientEcho(stdin, sock);
     /* normal exit */
     return 0;
@@ -134,12 +137,20 @@ void usage(void) {
 void ClientEcho(FILE * filein, int socket) 
 {
     char sendbuff[MAXLINE+1], recvbuff[MAXLINE+1];
-    int nread; 
+    int nread, nwrite; 
     while (fgets(sendbuff, MAXLINE, filein) != NULL) {
-       FullWrite(socket, sendbuff, strlen(sendbuff)); 
-       nread = FullRead(socket, recvbuff, strlen(sendbuff));
+       nwrite = FullWrite(socket, sendbuff, strlen(sendbuff)); 
+       if (nwrite < 0) {
+           printf("Errore in scrittura %s", strerror(errno));
+       }
+        nread = read(socket, recvbuff, strlen(sendbuff));
+       if (nread < 0) {
+           printf("Errore in lettura %s\n", strerror(errno));
+       }
        recvbuff[nread] = 0;
-       fputs(recvbuff, stdout);
+       if (fputs(recvbuff, stdout) == EOF) {
+           perror("Errore in scrittura su terminale");
+       }
     }
     return;
 }