X-Git-Url: https://gapil.gnulinux.it/gitweb/?p=gapil.git;a=blobdiff_plain;f=sources%2FTCP_echod.c;h=333a5450b9df067e62444a8e36b646e112982e7c;hp=fd51f982797a745c6d5d2f1e8fc1cf3c5949b45d;hb=fa15a3f1ecd64efd8440e46d398fd9976abc3d25;hpb=28ac8648240edd35e31f75ae11dbe3e4ac9e109e

diff --git a/sources/TCP_echod.c b/sources/TCP_echod.c
index fd51f98..333a545 100644
--- 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,22 +26,22 @@
  *
  * Usage: echod -h give all info
  *
- * $Id: TCP_echod.c,v 1.12 2003/08/03 18:12:47 piccardi Exp $ 
- *
  ****************************************************************/
 /* 
  * Include needed headers
  */
-#include <sys/types.h>   /* predefined types */
-#include <unistd.h>      /* include unix standard library */
-#include <arpa/inet.h>   /* IP addresses conversion utiliites */
-#include <sys/socket.h>  /* socket library */
-#include <stdio.h>	 /* include standard I/O library */
-#include <time.h>
+#include <sys/types.h>   /* primitive system data types */
+#include <unistd.h>      /* unix standard library */
+#include <arpa/inet.h>   /* IP addresses conversion utilities */
+#include <sys/socket.h>  /* socket constants, types and functions */
+#include <stdio.h>	 /* standard I/O library */
+#include <time.h>        /* date and time constants, types and functions */
 #include <syslog.h>      /* syslog system functions */
-#include <signal.h>      /* signal functions */
-#include <errno.h>       /* error code */
-#include <string.h>      /* error strings */
+#include <signal.h>      /* signal constants, types and functions */
+#include <errno.h>       /* error definitions and routines */
+#include <string.h>      /* C strings library */
+#include <stdlib.h>      /* C standard library */ 
+
 #include "Gapil.h"
 
 #define BACKLOG 10
@@ -60,9 +60,11 @@ int main(int argc, char *argv[])
  */
     int list_fd, conn_fd;
     int waiting = 0;
+    int keepalive = 0; 
+    int reuse = 0;
     int compat = 0;
     pid_t pid;
-    struct sockaddr_in serv_add, cli_add;
+    struct sockaddr_in cli_add;
     socklen_t len;
     char debug[MAXLINE], ipaddr[20];
     /*
@@ -71,7 +73,7 @@ int main(int argc, char *argv[])
      */
     int i;
     opterr = 0;	 /* don't want writing to stderr */
-    while ( (i = getopt(argc, argv, "hdicw:")) != -1) {
+    while ( (i = getopt(argc, argv, "hkrdicw:")) != -1) {
 	switch (i) {
 	/* 
 	 * Handling options 
@@ -84,6 +86,12 @@ int main(int argc, char *argv[])
 	case 'i':
 	    demonize = 0;
 	    break;
+	case 'k':
+	    keepalive = 1;
+	    break;
+	case 'r':
+	    reuse = 1;
+	    break;
 	case 'c':
 	    compat = 1;
 	    break;
@@ -113,21 +121,11 @@ int main(int argc, char *argv[])
     } else {
 	SignalRestart(SIGCHLD, HandSigCHLD);  /* restarting 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);
-    }
+    /* create and bind socket */
+    if ( (list_fd = sockbindopt(argv[optind], "echo", 6, 
+				SOCK_STREAM, reuse)) < 0) {
+	return 1;
+    }   
     /* release privileges and go daemon */
     if (setgid(65534) !=0) { /* first give away group privileges */
 	perror("cannot give away group privileges");
@@ -153,9 +151,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);
 	}
@@ -175,6 +174,10 @@ int main(int argc, char *argv[])
 	}
 	if (pid == 0) {      /* child */
 	    close(list_fd);          /* close listening socket */   
+	    if (keepalive) {         /* enable keepalive ? */
+		setsockopt(conn_fd, SOL_SOCKET, SO_KEEPALIVE, 
+			   &keepalive, sizeof(keepalive));
+	    }
 	    ServEcho(conn_fd);       /* handle echo */
 	    if (debugging) {
 		snprintf(debug, MAXLINE, "Closed connection %s\n", ipaddr);
@@ -201,6 +204,8 @@ void usage(void) {
     printf("  echod [-h] \n");
     printf("  -h	   print this help\n");
     printf("  -d	   write debug info\n");
+    printf("  -k	   enable SO_KEEPALIVE\n");
+    printf("  -r	   enable SO_REUSEADDR\n");
     printf("  -i	   use interactively\n");
     printf("  -c	   disable BSD semantics\n");
     printf("  -w N	   wait N sec. before calling accept\n");