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

diff --git a/daemon/fnet-dc.c b/daemon/fnet-dc.c
index 58340b4..b34ed3a 100644
--- a/daemon/fnet-dc.c
+++ b/daemon/fnet-dc.c
@@ -122,6 +122,7 @@ struct dcpeer
     struct timer *timeout;
     struct qcmdqueue queue;
     struct transfer *transfer;
+    struct socket *trpipe;
     int state;
     int ptclose;      /* Close after transfer is complete */
     int accepted;     /* If false, we connected, otherwise, we accepted */
@@ -139,7 +140,6 @@ struct dcpeer
 };
 
 static struct fnet dcnet;
-static struct transferiface dctransfer;
 static struct socket *udpsock = NULL;
 static struct lport *tcpsock = NULL;
 static struct dcpeer *peers = NULL;
@@ -150,6 +150,7 @@ static char *xmllistname = NULL;
 static char *xmlbz2listname = NULL;
 static struct timer *listwritetimer = NULL;
 
+static struct socket *mktrpipe(struct dcpeer *peer);
 static void peerconnect(struct socket *sk, int err, struct fnetnode *fn);
 static void freedcpeer(struct dcpeer *peer);
 static void transread(struct socket *sk, struct dcpeer *peer);
@@ -1322,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;
@@ -1339,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);
 }
@@ -1351,7 +1351,7 @@ static void sendctm(struct socket *sk, char *nick)
     
     if(tcpsock == NULL)
 	return;
-    if(getremotename2(tcpsock, sk, &addr, &addrlen) < 0)
+    if(lstgetremotename2(tcpsock, sk, &addr, &addrlen) < 0)
 	return;
     if(addr->sa_family == AF_INET)
 	qstrf(sk, "$ConnectToMe %s %s|", nick, formataddress(addr, addrlen));
@@ -1622,14 +1622,14 @@ static void cmd_direction(struct socket *sk, struct dcpeer *peer, char *cmd, cha
 		peer->close = 1;
 		return;
 	    }
-	    transfer = newupload(peer->fn, &dcnet, peer->wcsname, &dctransfer, peer);
+	    transfer = newupload(peer->fn, &dcnet, peer->wcsname, (peer->trpipe = mktrpipe(peer))->back);
 	} else {
 	    if((transfer = finddownload(peer->wcsname)) == NULL)
 	    {
 		peer->close = 1;
 		return;
 	    }
-	    transferattach(transfer, &dctransfer, peer);
+	    transferattach(transfer, (peer->trpipe = mktrpipe(peer))->back);
 	    transfersetstate(transfer, TRNS_HS);
 	}
 	transfersetnick(transfer, peer->wcsname);
@@ -1674,10 +1674,10 @@ static void cmd_peerlock(struct socket *sk, struct dcpeer *peer, char *cmd, char
 		return;
 	    }
 	    peer->direction = TRNSD_UP;
-	    transfer = newupload(peer->fn, &dcnet, peer->wcsname, &dctransfer, peer);
+	    transfer = newupload(peer->fn, &dcnet, peer->wcsname, (peer->trpipe = mktrpipe(peer))->back);
 	} else {
 	    peer->direction = TRNSD_DOWN;
-	    transferattach(transfer, &dctransfer, peer);
+	    transferattach(transfer, (peer->trpipe = mktrpipe(peer))->back);
 	    transfersetstate(transfer, TRNS_HS);
 	}
 	transfersetnick(transfer, peer->wcsname);
@@ -1714,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)
@@ -2674,13 +2675,6 @@ static struct command peercmds[] =
 };
 #undef cc
 
-static void dctransdetach(struct transfer *transfer, struct dcpeer *peer)
-{
-    CBUNREG(transfer, trans_filterout, peer);
-    peer->transfer = NULL;
-    peer->close = 1;
-}
-
 static void dctransgotdata(struct transfer *transfer, struct dcpeer *peer)
 {
     int ret;
@@ -2691,9 +2685,9 @@ static void dctransgotdata(struct transfer *transfer, struct dcpeer *peer)
     
     if((peer->state == PEER_TRNS) || (peer->state == PEER_SYNC))
     {
-	if(sockqueuesize(peer->sk) < 65536)
+	if(sockqueueleft(peer->sk) > 0)
 	{
-	    if((buf = transfergetdata(transfer, &bufsize)) != NULL)
+	    if((buf = sockgetinbuf(peer->trpipe, &bufsize)) != NULL)
 	    {
 		if(peer->compress == CPRS_NONE)
 		{
@@ -2756,43 +2750,33 @@ static void dctransgotdata(struct transfer *transfer, struct dcpeer *peer)
     }
 }
 
-static void dctransendofdata(struct transfer *transfer, struct dcpeer *peer)
-{
-    peer->state = PEER_SYNC;
-    dctransgotdata(transfer, peer);
-}
-
-static void dcwantdata(struct transfer *transfer, struct dcpeer *peer)
-{
-    if(transferdatasize(transfer) < 65536)
-	sockblock(peer->sk, 0);
-}
-
 static void transread(struct socket *sk, struct dcpeer *peer)
 {
     void *buf;
     size_t bufsize;
-    struct transfer *transfer;
     
-    if((buf = sockgetinbuf(sk, &bufsize)) == NULL)
+    if(sockqueueleft(peer->trpipe) < 0)
 	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;
     }
-    transferputdata(peer->transfer, buf, bufsize);
-    free(buf);
     if(peer->transfer->curpos >= peer->transfer->size)
     {
-	transfer = peer->transfer;
-	transferdetach(transfer);
-	transferendofdata(transfer);
+	closesock(peer->trpipe);
+	quitsock(peer->trpipe);
+	peer->trpipe = NULL;
+	peer->transfer = NULL;
+	peer->close = 1;
 	return;
     }
-    if(transferdatasize(peer->transfer) > 65535)
-	sockblock(sk, 1);
 }
 
 static void transerr(struct socket *sk, int err, struct dcpeer *peer)
@@ -2804,8 +2788,11 @@ static void transerr(struct socket *sk, int err, struct dcpeer *peer)
 	freedcpeer(peer);
 	return;
     }
-    transferdetach(transfer);
-    transferendofdata(transfer);
+    closesock(peer->trpipe);
+    quitsock(peer->trpipe);
+    peer->trpipe = NULL;
+    peer->transfer = NULL;
+    peer->close = 1;
 }
 
 static void transwrite(struct socket *sk, struct dcpeer *peer)
