X-Git-Url: http://dolda2000.com/gitweb/?p=doldaconnect.git;a=blobdiff_plain;f=daemon%2Ffnet-dc.c;h=fd7a79d249bc7e172ab186e80b239afae62cf2c4;hp=ebfea28d830ecb119510c6214f205cd654662ad2;hb=4e564b59c7c565387c4907017dfacce2ef761f8a;hpb=f945525047ca6dff44f4eb947d0238e259a436e8

diff --git a/daemon/fnet-dc.c b/daemon/fnet-dc.c
index ebfea28..fd7a79d 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,9 +140,8 @@ struct dcpeer
 };
 
 static struct fnet dcnet;
-static struct transferiface dctransfer;
 static struct socket *udpsock = NULL;
-static struct socket *tcpsock = NULL;
+static struct lport *tcpsock = NULL;
 static struct dcpeer *peers = NULL;
 int numdcpeers = 0;
 static struct dcexppeer *expected = 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);
@@ -160,6 +161,7 @@ static void updatexmllist(void);
 static void updatexmlbz2list(void);
 static void requestfile(struct dcpeer *peer);
 static void updatelists(int now);
+static int trdestroycb(struct transfer *transfer, struct dcpeer *peer);
 
 static int reservedchar(unsigned char c)
 {
@@ -737,7 +739,6 @@ static void requestfile(struct dcpeer *peer)
 	    peer->close = 1;
 	    return;
 	}
-	CBREG(peer->transfer, trans_filterout, (int (*)(struct transfer *, wchar_t *, wchar_t *, void *))trresumecb, NULL, peer);
 	return;
     }
     if(supports(peer, "adcget"))
@@ -871,7 +872,7 @@ static void cmd_hubname(struct socket *sk, struct fnetnode *fn, char *cmd, char
     struct dchub *hub;
     
     hub = fn->data;
-    if(hub->nativename == NULL)
+    if(hub->nativename != NULL)
 	free(hub->nativename);
     hub->nativename = sstrdup(args);
     buf = icmbstowcs(args, hub->charset);
@@ -1145,7 +1146,7 @@ static void cmd_search(struct socket *sk, struct fnetnode *fn, char *cmd, char *
 	    goto out;
 	prefix = sprintf2("$SR %s ", hub->nativenick);
 	infix = sprintf2(" %i/%i\005", slotsleft(), confgetint("transfer", "slots"));
-	postfix = sprintf2(" (%s)\005%s|", formataddress(hub->sk->remote, hub->sk->remotelen), args + 4);
+	postfix = sprintf2(" (%s)\005%s|", formatsockpeer(hub->sk), args + 4);
 	dsk = sk;
 	getsock(dsk);
     } else {
@@ -1158,8 +1159,8 @@ static void cmd_search(struct socket *sk, struct fnetnode *fn, char *cmd, char *
 	addr.sin_port = htons(atoi(p2));
 	prefix = sprintf2("$SR %s ", hub->nativenick);
 	infix = sprintf2(" %i/%i\005", slotsleft(), confgetint("transfer", "slots"));
-	postfix = sprintf2(" (%s)|", formataddress(hub->sk->remote, hub->sk->remotelen));
-	netdgramconn(dsk = netdupsock(udpsock), (struct sockaddr *)&addr, sizeof(addr));
+	postfix = sprintf2(" (%s)|", formatsockpeer(hub->sk));
+	dsk = netdgramconn(udpsock, (struct sockaddr *)&addr, sizeof(addr));
     }
     
     minsize = maxsize = -1;
@@ -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(sockgetremotename2(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));
@@ -1586,6 +1586,13 @@ static void cmd_mynick(struct socket *sk, struct dcpeer *peer, char *cmd, char *
     }
 }
 
+static void peerattach(struct dcpeer *peer, struct transfer *transfer)
+{
+    peer->transfer = transfer;
+    CBREG(peer->transfer, trans_filterout, (int (*)(struct transfer *, wchar_t *, wchar_t *, void *))trresumecb, NULL, peer);
+    CBREG(peer->transfer, trans_destroy, (int (*)(struct transfer *, void *))trdestroycb, NULL, peer);
+}
+
 static void cmd_direction(struct socket *sk, struct dcpeer *peer, char *cmd, char *args)
 {
     char *p;
@@ -1622,18 +1629,18 @@ 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);
-	peer->transfer = transfer;
+	peerattach(peer, transfer);
 	if(peer->extended)
 	    sendsupports(peer);
 	qstrf(sk, "$Direction %s %i|", (peer->direction == TRNSD_UP)?"Upload":"Download", rand() % 10000);
@@ -1674,14 +1681,14 @@ 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);
-	peer->transfer = transfer;
+	peerattach(peer, transfer);
 	qstrf(sk, "$Direction %s %i|", (peer->direction == TRNSD_UP)?"Upload":"Download", rand() % 10000);
 	qstrf(sk, "$Key %s|", key);
 	free(key);
