Merge branch 'master' of ssh://gapil.gnulinux.it/srv/git/gapil

[gapil.git] / sources / TCP_echo_first.c

diff --git a/sources/TCP_echo_first.c b/sources/TCP_echo_first.c
index 626d1964384a4237e0ff219b2b7365f3cd18184a..cd0f7f65b5045143189cfc08a2f42cab9cb0f333 100644 (file)
--- a/sources/TCP_echo_first.c
+++ b/sources/TCP_echo_first.c
@@ -1,6 +1,6 @@
-/* TCP_echo1.c
+/* TCP_echo_first.c
  * 
- * Copyright (C) 2001 Simone Piccardi
+ * 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
@@ -18,25 +18,30 @@
  */
 /****************************************************************
  *
- * Program ElemEchoTCPClient.c
+ * Program TCP_echo_first.c (former ElemEchoTCPClient)
  * Simple TCP client for echo service (port 7)
+ * First version, broken in many ways, that will be corrected later
  *
  * Author: Simone Piccardi
  * Jun. 2001
  *
  * Usage: echo -h give all info's
  *
- * $Id: TCP_echo_first.c,v 1.1 2003/06/19 12:08:11 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 */
+//#include <sys/types.h>   /* primitive system data types */
+#include <unistd.h>      /* unix standard library */
+#include <arpa/inet.h>   /* IP addresses conversion utilities */
+#include <sys/socket.h>  /* socket constants, types and functions */
+#include <stdio.h>      /* standard I/O library */
+#include <string.h>     /* C strings library */
+#include <stdlib.h>     /* C standard library */
+
+#include "Gapil.h"
+#include "macros.h"
+
 
 #define MAXLINE 256
 void usage(void);
@@ -121,7 +126,7 @@ void ClientEcho(FILE * filein, int socket)
     int nread; 
     while (fgets(sendbuff, MAXLINE, filein) != NULL) {
        FullWrite(socket, sendbuff, strlen(sendbuff)); 
-       nread = FullRead(socket, recvbuff, strlen(sendbuff));
+       nread = read(socket, recvbuff, strlen(sendbuff));
        recvbuff[nread] = 0;
        fputs(recvbuff, stdout);
     }