X-Git-Url: http://dolda2000.com/gitweb/?p=doldaconnect.git;a=blobdiff_plain;f=daemon%2Ffnet-dc.c;h=36e42972d1432d760ed663b2a872713405dce524;hp=f03458ffcdedd1b3de3bed141269593a061c030e;hb=d5b1f8590f16f19cd1a94eb2affc850ec2d42fa4;hpb=0e227c1d9f08cee2f7ac474c185d36db7b8097d0 diff --git a/daemon/fnet-dc.c b/daemon/fnet-dc.c index f03458f..36e4297 100644 --- a/daemon/fnet-dc.c +++ b/daemon/fnet-dc.c @@ -30,6 +30,7 @@ #include #include #include +#include #ifdef HAVE_CONFIG_H #include @@ -59,24 +60,6 @@ * considering it was developed without i18n support under Windows */ #define DCCHARSET "windows-1252" -#ifdef DCPP_MASQUERADE -/* - * I honestly don't want to pretend being a client that I'm not, but - * there are so many hubs that simply do not accept any clients - * outside their whitelists, for no obvious reasons, so I feel that I - * am left with little choice. Anyhow, as long as I actually support - * all the features that my faked DC++ version does, there should be - * very little harm done. - */ -#define DCIDTAG "++" -#define DCIDTAGV "0.674" -#define DCIDFULL "DC++ 0.674" -#else -#define DCIDTAG "Dolda" -#define DCIDTAGV VERSION -#define DCIDFULL "DoldaConnect " VERSION -#endif - #define PEER_CMD 0 #define PEER_STOP 1 #define PEER_TRNS 2 @@ -91,6 +74,7 @@ struct command char *name; void (*handler)(struct socket *sk, void *data, char *cmd, char *args); int stop; + int limit; }; struct qcommand @@ -99,12 +83,18 @@ struct qcommand char *string; }; +struct qcmdqueue +{ + struct qcommand *f, *l; + int size; +}; + struct dchub { struct socket *sk; char *inbuf; size_t inbufdata, inbufsize; - struct qcommand *queue; + struct qcmdqueue queue; int extended, dcppemu; char *charset; char *nativename; @@ -128,10 +118,11 @@ struct dcpeer char *inbuf; size_t inbufdata, inbufsize; off_t curread, totalsize; - int freeing; + int close; struct timer *timeout; - struct qcommand *queue; + 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 */ @@ -149,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; @@ -160,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); @@ -215,27 +206,42 @@ static char *dcmakekey(char *lock) return(key); } -static char *pathnmdc2adc(char *path) +static wchar_t *nmdc2path(char *nmdc, char *charset) { - char *ret; - size_t retsize, retdata; + wchar_t *ret, *p; - if(!strcmp(path, "files.xml") || !strcmp(path, "files.xml.bz2") || !strcmp(path, "MyList.DcLst")) - return(sstrdup(path)); - ret = NULL; - retsize = retdata = 0; - addtobuf(ret, '/'); - for(; *path; path++) - { - if(*path == '\\') - addtobuf(ret, '/'); - else - addtobuf(ret, *path); + if((ret = icmbstowcs(nmdc, charset)) == NULL) + return(NULL); + for(p = ret; *p != L'\0'; p++) { + if(*p == L'\\') + *p = L'/'; + } + return(ret); +} + +static char *path2nmdc(wchar_t *path, char *charset) +{ + char *ret, *p; + + if((ret = icwcstombs(path, charset)) == NULL) + return(NULL); + for(p = ret; *p; p++) { + if(*p == '/') + *p = '\\'; } - addtobuf(ret, 0); return(ret); } +static wchar_t *adc2path(char *adc) +{ + return(icmbstowcs(adc, "UTF-8")); +} + +static char *path2adc(wchar_t *path) +{ + return(icwcstombs(path, "UTF-8")); +} + static int isdchash(struct hash *hash) { if(wcscmp(hash->algo, L"TTH")) @@ -376,26 +382,31 @@ static struct dcexppeer *expectpeer(char *nick, struct fnetnode *fn) return(ep); } -static struct qcommand *newqcmd(struct qcommand **queue, char *string) +static struct qcommand *newqcmd(struct qcmdqueue *queue, char *string) { struct qcommand *new; - while(*queue != NULL) - queue = &(*queue)->next; new = smalloc(sizeof(*new)); new->string = sstrdup(string); - new->next = *queue; - *queue = new; + new->next = NULL; + if(queue->l == NULL) + queue->f = new; + else + queue->l->next = new; + queue->l = new; + queue->size++; return(new); } -static struct qcommand *ulqcmd(struct qcommand **queue) +static struct qcommand *ulqcmd(struct qcmdqueue *queue) { struct qcommand *qcmd; - if((qcmd = *queue) == NULL) + if((qcmd = queue->f) == NULL) return(NULL); - *queue = qcmd->next; + if((queue->f = qcmd->next) == NULL) + queue->l = NULL; + queue->size--; return(qcmd); } @@ -623,10 +634,7 @@ static char *getadcid(struct dcpeer *peer) ret = sprintf2("TTH/%.39s", buf); free(buf); } else { - if((buf = icwcstombs(peer->transfer->path, "UTF-8")) == NULL) - return(NULL); - ret = pathnmdc2adc(buf); - free(buf); + ret = path2adc(peer->transfer->path); } return(ret); } @@ -688,16 +696,17 @@ static void requestfile(struct dcpeer *peer) if(peer->transfer->size == -1) { /* Use DCCHARSET for $Get paths until further researched... */ - if((buf = icswcstombs(peer->transfer->path, DCCHARSET, NULL)) == NULL) + if((buf = path2nmdc(peer->transfer->path, DCCHARSET)) == NULL) { transferseterror(peer->transfer, TRNSE_NOTFOUND); - freedcpeer(peer); + peer->close = 1; return; } /* The transfer will be restarted later from * cmd_filelength when it detects that the sizes * don't match. */ qstrf(peer->sk, "$Get %s$1|", buf); + free(buf); return; } if((peer->transfer->hash == NULL) && !peer->notthl) @@ -709,7 +718,7 @@ static void requestfile(struct dcpeer *peer) if((buf = getadcid(peer)) == NULL) { transferseterror(peer->transfer, TRNSE_NOTFOUND); - freedcpeer(peer); + peer->close = 1; return; } sendadc(peer->sk, buf); @@ -726,7 +735,7 @@ static void requestfile(struct dcpeer *peer) if(forkfilter(peer->transfer)) { flog(LOG_WARNING, "could not fork filter for transfer %i: %s", peer->transfer->id, strerror(errno)); - freedcpeer(peer); + peer->close = 1; return; } CBREG(peer->transfer, trans_filterout, (int (*)(struct transfer *, wchar_t *, wchar_t *, void *))trresumecb, NULL, peer); @@ -739,7 +748,7 @@ static void requestfile(struct dcpeer *peer) if((buf = getadcid(peer)) == NULL) { transferseterror(peer->transfer, TRNSE_NOTFOUND); - freedcpeer(peer); + peer->close = 1; return; } sendadc(peer->sk, buf); @@ -748,22 +757,24 @@ static void requestfile(struct dcpeer *peer) sendadcf(peer->sk, "%ji", (intmax_t)(peer->transfer->size - peer->transfer->curpos)); qstr(peer->sk, "|"); } else if(supports(peer, "xmlbzlist")) { - if((buf = icswcstombs(peer->transfer->path, "UTF-8", NULL)) == NULL) + if((buf = path2nmdc(peer->transfer->path, "UTF-8")) == NULL) { transferseterror(peer->transfer, TRNSE_NOTFOUND); - freedcpeer(peer); + peer->close = 1; return; } qstrf(peer->sk, "$UGetBlock %ji %ji %s|", (intmax_t)peer->transfer->curpos, (intmax_t)(peer->transfer->size - peer->transfer->curpos), buf); + free(buf); } else { /* Use DCCHARSET for $Get paths until further researched... */ - if((buf = icswcstombs(peer->transfer->path, DCCHARSET, NULL)) == NULL) + if((buf = path2nmdc(peer->transfer->path, DCCHARSET)) == NULL) { transferseterror(peer->transfer, TRNSE_NOTFOUND); - freedcpeer(peer); + peer->close = 1; return; } qstrf(peer->sk, "$Get %s$%ji|", buf, (intmax_t)peer->transfer->curpos + 1); + free(buf); } } @@ -1114,7 +1125,7 @@ static void cmd_search(struct socket *sk, struct fnetnode *fn, char *cmd, char * size_t buflen; int termnum, satisfied, skipcheck; int level, tersat[32]; - wchar_t *terms[32]; + wchar_t *terms[32], *lname; char hashtth[24]; hub = fn->data; @@ -1135,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 { @@ -1148,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; @@ -1202,8 +1213,10 @@ static void cmd_search(struct socket *sk, struct fnetnode *fn, char *cmd, char * memcpy(hashtth, buf, 24); free(buf); } else { - if((terms[termnum] = icmbstowcs(p, hub->charset)) != NULL) + if((terms[termnum] = icmbstowcs(p, hub->charset)) != NULL) { + wcslower(terms[termnum]); termnum++; + } } } p = p2 + 1; @@ -1235,11 +1248,12 @@ static void cmd_search(struct socket *sk, struct fnetnode *fn, char *cmd, char * } if(!skipcheck) { + lname = wcslower(swcsdup(node->name)); for(i = 0; i < termnum; i++) { if(tersat[i] >= 0) continue; - if(wcsexists(node->name, terms[i])) + if(wcsstr(lname, terms[i])) { tersat[i] = level; satisfied++; @@ -1247,6 +1261,7 @@ static void cmd_search(struct socket *sk, struct fnetnode *fn, char *cmd, char * break; } } + free(lname); } if(!skipcheck && (satisfied == termnum)) { @@ -1337,7 +1352,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)); @@ -1446,7 +1461,7 @@ static void cmd_sr(struct socket *sk, struct fnetnode *fn, char *cmd, char *args if((wnick = icmbstowcs(nick, hub->charset)) == NULL) return; /* Use DCCHARSET in $Get paths until further researched... */ - if((wfile = icmbstowcs(filename, DCCHARSET)) == NULL) + if((wfile = nmdc2path(filename, DCCHARSET)) == NULL) { free(wnick); return; @@ -1549,7 +1564,7 @@ static void cmd_mynick(struct socket *sk, struct dcpeer *peer, char *cmd, char * free(peer->wcsname); if((peer->wcsname = icmbstowcs(peer->nativename, peer->charset)) == NULL) { - freedcpeer(peer); + peer->close = 1; return; } if(peer->accepted) @@ -1589,7 +1604,7 @@ static void cmd_direction(struct socket *sk, struct dcpeer *peer, char *cmd, cha { if((peer->transfer == NULL) || (mydir != peer->direction)) { - freedcpeer(peer); + peer->close = 1; return; } if(peer->direction == TRNSD_DOWN) @@ -1597,7 +1612,7 @@ static void cmd_direction(struct socket *sk, struct dcpeer *peer, char *cmd, cha } else { if(peer->wcsname == NULL) { - freedcpeer(peer); + peer->close = 1; return; } peer->direction = mydir; @@ -1605,17 +1620,17 @@ static void cmd_direction(struct socket *sk, struct dcpeer *peer, char *cmd, cha { if(confgetint("transfer", "ulquota") && hasupload(&dcnet, peer->wcsname)) { - freedcpeer(peer); + peer->close = 1; return; } - transfer = newupload(peer->fn, &dcnet, peer->wcsname, &dctransfer, peer); + transfer = newupload(peer->fn, &dcnet, peer->wcsname, peer->trpipe = mktrpipe(peer)); } else { if((transfer = finddownload(peer->wcsname)) == NULL) { - freedcpeer(peer); + peer->close = 1; return; } - transferattach(transfer, &dctransfer, peer); + transferattach(transfer, peer->trpipe = mktrpipe(peer)); transfersetstate(transfer, TRNS_HS); } transfersetnick(transfer, peer->wcsname); @@ -1645,7 +1660,7 @@ static void cmd_peerlock(struct socket *sk, struct dcpeer *peer, char *cmd, char { if(peer->wcsname == NULL) { - freedcpeer(peer); + peer->close = 1; return; } sendmynick(peer); @@ -1656,14 +1671,14 @@ static void cmd_peerlock(struct socket *sk, struct dcpeer *peer, char *cmd, char { if(confgetint("transfer", "ulquota") && hasupload(&dcnet, peer->wcsname)) { - freedcpeer(peer); + peer->close = 1; 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)); } else { peer->direction = TRNSD_DOWN; - transferattach(transfer, &dctransfer, peer); + transferattach(transfer, peer->trpipe = mktrpipe(peer)); transfersetstate(transfer, TRNS_HS); } transfersetnick(transfer, peer->wcsname); @@ -1709,7 +1724,7 @@ static void cmd_filelength(struct socket *sk, struct dcpeer *peer, char *cmd, ch if(peer->transfer == NULL) { - freedcpeer(peer); + peer->close = 1; return; } size = strtoll(args, NULL, 10); @@ -1717,7 +1732,8 @@ static void cmd_filelength(struct socket *sk, struct dcpeer *peer, char *cmd, ch { transfersetsize(peer->transfer, size); transfer = peer->transfer; - freedcpeer(peer); + peer->close = 1; + resettransfer(transfer); trytransferbypeer(transfer->fnet, transfer->peerid); return; } @@ -1740,7 +1756,7 @@ static void cmd_error(struct socket *sk, struct dcpeer *peer, char *cmd, char *a resettransfer(peer->transfer); return; } - freedcpeer(peer); + peer->close = 1; } static void cmd_maxedout(struct socket *sk, struct dcpeer *peer, char *cmd, char *args) @@ -1751,7 +1767,7 @@ static void cmd_maxedout(struct socket *sk, struct dcpeer *peer, char *cmd, char resettransfer(peer->transfer); return; } - freedcpeer(peer); + peer->close = 1; } static struct @@ -1845,28 +1861,30 @@ static void cmd_get(struct socket *sk, struct dcpeer *peer, char *cmd, char *arg if(peer->transfer == NULL) { - freedcpeer(peer); + peer->close = 1; return; } if((p = strchr(args, '$')) == NULL) { - freedcpeer(peer); + peer->close = 1; return; } *(p++) = 0; if((offset = (strtoll(p, NULL, 10) - 1)) < 0) { - freedcpeer(peer); + peer->close = 1; return; } if(((fd = openfilelist(args)) < 0) && (errno != 0)) { qstr(sk, "$Error Could not send file list|"); - freedcpeer(peer); + peer->close = 1; return; } else if(fd >= 0) { - if((buf2 = icsmbstowcs(args, DCCHARSET, NULL)) != NULL) + if((buf2 = nmdc2path(args, DCCHARSET)) != NULL) { transfersetpath(peer->transfer, buf2); + free(buf2); + } peer->transfer->flags.b.minislot = 1; } if(fd < 0) @@ -1875,13 +1893,13 @@ static void cmd_get(struct socket *sk, struct dcpeer *peer, char *cmd, char *arg if((node = resdcpath(args, DCCHARSET, '\\')) == NULL) { qstrf(sk, "$Error File not in share|"); - freedcpeer(peer); + peer->close = 1; return; } if((fd = opensharecache(node)) < 0) { qstrf(sk, "$Error %s|", strerror(errno)); - freedcpeer(peer); + peer->close = 1; return; } buf = getfspath(node); @@ -1896,7 +1914,7 @@ static void cmd_get(struct socket *sk, struct dcpeer *peer, char *cmd, char *arg close(fd); flog(LOG_WARNING, "could not stat file %ls: %s", node->name, strerror(errno)); qstrf(sk, "$Error|"); - freedcpeer(peer); + peer->close = 1; return; } if(sb.st_size < 65536) @@ -1904,14 +1922,14 @@ static void cmd_get(struct socket *sk, struct dcpeer *peer, char *cmd, char *arg if(!peer->transfer->flags.b.minislot && (slotsleft() < 1)) { close(fd); qstr(sk, "$MaxedOut|"); - freedcpeer(peer); + peer->close = 1; return; } if((offset != 0) && (lseek(fd, offset, SEEK_SET) < 0)) { close(fd); qstrf(sk, "$Error Offset out of range|"); - freedcpeer(peer); + peer->close = 1; return; } lesk = wrapsock(fd); @@ -1924,12 +1942,12 @@ static void cmd_send(struct socket *sk, struct dcpeer *peer, char *cmd, char *ar { if(peer->transfer == NULL) { - freedcpeer(peer); + peer->close = 1; return; } if(peer->transfer->localend == NULL) { - freedcpeer(peer); + peer->close = 1; return; } peer->ptclose = 1; @@ -1977,13 +1995,13 @@ static void cmd_getblock(struct socket *sk, struct dcpeer *peer, char *cmd, char if(peer->transfer == NULL) { - freedcpeer(peer); + peer->close = 1; return; } p = args; if((p2 = strchr(p, ' ')) == NULL) { - freedcpeer(peer); + peer->close = 1; return; } *(p2++) = 0; @@ -1991,7 +2009,7 @@ static void cmd_getblock(struct socket *sk, struct dcpeer *peer, char *cmd, char p = p2; if((p2 = strchr(p, ' ')) == NULL) { - freedcpeer(peer); + peer->close = 1; return; } *(p2++) = 0; @@ -2009,8 +2027,10 @@ static void cmd_getblock(struct socket *sk, struct dcpeer *peer, char *cmd, char qstr(sk, "$Error Could not send file list|"); return; } else if(fd >= 0) { - if((buf2 = icsmbstowcs(args, charset, NULL)) != NULL) + if((buf2 = nmdc2path(args, charset)) != NULL) { transfersetpath(peer->transfer, buf2); + free(buf2); + } peer->transfer->flags.b.minislot = 1; } if(fd < 0) @@ -2074,17 +2094,17 @@ static void cmd_adcget(struct socket *sk, struct dcpeer *peer, char *cmd, char * if(peer->transfer == NULL) { - freedcpeer(peer); + peer->close = 1; return; } if((argv = parseadc(args)) == NULL) { - freedcpeer(peer); + peer->close = 1; return; } if(parrlen(argv) < 4) { - freedcpeer(peer); + peer->close = 1; goto out; } start = strtoll(argv[2], NULL, 10); @@ -2096,7 +2116,7 @@ static void cmd_adcget(struct socket *sk, struct dcpeer *peer, char *cmd, char * qstr(sk, "$Error Could not send file list|"); goto out; } else if(fd >= 0) { - if((wbuf = icsmbstowcs(argv[1], "UTF-8", NULL)) != NULL) + if((wbuf = adc2path(argv[1])) != NULL) transfersetpath(peer->transfer, wbuf); peer->transfer->flags.b.minislot = 1; } @@ -2227,17 +2247,17 @@ static void cmd_adcsnd(struct socket *sk, struct dcpeer *peer, char *cmd, char * if(peer->transfer == NULL) { - freedcpeer(peer); + peer->close = 1; return; } if((argv = parseadc(args)) == NULL) { - freedcpeer(peer); + peer->close = 1; return; } if(parrlen(argv) < 4) { - freedcpeer(peer); + peer->close = 1; goto out; } start = strtoll(argv[2], NULL, 10); @@ -2247,7 +2267,7 @@ static void cmd_adcsnd(struct socket *sk, struct dcpeer *peer, char *cmd, char * if((start != 0) || (numbytes % 24 != 0)) { /* Weird. Bail out. */ - freedcpeer(peer); + peer->close = 1; goto out; } if(peer->timeout != NULL) @@ -2261,13 +2281,13 @@ static void cmd_adcsnd(struct socket *sk, struct dcpeer *peer, char *cmd, char * } else if(!strcmp(argv[0], "file")) { if(start != peer->transfer->curpos) { - freedcpeer(peer); + peer->close = 1; goto out; } if(start + numbytes != peer->transfer->size) { transfersetsize(peer->transfer, start + numbytes); - freedcpeer(peer); + peer->close = 1; goto out; } startdl(peer); @@ -2275,11 +2295,10 @@ 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...*/ - freedcpeer(peer); + peer->close = 1; goto out; } @@ -2293,14 +2312,14 @@ static void cmd_sending(struct socket *sk, struct dcpeer *peer, char *cmd, char if(peer->transfer == NULL) { - freedcpeer(peer); + peer->close = 1; return; } numbytes = strtoll(args, NULL, 10); if(peer->transfer->size - peer->transfer->curpos != numbytes) { transfersetsize(peer->transfer, peer->transfer->curpos + numbytes); - freedcpeer(peer); + peer->close = 1; return; } startdl(peer); @@ -2308,7 +2327,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); } } @@ -2620,10 +2638,10 @@ static struct command hubcmds[] = {"$OpList", cc(cmd_oplist)}, {"$MyINFO", cc(cmd_myinfo)}, {"$ForceMove", cc(cmd_forcemove)}, - {"$Search", cc(cmd_search)}, - {"$MultiSearch", cc(cmd_search)}, - {"$ConnectToMe", cc(cmd_connecttome)}, - {"$RevConnectToMe", cc(cmd_revconnecttome)}, + {"$Search", cc(cmd_search), .limit = 100}, + {"$MultiSearch", cc(cmd_search), .limit = 50}, + {"$ConnectToMe", cc(cmd_connecttome), .limit = 200}, + {"$RevConnectToMe", cc(cmd_revconnecttome), .limit = 500}, {"$GetNetInfo", cc(cmd_getnetinfo)}, {"$To:", cc(cmd_to)}, {"$SR", cc(cmd_sr)}, @@ -2651,19 +2669,26 @@ static struct command peercmds[] = {"$GetZBlock", cc(cmd_getblock)}, {"$UGetZBlock", cc(cmd_getblock)}, {"$ADCGET", cc(cmd_adcget)}, - {"$ADCSND", cc(cmd_adcsnd), 1}, - {"$Sending", cc(cmd_sending), 1}, + {"$ADCSND", cc(cmd_adcsnd), .stop = 1}, + {"$Sending", cc(cmd_sending), .stop = 1}, {NULL, NULL} }; #undef cc +static struct socket *mktrpipe(struct dcpeer *peer) +{ + struct socket *sk; + + sk = netsockpipe(); + sk->data = peer; + return(sk); +} + static void dctransdetach(struct transfer *transfer, struct dcpeer *peer) { CBUNREG(transfer, trans_filterout, peer); - if(peer->freeing) - return; peer->transfer = NULL; - freedcpeer(peer); + peer->close = 1; } static void dctransgotdata(struct transfer *transfer, struct dcpeer *peer) @@ -2676,7 +2701,7 @@ 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) { @@ -2747,18 +2772,14 @@ static void dctransendofdata(struct transfer *transfer, struct dcpeer *peer) dctransgotdata(transfer, peer); } -static void dcwantdata(struct transfer *transfer, struct dcpeer *peer) -{ - if(transferdatasize(transfer) < 65536) - peer->sk->ignread = 0; -} - static void transread(struct socket *sk, struct dcpeer *peer) { void *buf; size_t bufsize; struct transfer *transfer; + if(transferdatasize(peer->transfer) < 0) + return; if((buf = sockgetinbuf(sk, &bufsize)) == NULL) return; if(peer->transfer == NULL) @@ -2776,8 +2797,12 @@ static void transread(struct socket *sk, struct dcpeer *peer) transferendofdata(transfer); return; } - if(transferdatasize(peer->transfer) > 65535) - sk->ignread = 1; +} + +static void dcwantdata(struct transfer *transfer, struct dcpeer *peer) +{ + if(transferdatasize(transfer) > 0) + transread(peer->sk, peer); } static void transerr(struct socket *sk, int err, struct dcpeer *peer) @@ -2811,6 +2836,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; @@ -2893,7 +2919,7 @@ static void udpread(struct socket *sk, void *data) *p2 = 0; hubaddr.sin_port = htons(atoi(p)); /* Use DCCHARSET in $Get paths until further researched... */ - if((wfile = icmbstowcs(filename, DCCHARSET)) == NULL) + if((wfile = nmdc2path(filename, DCCHARSET)) == NULL) { free(buf); return; @@ -2930,13 +2956,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); } } } @@ -2969,11 +2997,14 @@ static void udpread(struct socket *sk, void *data) static void hubread(struct socket *sk, struct fnetnode *fn) { struct dchub *hub; + struct command *cmd; char *newbuf; - size_t datalen; - char *p; + size_t datalen, cnlen; + 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 */ @@ -2981,16 +3012,22 @@ static void hubread(struct socket *sk, struct fnetnode *fn) sizebuf2(hub->inbuf, hub->inbufdata + datalen, 1); memcpy(hub->inbuf + hub->inbufdata, newbuf, datalen); free(newbuf); - p = hub->inbuf + hub->inbufdata; + p = hub->inbuf; hub->inbufdata += datalen; - while((datalen > 0) && ((p = memchr(p, '|', datalen)) != NULL)) + while((p - hub->inbuf < hub->inbufdata) && ((p2 = memchr(p, '|', hub->inbufdata - (p - hub->inbuf))) != NULL)) { - *(p++) = 0; - newqcmd(&hub->queue, hub->inbuf); - memmove(hub->inbuf, p, hub->inbufdata -= p - hub->inbuf); - datalen = hub->inbufdata; - p = hub->inbuf; + *(p2++) = 0; + for(cmd = hubcmds; cmd->handler != NULL; cmd++) + { + cnlen = strlen(cmd->name); + if(!strncmp(p, cmd->name, cnlen) && ((p[cnlen] == ' ') || (p[cnlen] == 0))) + break; + } + if((cmd->limit == 0) || (hub->queue.size < cmd->limit)) + newqcmd(&hub->queue, p); + p = p2; } + memmove(hub->inbuf, p, hub->inbufdata -= p - hub->inbuf); } static void huberr(struct socket *sk, int err, struct fnetnode *fn) @@ -3088,20 +3125,22 @@ static void freedcpeer(struct dcpeer *peer) int i; struct qcommand *qcmd; - peer->freeing = 1; if(peers == peer) peers = peer->next; if(peer->next != NULL) peer->next->prev = peer->prev; if(peer->prev != NULL) peer->prev->next = peer->next; + if(peer->trpipe != NULL) { + closesock(peer->trpipe); + putsock(peer->trpipe); + } if(peer->transfer != NULL) { if(peer->transfer->dir == TRNSD_UP) peer->transfer->close = 1; if(peer->transfer->dir == TRNSD_DOWN) resettransfer(peer->transfer); - transferdetach(peer->transfer); } if(peer->timeout != NULL) canceltimer(peer->timeout); @@ -3180,26 +3219,9 @@ static void hubkill(struct fnetnode *fn) struct dchub *hub; hub = (struct dchub *)fn->data; - hub->sk->close = 1; + closesock(hub->sk); } -static wchar_t *dcbasename(wchar_t *filename) -{ - wchar_t *ret; - - if((ret = wcsrchr(filename, L'\\')) != NULL) - return(ret + 1); - return(filename); -} - -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", @@ -3210,15 +3232,18 @@ static struct fnet dcnet = .reqconn = hubreqconn, .sendchat = hubsendchat, .search = hubsearch, - .filebasename = dcbasename }; static void peerread(struct socket *sk, struct dcpeer *peer) { char *newbuf, *p; - size_t datalen; + size_t datalen, cnlen; struct command *cmd; + if(peer->state == PEER_CMD) { + if((peer->queue.size > 50) || (peer->inbufdata > 65536)) + return; + } if((newbuf = sockgetinbuf(sk, &datalen)) == NULL) return; sizebuf2(peer->inbuf, peer->inbufdata + datalen, 1); @@ -3231,12 +3256,14 @@ static void peerread(struct socket *sk, struct dcpeer *peer) while((peer->inbufdata > 0) && (p = memchr(peer->inbuf, '|', peer->inbufdata)) != NULL) { *(p++) = 0; - newqcmd(&peer->queue, peer->inbuf); for(cmd = peercmds; cmd->handler != NULL; cmd++) { - if(!memcmp(peer->inbuf, cmd->name, strlen(cmd->name)) && ((peer->inbuf[strlen(cmd->name)] == ' ') || (peer->inbuf[strlen(cmd->name)] == '|'))) + cnlen = strlen(cmd->name); + if(!strncmp(peer->inbuf, cmd->name, cnlen) && ((peer->inbuf[cnlen] == ' ') || (peer->inbuf[cnlen] == 0))) break; } + if((cmd->limit == 0) || (peer->queue.size < cmd->limit)) + newqcmd(&peer->queue, peer->inbuf); memmove(peer->inbuf, p, peer->inbufdata -= p - peer->inbuf); if(cmd->stop) { @@ -3262,7 +3289,6 @@ static void peerconnect(struct socket *sk, int err, struct fnetnode *fn) if(err != 0) { putfnetnode(fn); - putsock(sk); return; } hub = fn->data; @@ -3274,13 +3300,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; @@ -3300,6 +3325,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); @@ -3357,27 +3383,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; @@ -3385,7 +3412,7 @@ static void updatehmlist(void) bufdata -= ret; buf2 += ret; } - close(fd); + fclose(out); } free(buf); } @@ -3722,9 +3749,10 @@ static int run(void) struct dchub *hub; struct dcpeer *peer, *nextpeer; struct qcommand *qcmd; - int ret; + int ret, quota; ret = 0; + quota = 20; for(fn = fnetnodes; fn != NULL; fn = nextfn) { nextfn = fn->next; @@ -3733,7 +3761,7 @@ static int run(void) if(fn->data == NULL) continue; hub = (struct dchub *)fn->data; - if((qcmd = ulqcmd(&hub->queue)) != NULL) + while((quota > 0) && ((qcmd = ulqcmd(&hub->queue)) != NULL)) { if(*qcmd->string == '$') { @@ -3744,13 +3772,17 @@ static int run(void) } freeqcmd(qcmd); ret = 1; - break; + quota--; } + if(hub->queue.size < 1000) + hubread(hub->sk, fn); + if(quota < 1) + break; } - for(peer = peers; peer != NULL; peer = nextpeer) + quota = 20; + for(peer = peers; peer != NULL; peer = peer->next) { - nextpeer = peer->next; - if((qcmd = ulqcmd(&peer->queue)) != NULL) + while(!peer->close && (quota > 0) && ((qcmd = ulqcmd(&peer->queue)) != NULL)) { if(peer->timeout != NULL) canceltimer(peer->timeout); @@ -3759,8 +3791,18 @@ static int run(void) dispatchcommand(qcmd, peercmds, peer->sk, peer); freeqcmd(qcmd); ret = 1; - break; + quota--; } + if((peer->queue.size < 50) && (peer->inbufdata < 500000)) + peerread(peer->sk, peer); + if(quota < 1) + break; + } + for(peer = peers; peer != NULL; peer = nextpeer) + { + nextpeer = peer->next; + if(peer->close) + freedcpeer(peer); } return(ret); } @@ -3795,7 +3837,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; @@ -3803,7 +3845,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); } @@ -3818,7 +3860,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"));