Altro lavoro sul server echo, e sulle condizioni particolari

[gapil.git] / sources / TCP_echod.c

diff --git a/sources/TCP_echod.c b/sources/TCP_echod.c
index 3cc5ba30804a43fa09616701a420c9999e192d43..35de97c30f22b9981e7dac777b24da23fb586388 100644 (file)
--- a/sources/TCP_echod.c
+++ b/sources/TCP_echod.c
@@ -26,7 +26,7 @@
  *
  * Usage: echod -h give all info
  *
- * $Id: TCP_echod.c,v 1.3 2003/05/12 22:52:29 piccardi Exp $ 
+ * $Id: TCP_echod.c,v 1.5 2003/06/19 11:43:13 piccardi Exp $ 
  *
  ****************************************************************/
 /* 
@@ -40,12 +40,13 @@
 #include <time.h>
 #include <syslog.h>      /* syslog system functions */
 #include <signal.h>      /* signal functions */
+#include <errno.h>       /* error code */
 #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 +58,18 @@ int main(int argc, char *argv[])
  * Variables definition  
  */
     int list_fd, conn_fd;
+    int waiting;
     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 +85,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();
@@ -133,15 +140,25 @@ int main(int argc, char *argv[])
        PrintErr("listen error");
        exit(1);
     }
+    if (waiting) sleep(waiting);
     /* handle echo to client */
     while (1) {
        /* accept connection */
-       while (((conn_fd = accept(list_fd, NULL, NULL)) < 0) 
-              && (errno == EINTR)); 
+       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");
@@ -184,7 +201,7 @@ void ServEcho(int sockfd) {
        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);
@@ -197,7 +214,7 @@ void ServEcho(int sockfd) {
  * routine to print error on stout or syslog
  */
 void PrintErr(char * error) {
-    if (demonize) {          /* go daemon */
+    if (demonize) {          /* daemon mode */
        syslog(LOG_ERR, error);
     } else {
        perror(error);