X-Git-Url: https://gapil.gnulinux.it/gitweb/?p=gapil.git;a=blobdiff_plain;f=sources%2FTCP_echo.c;h=f60c518233c4d2e399d9fcc7357c74319a5b571b;hp=2a6f921dd54a2543b75bc09b01e2f5ac30532632;hb=8654ce33b450ae7bb34c3907835000a0760c2931;hpb=58512a223c21f764630ea351c9fac80a25e614fe

diff --git a/sources/TCP_echo.c b/sources/TCP_echo.c
index 2a6f921..f60c518 100644
--- 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
  * 
@@ -18,7 +18,7 @@
  */
 /****************************************************************
  *
- * Program ElemEchoTCPClient.c
+ * Program TCP_echo.c
  * Simple TCP client for echo service (port 7)
  *
  * Author: Simone Piccardi
@@ -26,7 +26,7 @@
  *
  * Usage: echo -h give all info's
  *
- * $Id: TCP_echo.c,v 1.2 2003/06/23 18:48:04 piccardi Exp $
+ * $Id: TCP_echo.c,v 1.11 2003/10/20 22:44:16 piccardi Exp $
  *
  ****************************************************************/
 /* 
@@ -37,6 +37,11 @@
 #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 */
+
+#include "Gapil.h"
+#include "macros.h"
 
 #define MAXLINE 256
 void usage(void);
@@ -51,7 +56,6 @@ int main(int argc, char *argv[])
  */
     int sock, i;
     int reset = 0;
-    struct sockaddr_in serv_add;
     struct linger ling;
     /*
      * Input section: decode parameters passed in the calling 
@@ -85,23 +89,9 @@ int main(int argc, char *argv[])
      *		      Main code beginning
      * 
      * ***********************************************************/
-    /* create socket */
-    if ( (sock = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
-	perror("Socket creation error");
-	return 1;
-    }
-    /* initialize address */
-    memset((void *) &serv_add, 0, sizeof(serv_add)); /* clear server address */
-    serv_add.sin_family = AF_INET;                   /* address type is INET */
-    serv_add.sin_port = htons(7);                    /* echo port is 7 */
-    /* build address using inet_pton */
-    if ( (inet_pton(AF_INET, argv[optind], &serv_add.sin_addr)) <= 0) {
-	perror("Address creation error");
-	return 1;
-    }
-    /* extablish connection */
-    if (connect(sock, (struct sockaddr *)&serv_add, sizeof(serv_add)) < 0) {
-	perror("Connection error");
+    /* call sockaddr to get a connected socket */
+    if ( (sock = sockconn(argv[optind], "echo", 6, SOCK_STREAM)) < 0) {
+	if (errno) perror("Socket creation error");
 	return 1;
     }
     /* check if resetting on close is required */
@@ -114,7 +104,7 @@ int main(int argc, char *argv[])
 	    exit(1);
 	}
     }
-    /* read daytime from server */
+    /* do read/write operations */
     ClientEcho(stdin, sock);
     /* normal exit */
     return 0;
@@ -135,12 +125,51 @@ void usage(void) {
 void ClientEcho(FILE * filein, int socket) 
 {
     char sendbuff[MAXLINE+1], recvbuff[MAXLINE+1];
-    int nread; 
-    while (fgets(sendbuff, MAXLINE, filein) != NULL) {
-	FullWrite(socket, sendbuff, strlen(sendbuff)); 
-	nread = FullRead(socket, recvbuff, strlen(sendbuff));
-	recvbuff[nread] = 0;
-	fputs(recvbuff, stdout);
+    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 */
+	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 */
+		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;
+		}
+	    }
+	}
+	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;
 }