@@ -1714,6 +1721,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)
@@ -2117,6 +2125,7 @@ static void cmd_adcget(struct socket *sk, struct dcpeer *peer, char *cmd, char *
     } else if(fd >= 0) {
 	if((wbuf = adc2path(argv[1])) != NULL)
 	    transfersetpath(peer->transfer, wbuf);
+	free(wbuf);
 	peer->transfer->flags.b.minislot = 1;
     }
     if(fd < 0)
@@ -2294,7 +2303,6 @@ static void cmd_adcsnd(struct socket *sk, struct dcpeer *peer, char *cmd, char *
 	{
 	    sockpushdata(sk, peer->inbuf, peer->inbufdata);
 	    peer->inbufdata = 0;
-	    transread(sk, peer);
 	}
     } else {
 	/* We certainly didn't request this...*/
@@ -2327,7 +2335,6 @@ static void cmd_sending(struct socket *sk, struct dcpeer *peer, char *cmd, char
     {
 	sockpushdata(sk, peer->inbuf, peer->inbufdata);
 	peer->inbufdata = 0;
-	transread(sk, peer);
     }
 }
 
@@ -2422,9 +2429,9 @@ static int hubsendchat(struct fnetnode *fn, int public, wchar_t *to, wchar_t *st
     return(0);
 }
 
-static void findsizelimit(struct sexpr *sexpr, int *min, int *max)
+static void findsizelimit(struct sexpr *sexpr, off_t *min, off_t *max)
 {
-    int minl, maxl, minr, maxr, retmin, retmax;
+    off_t minl, maxl, minr, maxr, retmin, retmax;
     
     switch(sexpr->op)
     {
@@ -2468,14 +2475,14 @@ static void findsizelimit(struct sexpr *sexpr, int *min, int *max)
 	}
     case SOP_SIZELT:
 	retmin = 0;
-	retmax = sexpr->d.n - 1;
+	retmax = sexpr->d.sz - 1;
 	break;
     case SOP_SIZEEQ:
-	retmin = sexpr->d.n;
-	retmax = sexpr->d.n;
+	retmin = sexpr->d.sz;
+	retmax = sexpr->d.sz;
 	break;
     case SOP_SIZEGT:
-	retmin = sexpr->d.n + 1;
+	retmin = sexpr->d.sz + 1;
 	retmax = -1;
 	break;
     default:
@@ -2526,7 +2533,7 @@ static int hubsearch(struct fnetnode *fn, struct search *srch, struct srchfnnlis
     size_t sstrsize, sstrdata;
     struct sockaddr *name;
     socklen_t namelen;
-    int minsize, maxsize;
+    off_t minsize, maxsize;
     struct hash *hash;
     
     hub = fn->data;
@@ -2559,10 +2566,10 @@ static int hubsearch(struct fnetnode *fn, struct search *srch, struct srchfnnlis
 	if(minsize != 0)
 	{
 	    sizebuf2(sstr, sstrdata + 32, 1);
-	    sstrdata += snprintf(sstr + sstrdata, sstrsize - sstrdata, "T?F?%i?1?", minsize);
+	    sstrdata += snprintf(sstr + sstrdata, sstrsize - sstrdata, "T?F?%ji?1?", (intmax_t)minsize);
 	} else if(maxsize != -1) {
 	    sizebuf2(sstr, sstrdata + 32, 1);
-	    sstrdata += snprintf(sstr + sstrdata, sstrsize - sstrdata, "T?T?%i?1?", maxsize);
+	    sstrdata += snprintf(sstr + sstrdata, sstrsize - sstrdata, "T?T?%ji?1?", (intmax_t)maxsize);
 	} else {
 	    bufcat(sstr, "F?F?0?1?", 8);
 	}
@@ -2676,13 +2683,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;
@@ -2693,9 +2693,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)
 		{
@@ -2742,7 +2742,7 @@ static void dctransgotdata(struct transfer *transfer, struct dcpeer *peer)
 		}
 		if(peer->ptclose)
 		{
-		    freedcpeer(peer);
+		    peer->close = 1;
 		} else {
 		    if(peer->timeout == NULL)
 			peer->timeout = timercallback(ntime() + 180, (void (*)(int, void *))peertimeout, peer);
@@ -2758,43 +2758,52 @@ static void dctransgotdata(struct transfer *transfer, struct dcpeer *peer)
     }
 }
 
-static void dctransendofdata(struct transfer *transfer, struct dcpeer *peer)
+static void peerdetach(struct dcpeer *peer)
 {
-    peer->state = PEER_SYNC;
-    dctransgotdata(transfer, peer);
+    CBUNREG(peer->transfer, trans_filterout, peer);
+    CBUNREG(peer->transfer, trans_destroy, peer);
+    peer->trpipe->pnext = NULL;
+    closesock(peer->trpipe);
+    quitsock(peer->trpipe);
+    peer->trpipe = NULL;
+    peer->transfer = NULL;
 }
 
-static void dcwantdata(struct transfer *transfer, struct dcpeer *peer)
+static int trdestroycb(struct transfer *transfer, struct dcpeer *peer)
 {
-    if(transferdatasize(transfer) < 65536)
-	peer->sk->ignread = 0;
+    peerdetach(peer);
+    peer->close = 1;
+    return(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(peer->transfer == NULL) {
+	freedcpeer(peer);
 	return;
-    if(peer->transfer == NULL)
+    }
+    if(sockqueueleft(peer->trpipe) < 0)
+	return;
+    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);
+	peerdetach(peer);
+	peer->close = 1;
 	return;
     }
-    if(transferdatasize(peer->transfer) > 65535)
-	sk->ignread = 1;
 }
 
 static void transerr(struct socket *sk, int err, struct dcpeer *peer)
@@ -2806,8 +2815,8 @@ static void transerr(struct socket *sk, int err, struct dcpeer *peer)
 	freedcpeer(peer);
 	return;
     }
