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 08d926f5d462b700d0888e754472a8e8546013d2..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.4 2003/06/18 21:19:24 piccardi Exp $ 
+ * $Id: TCP_echod.c,v 1.5 2003/06/19 11:43:13 piccardi Exp $ 
  *
  ****************************************************************/
 /* 
@@ -60,7 +60,9 @@ int main(int argc, char *argv[])
     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
@@ -142,12 +144,21 @@ int main(int argc, char *argv[])
     /* 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");
@@ -190,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);
@@ -203,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);