Correzione per gestire IPv4 e IPv6, fase 1

[gapil.git] / sources / TCP_echod.c

diff --git a/sources/TCP_echod.c b/sources/TCP_echod.c
index 83d0c738f294743dd66478dfcb9b17d0e0bc7548..f0eab95c2f7c5064b3bb8611eb684eef27629d35 100644 (file)
--- a/sources/TCP_echod.c
+++ b/sources/TCP_echod.c
@@ -1,6 +1,6 @@
 /* TCP_echod.c
  * 
- * Copyright (C) 2001-2003 Simone Piccardi
+ * Copyright (C) 2001-2004 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.9 2003/07/27 23:41:04 piccardi Exp $ 
+ * $Id$ 
  *
  ****************************************************************/
 /* 
@@ -42,6 +42,8 @@
 #include <signal.h>      /* signal functions */
 #include <errno.h>       /* error code */
 #include <string.h>      /* error strings */
+#include <stdlib.h>
+
 #include "Gapil.h"
 
 #define BACKLOG 10
@@ -60,6 +62,7 @@ int main(int argc, char *argv[])
  */
     int list_fd, conn_fd;
     int waiting = 0;
+    int compat = 0;
     pid_t pid;
     struct sockaddr_in serv_add, cli_add;
     socklen_t len;
@@ -70,7 +73,7 @@ int main(int argc, char *argv[])
      */
     int i;
     opterr = 0;         /* don't want writing to stderr */
-    while ( (i = getopt(argc, argv, "hdiw:")) != -1) {
+    while ( (i = getopt(argc, argv, "hdicw:")) != -1) {
        switch (i) {
        /* 
         * Handling options 
@@ -83,6 +86,9 @@ int main(int argc, char *argv[])
        case 'i':
            demonize = 0;
            break;
+       case 'c':
+           compat = 1;
+           break;
        case 'd':
            debugging = 1;
            break;
@@ -103,23 +109,17 @@ int main(int argc, char *argv[])
      *               Main code beginning
      * 
      * ***********************************************************/
-    /* install SIGCHLD handler */
-    Signal(SIGCHLD, HandSigCHLD);  /* establish handler */
-    /* create socket */
-    if ( (list_fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
-       perror("Socket creation error");
-       exit(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 */
-    serv_add.sin_addr.s_addr = htonl(INADDR_ANY);   /* connect from anywhere */
-    /* bind socket */
-    if (bind(list_fd, (struct sockaddr *)&serv_add, sizeof(serv_add)) < 0) {
-       perror("bind error");
-       exit(1);
+    /* Main code begin here */
+    if (compat) {                             /* install signal handler */
+       Signal(SIGCHLD, HandSigCHLD);         /* non restarting handler */
+    } else {
+       SignalRestart(SIGCHLD, HandSigCHLD);  /* restarting handler */
     }
+    /* create and bind socket */
+    if ( (list_fd = sockbind(NULL, "echo", 6, SOCK_STREAM)) < 0) {
+       if (errno) perror("Socket creation error");
+       return 1;
+    }   
     /* release privileges and go daemon */
     if (setgid(65534) !=0) { /* first give away group privileges */
        perror("cannot give away group privileges");
@@ -145,9 +145,10 @@ int main(int argc, char *argv[])
     /* handle echo to client */
     while (1) {
        /* accept connection */
+       len = sizeof(cli_add);
        while (((conn_fd = accept(list_fd, (struct sockaddr *)&cli_add, &len)) 
                < 0) && (errno == EINTR)); 
-       if ( conn_fd < 0) {
+       if (conn_fd < 0) {
            PrintErr("accept error");
            exit(1);
        }
@@ -168,6 +169,14 @@ int main(int argc, char *argv[])
        if (pid == 0) {      /* child */
            close(list_fd);          /* close listening socket */   
            ServEcho(conn_fd);       /* handle echo */
+           if (debugging) {
+               snprintf(debug, MAXLINE, "Closed connection %s\n", ipaddr);
+               if (demonize) {
+                   syslog(LOG_DEBUG, debug);
+               } else {
+                   printf("%s", debug);
+               }
+           }
            exit(0);
        } else {             /* parent */
            close(conn_fd);          /* close connected socket */
@@ -186,6 +195,7 @@ void usage(void) {
     printf("  -h          print this help\n");
     printf("  -d          write debug info\n");
     printf("  -i          use interactively\n");
+    printf("  -c          disable BSD semantics\n");
     printf("  -w N        wait N sec. before calling accept\n");
     exit(1);
 }
@@ -196,27 +206,16 @@ void ServEcho(int sockfd) {
     char buffer[MAXLINE];
     int nread, nwrite;
     char debug[MAXLINE+20];
-    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);
-           }
+           PrintErr("Errore in lettura");
+           return;
        }
        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);
-           }       
+           PrintErr("Errore in scrittura");
+           return;
        }
        if (debugging) {
            buffer[nread] = 0;