@@ -2820,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;
@@ -2951,6 +2968,7 @@ static void udpread(struct socket *sk, void *data)
 		    if((hub->sk != NULL) && addreq(addrbuf, (struct sockaddr *)&hubaddr))
 		    {
 			myfn = fn;
+			free(addrbuf);
 			break;
 		    }
 		    free(addrbuf);
@@ -2992,6 +3010,8 @@ static void hubread(struct socket *sk, struct fnetnode *fn)
     char *p, *p2;
     
     hub = (struct dchub *)fn->data;
+    if(hub->queue.size > 1000)
+	return;
     if((newbuf = sockgetinbuf(sk, &datalen)) == NULL)
 	return;
     if(hub->inbufdata > 500000) /* Discard possible malicious data */
@@ -3015,8 +3035,6 @@ static void hubread(struct socket *sk, struct fnetnode *fn)
 	p = p2;
     }
     memmove(hub->inbuf, p, hub->inbufdata -= p - hub->inbuf);
-    if(hub->queue.size > 1000)
-	sockblock(sk, 1);
 }
 
 static void huberr(struct socket *sk, int err, struct fnetnode *fn)
@@ -3096,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"))
@@ -3120,8 +3139,13 @@ static void freedcpeer(struct dcpeer *peer)
 	peer->next->prev = peer->prev;
     if(peer->prev != NULL)
 	peer->prev->next = peer->next;
+    if(peer->trpipe != NULL) {
+	closesock(peer->trpipe);
+	quitsock(peer->trpipe);
+    }
     if(peer->transfer != NULL)
     {
+	CBUNREG(peer->transfer, trans_filterout, peer);
 	if(peer->transfer->dir == TRNSD_UP)
 	    peer->transfer->close = 1;
 	if(peer->transfer->dir == TRNSD_DOWN)
@@ -3207,14 +3231,6 @@ static void hubkill(struct fnetnode *fn)
     closesock(hub->sk);
 }
 
-static struct transferiface dctransfer =
-{
-    .detach = (void (*)(struct transfer *, void *))dctransdetach,
-    .gotdata = (void (*)(struct transfer *, void *))dctransgotdata,
-    .endofdata = (void (*)(struct transfer *, void *))dctransendofdata,
-    .wantdata = (void (*)(struct transfer *, void *))dcwantdata
-};
-
 static struct fnet dcnet =
 {
     .name = L"dc",
@@ -3233,6 +3249,13 @@ static void peerread(struct socket *sk, struct dcpeer *peer)
     size_t datalen, cnlen;
     struct command *cmd;
 
+    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;
     sizebuf2(peer->inbuf, peer->inbufdata + datalen, 1);
@@ -3258,16 +3281,11 @@ static void peerread(struct socket *sk, struct dcpeer *peer)
 	    {
 		peer->state = PEER_STOP;
 		break;
-	    } else {
-		if(peer->queue.size > 50)
-		    sockblock(sk, 1);
 	    }
 	}
     } else if(peer->state == PEER_TTHL) {
 	handletthl(peer);
     }
-    if(peer->inbufdata > 500000)
-	sockblock(sk, 1);
 }
 
 static void peererror(struct socket *sk, int err, struct dcpeer *peer)
@@ -3283,7 +3301,6 @@ static void peerconnect(struct socket *sk, int err, struct fnetnode *fn)
     if(err != 0)
     {
 	putfnetnode(fn);
-	putsock(sk);
 	return;
     }
     hub = fn->data;
@@ -3295,7 +3312,6 @@ static void peerconnect(struct socket *sk, int err, struct fnetnode *fn)
     sk->errcb = (void (*)(struct socket *, int, void *))peererror;
     sk->data = peer;
     socksettos(sk, confgetint("fnet", "fnptos"));
-    putsock(sk);
     peer->timeout = timercallback(ntime() + 180, (void (*)(int, void *))peertimeout, peer);
     sendmynick(peer);
     sendpeerlock(peer);
@@ -3771,7 +3787,7 @@ static int run(void)
 	    quota--;
 	}
 	if(hub->queue.size < 1000)
-	    sockblock(hub->sk, 0);
+	    hubread(hub->sk, fn);
 	if(quota < 1)
 	    break;
     }
@@ -3790,7 +3806,7 @@ static int run(void)
 	    quota--;
 	}
 	if((peer->queue.size < 50) && (peer->inbufdata < 500000))
-	    sockblock(peer->sk, 0);
+	    peerread(peer->sk, peer);
 	if(quota < 1)
 	    break;
     }