X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Fclient.c;h=5ff3401097726493f6a0c7b0533a0698139e336e;hb=refs%2Fheads%2Fnewpc92timings;hp=a04d1bb224edf0597828a3ffef5e0bcb3dcf6cf1;hpb=9bba449d12641232d51d259f470ce6b21205c622;p=spider.git

diff --git a/src/client.c b/src/client.c
index a04d1bb2..5ff34010 100644
--- a/src/client.c
+++ b/src/client.c
@@ -375,12 +375,12 @@ int fcb_handler(sel_t *sp, int in, int out, int err)
 			default:
 				dbg(DBUF,"got errno %d in input", errno);
 				ending++;
-				return 0;
+				return 1;
 			}
 		} else if (r == 0) {
 			dbg(DBUF, "ending normally");
 			ending++;
-			return 0;
+			return 1;
 		}
 
 		dbgdump(DBUF, "in ->", buf, r);
@@ -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")) {
@@ -723,13 +723,9 @@ void process_node()
 void term_timeout(int i)
 {
 	/* none of this is going to be reused so don't bother cleaning up properly */
-	if (in && in->t_set)
-		tcsetattr(0, TCSANOW, &in->t);
-	if (node) {
-		shutdown(node->cnum, 3);
-		close(node->cnum);
-	}
-	exit(i);
+	if (isatty(0))
+		tcflush(0, TCIOFLUSH);
+	kill(getpid(), 9);			/* commit suicide */
 }
 
 void terminate(int i)
@@ -737,16 +733,22 @@ void terminate(int i)
 	signal(SIGALRM, term_timeout);
 	alarm(10);
 	
-	while ((in && !is_chain_empty(in->outq)) ||
-		   (node && !is_chain_empty(node->outq))) {
+	if (node && node->sp->sort) {
+		sel_close(node->sp);
+	}
+	while (in && in->sp->sort && !is_chain_empty(in->outq)) {
 		sel_run();
 	}
+	sel_run();
+	sel_run();
+	sel_run();
+	sel_run();
+	sel_run();
+	sel_run();
+	sel_run();
+	sel_run();
 	if (in && in->t_set)
 		tcsetattr(0, TCSADRAIN, &in->t);
-	if (node) {
-		shutdown(node->cnum, 3);
-		close(node->cnum);
-	}
 	exit(i);
 }
 
@@ -754,10 +756,7 @@ void login_timeout(int i)
 {
 	write(0, "Timed Out", 10);
 	write(0, &nl, 1);
-	sel_run();					/* force a coordination */
-	if (in && in->t_set)
-		tcsetattr(0, TCSANOW, &in->t);
-	exit(i);
+	terminate(0);
 }
 
 /*
@@ -809,9 +808,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 +824,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 +843,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);
 	
@@ -908,8 +918,7 @@ main(int argc, char *argv[])
 	/* connect up stdin */
 	in = fcb_new(0, TEXT);
 	in->sp = sel_open(0, in, "STDIN", fcb_handler, TEXT, SEL_INPUT);
-	if (tcgetattr(0, &in->t) < 0) {
-/*		echo = 0; */
+	if (!isatty(0) || tcgetattr(0, &in->t) < 0) {
 		in->echo = echo;
 		in->t_set = 0;
 	} else {