X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Ffnet-dc.c;h=b34ed3adef9ce82bd5d37430daca627180cf582e;hb=bd5d862e9745b6fb3c67ccb215c0e6aaa65bacf9;hp=8f83123d6f2c6badc9371e162e11f1bae6a62739;hpb=1ff9e8ea002024dee061378ae5871619d6b979dd;p=doldaconnect.git

diff --git a/daemon/fnet-dc.c b/daemon/fnet-dc.c
index 8f83123..b34ed3a 100644
--- a/daemon/fnet-dc.c
+++ b/daemon/fnet-dc.c
@@ -1323,7 +1323,6 @@ static void cmd_connecttome(struct socket *sk, struct fnetnode *fn, char *cmd, c
 {
     char *p;
     struct dchub *hub;
-    struct socket *newsk;
     struct sockaddr_in addr;
     
     hub = fn->data;
@@ -1340,7 +1339,7 @@ static void cmd_connecttome(struct socket *sk, struct fnetnode *fn, char *cmd, c
     addr.sin_port = htons(atoi(p));
     if(!inet_aton(args, &addr.sin_addr))
 	return;
-    newsk = netcsconn((struct sockaddr *)&addr, sizeof(addr), (void (*)(struct socket *, int, void *))peerconnect, fn);
+    putsock(netcsconn((struct sockaddr *)&addr, sizeof(addr), (void (*)(struct socket *, int, void *))peerconnect, fn));
     getfnetnode(fn);
     hubhandleaction(sk, fn, cmd, args);
 }
@@ -1715,6 +1714,7 @@ static void startul(struct dcpeer *peer)
     peer->state = PEER_TRNS;
     transferstartul(peer->transfer, peer->sk);
     peer->sk->writecb = (void (*)(struct socket *, void *))transwrite;
+    transwrite(peer->sk, peer);
 }
 
 static void cmd_filelength(struct socket *sk, struct dcpeer *peer, char *cmd, char *args)
@@ -2689,28 +2689,24 @@ static void dctransgotdata(struct transfer *transfer, struct dcpeer *peer)
 	{
 	    if((buf = sockgetinbuf(peer->trpipe, &bufsize)) != NULL)
 	    {
-		if((transfer->endpos >= 0) && (transfer->curpos + bufsize >= transfer->endpos))
-		    bufsize = transfer->endpos - transfer->curpos;
-		if(bufsize > 0) {
-		    if(peer->compress == CPRS_NONE)
+		if(peer->compress == CPRS_NONE)
+		{
+		    sockqueue(peer->sk, buf, bufsize);
+		} else if(peer->compress == CPRS_ZLIB) {
+		    cstr = peer->cprsdata;
+		    cstr->next_in = buf;
+		    cstr->avail_in = bufsize;
+		    while(cstr->avail_in > 0)
 		    {
-			sockqueue(peer->sk, buf, bufsize);
-		    } else if(peer->compress == CPRS_ZLIB) {
-			cstr = peer->cprsdata;
-			cstr->next_in = buf;
-			cstr->avail_in = bufsize;
-			while(cstr->avail_in > 0)
+			cstr->next_out = outbuf;
+			cstr->avail_out = sizeof(outbuf);
+			if((ret = deflate(cstr, 0)) != Z_OK)
 			{
-			    cstr->next_out = outbuf;
-			    cstr->avail_out = sizeof(outbuf);
-			    if((ret = deflate(cstr, 0)) != Z_OK)
-			    {
-				flog(LOG_WARNING, "bug? deflate() did not return Z_OK (but rather %i)", ret);
-				freedcpeer(peer);
-				return;
-			    }
-			    sockqueue(peer->sk, outbuf, sizeof(outbuf) - cstr->avail_out);
+			    flog(LOG_WARNING, "bug? deflate() did not return Z_OK (but rather %i)", ret);
+			    freedcpeer(peer);
+			    return;
 			}
+			sockqueue(peer->sk, outbuf, sizeof(outbuf) - cstr->avail_out);
 		    }
 		}
 		free(buf);
@@ -2754,34 +2750,6 @@ static void dctransgotdata(struct transfer *transfer, struct dcpeer *peer)
     }
 }
 
-void trpiperead(struct socket *sk, struct dcpeer *peer)
-{
-    dctransgotdata(peer->transfer, peer);
-}
-
-void trpipewrite(struct socket *sk, struct dcpeer *peer)
-{
-}
-
-void trpipeerr(struct socket *sk, int errno, struct dcpeer *peer)
-{
-    peer->state = PEER_SYNC;
-    dctransgotdata(peer->transfer, peer);
-    CBUNREG(peer->transfer, trans_filterout, peer);
-}
-
-static struct socket *mktrpipe(struct dcpeer *peer)
-{
-    struct socket *sk;
-    
-    sk = netsockpipe();
-    sk->data = peer;
-    sk->readcb = (void (*)(struct socket *, void *))trpiperead;
-    sk->writecb = (void (*)(struct socket *, void *))trpipewrite;
-    sk->errcb = (void (*)(struct socket *, int, void *))trpipeerr;
-    return(sk);
-}
-
 static void transread(struct socket *sk, struct dcpeer *peer)
 {
     void *buf;
@@ -2789,20 +2757,23 @@ static void transread(struct socket *sk, struct dcpeer *peer)
     
     if(sockqueueleft(peer->trpipe) < 0)
 	return;
-    if((buf = sockgetinbuf(sk, &bufsize)) == NULL)
-	return;
-    if(peer->transfer == NULL)
+    if((buf = sockgetinbuf(sk, &bufsize)) != NULL)
     {
+	if(peer->transfer == NULL)
+	{
+	    free(buf);
+	    freedcpeer(peer);
+	    return;
+	}
+	sockqueue(peer->trpipe, buf, bufsize);
 	free(buf);
-	freedcpeer(peer);
-	return;
     }
-    sockqueue(peer->trpipe, buf, bufsize);
-    free(buf);
     if(peer->transfer->curpos >= peer->transfer->size)
     {
 	closesock(peer->trpipe);
 	quitsock(peer->trpipe);
+	peer->trpipe = NULL;
+	peer->transfer = NULL;
 	peer->close = 1;
 	return;
     }
@@ -2819,6 +2790,8 @@ static void transerr(struct socket *sk, int err, struct dcpeer *peer)
     }
     closesock(peer->trpipe);
     quitsock(peer->trpipe);
+    peer->trpipe = NULL;
+    peer->transfer = NULL;
     peer->close = 1;
 }
 
@@ -2834,6 +2807,36 @@ static void transwrite(struct socket *sk, struct dcpeer *peer)
     dctransgotdata(peer->transfer, peer);
 }
 
