X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Ffilenet.c;h=be6c5affb86292b58eaa592381ebe4967e938ad9;hb=cab0b442977697b876127cda082b1262ece2714b;hp=99e094a618b994efa32de8308b21649357e66b82;hpb=049aedb6ec90e163d2e0cc51ab66f65d18700a86;p=doldaconnect.git

diff --git a/daemon/filenet.c b/daemon/filenet.c
index 99e094a..be6c5af 100644
--- a/daemon/filenet.c
+++ b/daemon/filenet.c
@@ -67,18 +67,22 @@ void killfnetnode(struct fnetnode *fn)
     if(fn->sk != NULL)
     {
 	fn->sk->close = 1;
+	if(fn->sk->data == fn)
+	{
+	    fn->sk->data = NULL;
+	    putfnetnode(fn);
+	}
 	putsock(fn->sk);
 	fn->sk = NULL;
     }
 }
 
-struct fnetnode *getfnetnode(struct fnetnode *fn)
+void getfnetnode(struct fnetnode *fn)
 {
     fn->refcount++;
 #ifdef DEBUG
     fprintf(stderr, "getfnetnode on id %i at %p, refcount=%i\n", fn->id, fn, fn->refcount);
 #endif
-    return(fn);
 }
 
 void putfnetnode(struct fnetnode *fn)
@@ -159,20 +163,19 @@ void unlinkfnetnode(struct fnetnode *fn)
     putfnetnode(fn);
 }
 
-static int conncb(struct socket *sk, int err, struct fnetnode *data)
+static void conncb(struct socket *sk, int err, struct fnetnode *data)
 {
     if(err != 0)
     {
 	killfnetnode(data);
 	putfnetnode(data);
-	return(1);
+	return;
     }
     data->sk = sk;
     fnetsetstate(data, FNN_HS);
     socksettos(sk, confgetint("fnet", "fntos"));
     data->fnet->connect(data);
     putfnetnode(data);
-    return(1);
 }
 
 static void resolvecb(struct sockaddr *addr, int addrlen, struct fnetnode *data)
@@ -182,7 +185,7 @@ static void resolvecb(struct sockaddr *addr, int addrlen, struct fnetnode *data)
 	killfnetnode(data);
 	putfnetnode(data);
     } else {
-	netcsconn(addr, addrlen, (int (*)(struct socket *, int, void *))conncb, data);
+	netcsconn(addr, addrlen, (void (*)(struct socket *, int, void *))conncb, data);
     }
 }