-    transferdetach(transfer);
-    transferendofdata(transfer);
+    peerdetach(peer);
+    peer->close = 1;
 }
 
 static void transwrite(struct socket *sk, struct dcpeer *peer)
@@ -2820,6 +2829,39 @@ static void transwrite(struct socket *sk, struct dcpeer *peer)
 	return;
     }
     dctransgotdata(peer->transfer, peer);
+    sockread(peer->trpipe);
+}
+
+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);
+    peerdetach(peer);
+    if(peer->state != PEER_CMD)
+	peer->close = 1;
+}
+
+static struct socket *mktrpipe(struct dcpeer *peer)
+{
+    struct socket *sk;
+    
+    sk = netsockpipe();
+    sk->pnext = peer->sk;
+    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)
@@ -2828,6 +2870,7 @@ static void udpread(struct socket *sk, void *data)
     size_t buflen, hashlen;
     char *nick, *filename, *hubname;
     struct sockaddr_in hubaddr;
+    struct sockaddr *addrbuf;
     off_t size;
     int slots;
     struct fnetnode *fn, *myfn;
@@ -2947,13 +2990,15 @@ static void udpread(struct socket *sk, void *data)
 	{
 	    for(fn = fnetnodes; fn != NULL; fn = fn->next)
 	    {
-		if((fn->fnet == &dcnet) && ((hub = fn->data) != NULL))
+		if((fn->fnet == &dcnet) && ((hub = fn->data) != NULL) && !sockpeeraddr(hub->sk, &addrbuf, NULL))
 		{
-		    if((hub->sk != NULL) && addreq(hub->sk->remote, (struct sockaddr *)&hubaddr))
+		    if((hub->sk != NULL) && addreq(addrbuf, (struct sockaddr *)&hubaddr))
 		    {
 			myfn = fn;
+			free(addrbuf);
 			break;
 		    }
+		    free(addrbuf);
 		}
 	    }
 	}