+static void trpiperead(struct socket *sk, struct dcpeer *peer)
+{
+    dctransgotdata(peer->transfer, peer);
+}
+
+static void trpipewrite(struct socket *sk, struct dcpeer *peer)
+{
+    transread(peer->sk, peer);
+}
+
+static void trpipeerr(struct socket *sk, int errno, struct dcpeer *peer)
+{
+    peer->state = PEER_SYNC;
+    dctransgotdata(peer->transfer, peer);
+    CBUNREG(peer->transfer, trans_filterout, peer);
+}
+
+static struct socket *mktrpipe(struct dcpeer *peer)
+{
+    struct socket *sk;
+    
+    sk = netsockpipe();
+    socksetdebug(sk, 2, "trpipe");
+    sk->data = peer;
+    sk->readcb = (void (*)(struct socket *, void *))trpiperead;
+    sk->writecb = (void (*)(struct socket *, void *))trpipewrite;
+    sk->errcb = (void (*)(struct socket *, int, void *))trpipeerr;
+    return(sk);
+}
+
 static void udpread(struct socket *sk, void *data)
 {
     char *buf, *p, *p2, *hashbuf;
@@ -3111,6 +3114,7 @@ static struct dcpeer *newdcpeer(struct socket *sk)
     new = smalloc(sizeof(*new));
     memset(new, 0, sizeof(*new));
     new->transfer = NULL;
+    socksetdebug(sk, 2, "peersock");
     getsock(sk);
     new->sk = sk;
     if(confgetint("dc", "dcppemu"))
@@ -3248,6 +3252,9 @@ static void peerread(struct socket *sk, struct dcpeer *peer)
     if(peer->state == PEER_CMD) {
 	if((peer->queue.size > 50) || (peer->inbufdata > 65536))
 	    return;
+    } else if(peer->state == PEER_TTHL) {
+    } else {
+	return;
     }
     if((newbuf = sockgetinbuf(sk, &datalen)) == NULL)
 	return;