Nuova versione del client

diff --git a/elemtcp.tex b/elemtcp.tex
index c2a9dbba7dbc1191407a2609b55df7e60af09ed9..70caf59463babdf922a02ac50eeca7eb94622cbe 100644 (file)
--- a/elemtcp.tex
+++ b/elemtcp.tex
@@ -2175,6 +2175,8 @@ chiusura.
 
 
 
+
+
 %%% Local Variables: 
 %%% mode: latex
 %%% TeX-master: "gapil"

diff --git a/sources/Makefile b/sources/Makefile
index 593d95899809ab4ce277d52f610ed6ec19f1e34d..39db81d60da9b362a0967be647427f12100f95c3 100644 (file)
--- a/sources/Makefile
+++ b/sources/Makefile
@@ -66,7 +66,7 @@ forktest: ForkTest.c
 errcode: ErrCode.c 
        $(CC) $(CFLAGJ) $^ -o $@
 
-echo: TCP_echo_first.c
+echo: TCP_echo.c
        $(CC) $(CFLAGJ) $(CFLAGS) $^ -o $@
 
 echod: TCP_echod.c

diff --git a/sources/TCP_echo.c b/sources/TCP_echo.c
new file mode 100644 (file)
index 0000000..be6842b
--- /dev/null
+++ b/sources/TCP_echo.c
@@ -0,0 +1,145 @@
+/* TCP_echo1.c
+ * 
+ * Copyright (C) 2001-2003 Simone Piccardi
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+/****************************************************************
+ *
+ * Program ElemEchoTCPClient.c
+ * Simple TCP client for echo service (port 7)
+ *
+ * Author: Simone Piccardi
+ * Jun. 2001
+ *
+ * Usage: echo -h give all info's
+ *
+ * $Id: TCP_echo.c,v 1.1 2003/06/23 13:58:36 piccardi Exp $
+ *
+ ****************************************************************/
+/* 
+ * Include needed headers
+ */
+#include <sys/types.h>   /* predefined types */
+#include <unistd.h>      /* include unix standard library */
+#include <arpa/inet.h>   /* IP addresses conversion utiliites */
+#include <sys/socket.h>  /* socket library */
+#include <stdio.h>      /* include standard I/O library */
+
+#define MAXLINE 256
+void usage(void);
+void ClientEcho(FILE * filein, int socket);
+void SigTERM_hand(int sig);
+
+/* Program begin */
+int main(int argc, char *argv[])
+{
+/* 
+ * Variables definition  
+ */
+    int sock, i;
+    int reset = 0;
+    struct sockaddr_in serv_add;
+    struct linger ling;
+    /*
+     * Input section: decode parameters passed in the calling 
+     * Use getopt function
+     */
+    opterr = 0;         /* don't want writing to stderr */
+    while ( (i = getopt(argc, argv, "hr")) != -1) {
+       switch (i) {
+       /* 
+        * Handling options 
+        */ 
+       case 'h':  
+           printf("Wrong -h option use\n");
+           usage();
+           return(1);
+           break;
+       case 'r':
+           reset = 1;
+           break;
+       case '?':   /* unrecognized options */
+           printf("Unrecognized options -%c\n",optopt);
+           usage();
+       default:    /* should not reached */
+           usage();
+       }
+    }
+    /* ***********************************************************
+     * 
+     *          Options processing completed
+     *
+     *               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");
+       return 1;
+    }
+    /* check if resetting on close is required */
+    if (reset) {
+       ling.l_onoff = 1;
+       ling.l_linger = 0;      
+       if (setsockopt(sock, SOL_SOCKET, SO_LINGER, &ling, sizeof(ling))) {
+           perror("Cannot set linger");
+           exit(1);
+       }
+    }
+    /* read daytime from server */
+    ClientEcho(stdin, sock);
+    /* normal exit */
+    return 0;
+}
+/*
+ * routine to print usage info and exit 
+ */
+void usage(void) {
+    printf("Take daytime from a remote host \n");
+    printf("Usage:\n");
+    printf("  daytime [-h] [-v] [host in dotted decimal form] \n");
+//    printf("  -v        set verbosity on\n");
+    printf("  -r          require reset on closing\n");
+    printf("  -h          print this help\n");
+    exit(1);
+}
+
+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);
+    }
+    return;
+}