X-Git-Url: https://gapil.gnulinux.it/gitweb/?a=blobdiff_plain;f=sources%2FTCP_echod.c;h=ff866efa581860497f57a32a194c5eea5798a11c;hb=2fcfdcb7ec5f5fdacbdeaff72961f1c35d0858dd;hp=689049265861498279830c4fe0626f8ff22ac9c8;hpb=866f3cf8f2fe10ea9c7b5c4b10faf37fce74b1aa;p=gapil.git

diff --git a/sources/TCP_echod.c b/sources/TCP_echod.c
index 6890492..ff866ef 100644
--- a/sources/TCP_echod.c
+++ b/sources/TCP_echod.c
@@ -62,9 +62,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];
     /*
@@ -73,7 +75,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 
@@ -86,6 +88,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;
@@ -116,7 +124,8 @@ int main(int argc, char *argv[])
 	SignalRestart(SIGCHLD, HandSigCHLD);  /* restarting handler */
     }
     /* create and bind socket */
-    if ( (list_fd = sockbind(NULL, "echo", 6, SOCK_STREAM)) < 0) {
+    if ( (list_fd = sockbindopt(argv[optind], "echo", 6, 
+				SOCK_STREAM, reuse)) < 0) {
 	return 1;
     }   
     /* release privileges and go daemon */
@@ -167,6 +176,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);
@@ -193,6 +206,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");