[ekg2-commit] r4239 - trunk/ekg: trunk/ekg/net.c

[SVN commit]

Author: peres
Date: 2008-08-08 17:38:08 +0200 (Fri, 08 Aug 2008)
New Revision: 4239

Modified:
   trunk/ekg/net.c
Log:

Remove s->connecting check.



Modified: trunk/ekg/net.c
===================================================================
--- trunk/ekg/net.c	2008-08-08 15:10:16 UTC (rev 4238)
+++ trunk/ekg/net.c	2008-08-08 15:38:08 UTC (rev 4239)
@@ -373,7 +373,7 @@
 
 	if (!c)
 		return -1;
-	abort = (!((s = session_find(c->session))) || !(s->connecting));
+	abort = !((s = session_find(c->session)));
 
 	if (type) {
 		if (!abort) {
@@ -482,7 +482,7 @@
 		return 0;
 
 	s = session_find(c->session);
-	abort = (!((s = session_find(c->session))) || !(s->connecting));
+	abort = !((s = session_find(c->session)));
 
 	if (abort) {
 		ekg_connect_loop(c);
@@ -513,9 +513,8 @@
 	char *host;
 	session_t *s = session_find(c->session);
 
-	if (!s || !(s->connecting)) { /* session vanished! */
-		debug_error("ekg_connect_loop(), looks like%s session '%s' vanished!\n",
-				s ? " connecting on" : "", c->session);
+	if (!s) { /* session vanished! */
+		debug_error("ekg_connect_loop(), looks like session '%s' vanished!\n", c->session);
 		ekg_connect_data_free(c);
 		return 0;
 	}