X-Git-Url: https://gapil.gnulinux.it/gitweb/?p=gapil.git;a=blobdiff_plain;f=sources%2FTCP_echod.c;h=25a457187e4d000071e59623967d67938163a216;hp=606f85281c81117797816563483880e32814f43f;hb=efe29e351db06b5f8cc7dd8280d00eee483157a7;hpb=d12bc3e1e4b3ee762036d1c226c3b2ba1a720fb9

diff --git a/sources/TCP_echod.c b/sources/TCP_echod.c
index 606f852..25a4571 100644
--- a/sources/TCP_echod.c
+++ b/sources/TCP_echod.c
@@ -1,6 +1,6 @@
-/* ElemEchoTCPServer.c
+/* TCP_echod.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
@@ -26,7 +26,7 @@
  *
  * Usage: echod -h give all info
  *
- * $Id: TCP_echod.c,v 1.1 2003/05/02 09:50:55 piccardi Exp $ 
+ * $Id: TCP_echod.c,v 1.10 2003/07/29 22:41:36 piccardi Exp $ 
  *
  ****************************************************************/
 /* 
@@ -40,12 +40,14 @@
 #include <time.h>
 #include <syslog.h>      /* syslog system functions */
 #include <signal.h>      /* signal functions */
+#include <errno.h>       /* error code */
+#include <string.h>      /* error strings */
 #include "Gapil.h"
 
 #define BACKLOG 10
 #define MAXLINE 256
-int demonize  = 1;  /* daemon use option */
-int debugging = 0;  /* debug info printing option */
+int demonize  = 1;  /* daemon use option: default is daemon */
+int debugging = 0;  /* debug info printing option: default is no debug */
 /* Subroutines declaration */
 void usage(void);
 void ServEcho(int sockfd);
@@ -57,15 +59,18 @@ int main(int argc, char *argv[])
  * Variables definition  
  */
     int list_fd, conn_fd;
+    int waiting = 0;
     pid_t pid;
-    struct sockaddr_in serv_add;
+    struct sockaddr_in serv_add, cli_add;
+    socklen_t len;
+    char debug[MAXLINE], ipaddr[20];
     /*
      * Input section: decode parameters passed in the calling 
      * Use getopt function
      */
     int i;
     opterr = 0;	 /* don't want writing to stderr */
-    while ( (i = getopt(argc, argv, "hdi")) != -1) {
+    while ( (i = getopt(argc, argv, "hdiw:")) != -1) {
 	switch (i) {
 	/* 
 	 * Handling options 
@@ -81,6 +86,9 @@ int main(int argc, char *argv[])
 	case 'd':
 	    debugging = 1;
 	    break;
+	case 'w':
+	    waiting = strtol(optarg, NULL, 10);
+	    break;
 	case '?':   /* unrecognized options */
 	    printf("Unrecognized options -%c\n",optopt);
 	    usage();
@@ -96,7 +104,7 @@ int main(int argc, char *argv[])
      * 
      * ***********************************************************/
     /* install SIGCHLD handler */
-    Signal(SIGCHLD, HandSigCHLD);  /* establish handler */
+    SignalRestart(SIGCHLD, HandSigCHLD);  /* establish handler */
     /* create socket */
     if ( (list_fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
 	perror("Socket creation error");
@@ -133,13 +141,25 @@ int main(int argc, char *argv[])
 	PrintErr("listen error");
 	exit(1);
     }
+    if (waiting) sleep(waiting);
     /* handle echo to client */
     while (1) {
 	/* accept connection */
-	if ( (conn_fd = accept(list_fd, NULL, NULL)) < 0) {
+	while (((conn_fd = accept(list_fd, (struct sockaddr *)&cli_add, &len)) 
+		< 0) && (errno == EINTR)); 
+	if ( conn_fd < 0) {
 	    PrintErr("accept error");
 	    exit(1);
 	}
+	if (debugging) {
+	    inet_ntop(AF_INET, &cli_add.sin_addr, ipaddr, sizeof(ipaddr));
+	    snprintf(debug, MAXLINE, "Accepted connection form %s\n", ipaddr);
+	    if (demonize) {
+		syslog(LOG_DEBUG, debug);
+	    } else {
+		printf("%s", debug);
+	    }
+	}
 	/* fork to handle connection */
 	if ( (pid = fork()) < 0 ){
 	    PrintErr("fork error");
@@ -164,8 +184,9 @@ void usage(void) {
     printf("Usage:\n");
     printf("  echod [-h] \n");
     printf("  -h	   print this help\n");
-    printf("  -d	   print debug info\n");
+    printf("  -d	   write debug info\n");
     printf("  -i	   use interactively\n");
+    printf("  -w N	   wait N sec. before calling accept\n");
     exit(1);
 }
 /*
@@ -178,11 +199,29 @@ void ServEcho(int sockfd) {
     int size;
     /* main loop, reading 0 char means client close connection */
     while ( (nread = read(sockfd, buffer, MAXLINE)) != 0) {
+	if (nread < 0) {
+	    snprintf(debug, MAXLINE+20, "Errore in lettura: %s \n", 
+		     strerror(errno));
+	    if (demonize) {          /* daemon mode */
+		syslog(LOG_DEBUG, debug);
+	    } else {
+		printf("%s", debug);
+	    }
+	}
 	nwrite = FullWrite(sockfd, buffer, nread);
+	if (nwrite) {
+	    snprintf(debug, MAXLINE+20, "Errore in scrittura: %s \n", 
+		     strerror(errno));
+	    if (demonize) {          /* daemon mode */
+		syslog(LOG_DEBUG, debug);
+	    } else {
+		printf("%s", debug);
+	    }	    
+	}
 	if (debugging) {
 	    buffer[nread] = 0;
 	    snprintf(debug, MAXLINE+20, "Letti %d byte, %s", nread, buffer);
-	    if (demonize) {          /* go daemon */
+	    if (demonize) {          /* daemon mode */
 		syslog(LOG_DEBUG, debug);
 	    } else {
 		printf("%s", debug);
@@ -195,8 +234,8 @@ void ServEcho(int sockfd) {
  * routine to print error on stout or syslog
  */
 void PrintErr(char * error) {
-    if (demonize) {          /* go daemon */
-	syslog(LOG_ERR, error);
+    if (demonize) {                       /* daemon mode */
+	syslog(LOG_ERR, "%s: %m", error); /* log string and error message */
     } else {
 	perror(error);
     }