@@ -2992,6 +3037,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 +3062,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)
-	sk->ignread = 1;
 }
 
 static void huberr(struct socket *sk, int err, struct fnetnode *fn)
@@ -3095,7 +3140,6 @@ static struct dcpeer *newdcpeer(struct socket *sk)
     
     new = smalloc(sizeof(*new));
     memset(new, 0, sizeof(*new));
-    new->transfer = NULL;
     getsock(sk);
     new->sk = sk;
     if(confgetint("dc", "dcppemu"))
@@ -3121,12 +3165,7 @@ static void freedcpeer(struct dcpeer *peer)
     if(peer->prev != NULL)
 	peer->prev->next = peer->next;
     if(peer->transfer != NULL)
-    {
-	if(peer->transfer->dir == TRNSD_UP)
-	    peer->transfer->close = 1;
-	if(peer->transfer->dir == TRNSD_DOWN)
-	    resettransfer(peer->transfer);
-    }
+	peerdetach(peer);
     if(peer->timeout != NULL)
 	canceltimer(peer->timeout);
     if(peer->sk->data == peer)
@@ -3179,7 +3218,7 @@ static void hubdestroy(struct fnetnode *fn)
     struct qcommand *qcmd;
     
     hub = (struct dchub *)fn->data;
-    putsock(hub->sk);
+    quitsock(hub->sk);
     while((qcmd = ulqcmd(&hub->queue)) != NULL)
 	freeqcmd(qcmd);
     if(hub->supports != NULL)
@@ -3204,17 +3243,9 @@ static void hubkill(struct fnetnode *fn)
     struct dchub *hub;
     
     hub = (struct dchub *)fn->data;
-    hub->sk->close = 1;
+    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 +3264,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 +3296,11 @@ static void peerread(struct socket *sk, struct dcpeer *peer)
 	    {
 		peer->state = PEER_STOP;
 		break;
-	    } else {
-		if(peer->queue.size > 50)
-		    sk->ignread = 1;
 	    }
 	}
     } else if(peer->state == PEER_TTHL) {
 	handletthl(peer);
     }
-    if(peer->inbufdata > 500000)
-	sk->ignread = 1;
 }
 
 static void peererror(struct socket *sk, int err, struct dcpeer *peer)
@@ -3283,7 +3316,6 @@ static void peerconnect(struct socket *sk, int err, struct fnetnode *fn)
     if(err != 0)
     {
 	putfnetnode(fn);
-	putsock(sk);
 	return;
     }
     hub = fn->data;
@@ -3295,13 +3327,12 @@ 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);
 }
 
