X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Fclient.c;h=69a8aaebd099eb180452eb601098a2d55462645c;hb=57c9d48d821e4706ed45f52f86929b01dd494966;hp=a3147d551dd4a91bd74dec75519e7131e2740193;hpb=5b3f4e20affe90bff9909272a933834247a2ed9d;p=spider.git

diff --git a/src/client.c b/src/client.c
index a3147d55..69a8aaeb 100644
--- a/src/client.c
+++ b/src/client.c
@@ -574,7 +574,7 @@ lend:;
 /* 
  * set up the various mode flags, NL endings and things
  */
-void setmode(char *m)
+void setconntype(char *m)
 {
 	connsort = strlower(m);
 	if (eq(connsort, "telnet") || eq(connsort, "local") || eq(connsort, "nlonly")) {
@@ -809,9 +809,9 @@ lerr:
 		die("Must have at least a callsign (for now)");
 
 	if (optind < argc) {
-		setmode(argv[optind]);		
+		setconntype(argv[optind]);		
 	} else {
-		setmode("local");
+		setconntype("local");
 	}
 
 	/* this is kludgy, but hey so is the rest of this! */
@@ -825,8 +825,10 @@ void connect_to_node()
 	struct hostent *hp, *gethostbyname();
 	struct sockaddr_in server;
 	int nodef;
+	int one = 1;
 	sel_t *sp;
-				
+	struct linger lg;
+					
 	if ((hp = gethostbyname(node_addr)) == 0) 
 		die("Unknown host tcp host %s for printer", node_addr);
 
@@ -842,6 +844,15 @@ void connect_to_node()
 	if (connect(nodef, (struct sockaddr *) &server, sizeof server) < 0) {
 		die("Error on connect to %s port %d (%d)", node_addr, node_port, errno);
 	}
+
+	memset(&lg, 0, sizeof lg);
+	if (setsockopt(nodef, SOL_SOCKET, SO_LINGER, &lg, sizeof lg) < 0) {
+		die("Error on SO_LINGER to %s port %d (%d)", node_addr, node_port, errno);
+	}
+	if (setsockopt(nodef, SOL_SOCKET, SO_KEEPALIVE, &one, sizeof one) < 0) {
+		die("Error on SO_KEEPALIVE to %s port %d (%d)", node_addr, node_port, errno);
+	}
+	
 	node = fcb_new(nodef, MSG);
 	node->sp = sel_open(nodef, node, "Msg System", fcb_handler, MSG, SEL_INPUT);
 	
@@ -901,7 +912,6 @@ main(int argc, char *argv[])
 #ifdef SIGPWR
 	signal(SIGPWR, terminate);
 #endif
-	signal(SIGCLD, reaper);
 	
 	/* init a few things */
 	chain_init(&echobase);