#include <bzlib.h>
#include <zlib.h>
#include <sys/stat.h>
+#include <stdint.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
* 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
char *inbuf;
size_t inbufdata, inbufsize;
off_t curread, totalsize;
- int freeing;
+ int close;
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 */
};
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;
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);
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
if((buf = getadcid(peer)) == NULL)
{
transferseterror(peer->transfer, TRNSE_NOTFOUND);
- freedcpeer(peer);
+ peer->close = 1;
return;
}
sendadc(peer->sk, buf);
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);
if((buf = getadcid(peer)) == NULL)
{
transferseterror(peer->transfer, TRNSE_NOTFOUND);
- freedcpeer(peer);
+ peer->close = 1;
return;
}
sendadc(peer->sk, buf);
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);
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);
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;
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 {
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;
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;
}
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++;
break;
}
}
+ free(lname);
}
if(!skipcheck && (satisfied == termnum))
{
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));
free(peer->wcsname);
if((peer->wcsname = icmbstowcs(peer->nativename, peer->charset)) == NULL)
{
- freedcpeer(peer);
+ peer->close = 1;
return;
}
if(peer->accepted)
{
if((peer->transfer == NULL) || (mydir != peer->direction))
{
- freedcpeer(peer);
+ peer->close = 1;
return;
}
if(peer->direction == TRNSD_DOWN)
} else {
if(peer->wcsname == NULL)
{
- freedcpeer(peer);
+ peer->close = 1;
return;
}
peer->direction = mydir;
{
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);
{
if(peer->wcsname == NULL)
{
- freedcpeer(peer);
+ peer->close = 1;
return;
}
sendmynick(peer);
{
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);
if(peer->transfer == NULL)
{
- freedcpeer(peer);
+ peer->close = 1;
return;
}
size = strtoll(args, NULL, 10);
{
transfersetsize(peer->transfer, size);
transfer = peer->transfer;
- freedcpeer(peer);
+ peer->close = 1;
+ resettransfer(transfer);
trytransferbypeer(transfer->fnet, transfer->peerid);
return;
}
resettransfer(peer->transfer);
return;
}
- freedcpeer(peer);
+ peer->close = 1;
}
static void cmd_maxedout(struct socket *sk, struct dcpeer *peer, char *cmd, char *args)
resettransfer(peer->transfer);
return;
}
- freedcpeer(peer);
+ peer->close = 1;
}
static struct
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 = nmdc2path(args, DCCHARSET)) != NULL) {
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);
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)
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);
{
if(peer->transfer == NULL)
{
- freedcpeer(peer);
+ peer->close = 1;
return;
}
if(peer->transfer->localend == NULL)
{
- freedcpeer(peer);
+ peer->close = 1;
return;
}
peer->ptclose = 1;
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;
p = p2;
if((p2 = strchr(p, ' ')) == NULL)
{
- freedcpeer(peer);
+ peer->close = 1;
return;
}
*(p2++) = 0;
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);
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);
if((start != 0) || (numbytes % 24 != 0))
{
/* Weird. Bail out. */
- freedcpeer(peer);
+ peer->close = 1;
goto out;
}
if(peer->timeout != NULL)
} 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);
{
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;
}
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);
{
sockpushdata(sk, peer->inbuf, peer->inbufdata);
peer->inbufdata = 0;
- transread(sk, peer);
}
}
};
#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)
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)
{
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)
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)
size_t buflen, hashlen;
char *nick, *filename, *hubname;
struct sockaddr_in hubaddr;
+ struct sockaddr *addrbuf;
off_t size;
int slots;
struct fnetnode *fn, *myfn;
{
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);
}
}
}
struct command *cmd;
char *newbuf;
size_t datalen, cnlen;
- char *p;
+ 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 */
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;
+ *(p2++) = 0;
for(cmd = hubcmds; cmd->handler != NULL; cmd++)
{
cnlen = strlen(cmd->name);
- if(!strncmp(hub->inbuf, cmd->name, cnlen) && ((hub->inbuf[cnlen] == ' ') || (hub->inbuf[cnlen] == 0)))
+ if(!strncmp(p, cmd->name, cnlen) && ((p[cnlen] == ' ') || (p[cnlen] == 0)))
break;
}
if((cmd->limit == 0) || (hub->queue.size < cmd->limit))
- newqcmd(&hub->queue, hub->inbuf);
- memmove(hub->inbuf, p, hub->inbufdata -= p - hub->inbuf);
- datalen = hub->inbufdata;
- p = hub->inbuf;
+ newqcmd(&hub->queue, p);
+ p = p2;
}
- if(hub->queue.size > 1000)
- sk->ignread = 1;
+ memmove(hub->inbuf, p, hub->inbufdata -= p - hub->inbuf);
}
static void huberr(struct socket *sk, int err, struct fnetnode *fn)
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);
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",
.reqconn = hubreqconn,
.sendchat = hubsendchat,
.search = hubsearch,
- .filebasename = dcbasename
};
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;
+ }
if((newbuf = sockgetinbuf(sk, &datalen)) == NULL)
return;
sizebuf2(peer->inbuf, peer->inbufdata + datalen, 1);
{
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)
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;
char *buf, *buf2, numbuf[32];
size_t bufsize, bufdata;
int fd, ibuf;
+ FILE *out;
bufdata = 0;
buf = smalloc(bufsize = 65536);
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;
bufdata -= ret;
buf2 += ret;
}
- close(fd);
+ fclose(out);
}
free(buf);
}
quota--;
}
if(hub->queue.size < 1000)
- hub->sk->ignread = 0;
+ hubread(hub->sk, fn);
if(quota < 1)
break;
}
quota = 20;
- for(peer = peers; peer != NULL; peer = nextpeer)
+ for(peer = peers; peer != NULL; peer = peer->next)
{
- nextpeer = peer->next;
- while((quota > 0) && ((qcmd = ulqcmd(&peer->queue)) != NULL))
+ while(!peer->close && (quota > 0) && ((qcmd = ulqcmd(&peer->queue)) != NULL))
{
if(peer->timeout != NULL)
canceltimer(peer->timeout);
quota--;
}
if((peer->queue.size < 50) && (peer->inbufdata < 500000))
- peer->sk->ignread = 0;
+ 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);
}
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;
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);
}
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"));
Dolda2000 GitWeb / doldaconnect.git / blobdiff