-static void peeraccept(struct socket *sk, struct socket *newsk, void *data)
+static void peeraccept(struct lport *lp, struct socket *newsk, void *data)
 {
     struct dcpeer *peer;
     
@@ -3321,6 +3352,7 @@ static void updatehmlist(void)
     char *buf, *buf2, numbuf[32];
     size_t bufsize, bufdata;
     int fd, ibuf;
+    FILE *out;
     
     bufdata = 0;
     buf = smalloc(bufsize = 65536);
@@ -3378,27 +3410,28 @@ static void updatehmlist(void)
 	free(hmlistname);
 	hmlistname = NULL;
     } else {
+	out = fdopen(fd, "w");
 	/*
 	 * I do not want to implement a good Huffman encoder, and it's not
 	 * like Huffman encoding actually yields any impressive results
 	 * for DC file lists anyway, so I'll just output a bogus
 	 * tree. Implement a good encoder if you want to.
 	 */
-	write(fd, "HE3\r\0", 5);
-	write(fd, &bufdata, 4);
+	fwrite("HE3\r\0", 1, 5, out);
+	fwrite(&bufdata, 4, 1, out); /* XXX: Endian unsafe */
 	ibuf = 256;
-	write(fd, &ibuf, 2);
+	fwrite(&ibuf, 2, 1, out);
 	ibuf = 8;
 	for(i = 0; i < 256; i++)
 	{
-	    write(fd, &i, 1);
-	    write(fd, &ibuf, 1);
+	    fwrite(&i, 1, 1, out);
+	    fwrite(&ibuf, 1, 1, out);
 	}
 	for(i = 0; i < 256; i++)
-	    write(fd, &i, 1);
+	    fwrite(&i, 1, 1, out);
 	for(buf2 = buf; bufdata > 0;)
 	{
-	    if((ret = write(fd, buf2, bufdata)) < 0)
+	    if((ret = fwrite(buf2, 1, bufdata, out)) < 0)
 	    {
 		flog(LOG_WARNING, "could not write file list: %s", strerror(errno));
 		break;
@@ -3406,7 +3439,7 @@ static void updatehmlist(void)
 	    bufdata -= ret;
 	    buf2 += ret;
 	}
-	close(fd);
+	fclose(out);
     }
     free(buf);
 }
@@ -3769,7 +3802,7 @@ static int run(void)
 	    quota--;
 	}
 	if(hub->queue.size < 1000)
-	    hub->sk->ignread = 0;
+	    hubread(hub->sk, fn);
 	if(quota < 1)
 	    break;
     }
@@ -3788,7 +3821,7 @@ static int run(void)
 	    quota--;
 	}
 	if((peer->queue.size < 50) && (peer->inbufdata < 500000))
-	    peer->sk->ignread = 0;
+	    peerread(peer->sk, peer);
 	if(quota < 1)
 	    break;
     }
@@ -3831,7 +3864,7 @@ static int updateudpport(struct configvar *var, void *uudata)
 static int updatetcpport(struct configvar *var, void *uudata)
 {
     struct sockaddr_in addr;
-    struct socket *newsock;
+    struct lport *newsock;
     
     memset(&addr, 0, sizeof(addr));
     addr.sin_family = AF_INET;
@@ -3839,7 +3872,7 @@ static int updatetcpport(struct configvar *var, void *uudata)
     if((newsock = netcslisten(SOCK_STREAM, (struct sockaddr *)&addr, sizeof(addr), peeraccept, NULL)) == NULL)
 	flog(LOG_INFO, "could not listen to a remote address, going into passive mode");
     if(tcpsock != NULL)
-	putsock(tcpsock);
+	closelport(tcpsock);
     tcpsock = newsock;
     return(0);
 }
@@ -3854,7 +3887,7 @@ static int init(int hup)
 	if(udpsock != NULL)
 	    putsock(udpsock);
 	if(tcpsock != NULL)
-	    putsock(tcpsock);
+	    closelport(tcpsock);
 	addr.sin_family = AF_INET;
 	memset(&addr.sin_addr, 0, sizeof(addr.sin_addr));
 	addr.sin_port = htons(confgetint("dc", "udpport"));