*
* Usage: echo -h give all info's
*
- * $Id: TCP_echo.c,v 1.8 2003/08/17 23:03:44 piccardi Exp $
+ * $Id: TCP_echo.c,v 1.11 2003/10/20 22:44:16 piccardi Exp $
*
****************************************************************/
/*
#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);
{
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));
- return;
- }
- nread = read(socket, recvbuff, strlen(sendbuff));
- if (nread < 0) {
- printf("Errore in lettura: %s\n", strerror(errno));
- return;
+ 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 */
}
- if (nread == 0) {
- printf("EOF sul socket\n");
- return;
+ 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");
- 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;
}