#include "transfer.h"
#include "sysevents.h"
#include "net.h"
-#include "tiger.h"
+#include <tiger.h>
/*
* The Direct Connect protocol is extremely ugly. Thus, this code must
size_t inbufdata, inbufsize;
struct qcommand *queue;
int extended, dcppemu;
+ char *charset;
char *nativename;
char *nativenick;
};
int compress;
int hascurpos, fetchingtthl, notthl;
struct tigertreehash tth;
+ char *charset;
void *cprsdata;
char *key;
char *nativename;
static char *hmlistname = NULL;
static char *xmllistname = NULL;
static char *xmlbz2listname = NULL;
+static struct timer *listwritetimer = NULL;
-static void peerconnect(struct socket *sk, int err, struct fnetnode *fn);
+static int peerconnect(struct socket *sk, int err, struct fnetnode *fn);
+static int peerread(struct socket *sk, struct dcpeer *peer);
+static int peererror(struct socket *sk, int err, struct dcpeer *peer);
static void freedcpeer(struct dcpeer *peer);
-static void transread(struct socket *sk, struct dcpeer *peer);
-static void transerr(struct socket *sk, int err, struct dcpeer *peer);
-static void transwrite(struct socket *sk, struct dcpeer *peer);
+static void transread(struct dcpeer *peer);
+static void transerr(struct dcpeer *peer);
+static int transwrite(struct socket *sk, struct dcpeer *peer);
static void updatehmlist(void);
static void updatexmllist(void);
static void updatexmlbz2list(void);
static void requestfile(struct dcpeer *peer);
+static void updatelists(int now);
static int reservedchar(unsigned char c)
{
wchar_t *chat, *wfrom, *wpeer;
char *p, *end;
struct fnetpeer *peer;
+ struct dchub *hub;
+ hub = fn->data;
end = string + strlen(string);
while((p = strchr(string, 13)) != NULL)
memmove(p, p + 1, (end-- - p));
{
if((strlen(string) > strlen(from) + 2) && (*string == '<') && !memcmp(string + 1, from, strlen(from)) && (*(string + strlen(from) + 1) == '>'))
string += strlen(from) + 2;
- if((wfrom = icmbstowcs(from, DCCHARSET)) == NULL)
+ if((wfrom = icmbstowcs(from, hub->charset)) == NULL)
return;
wpeer = swcsdup(wfrom);
} else {
*(p++) = 0;
if(*p == ' ')
p++;
- if((wpeer = icmbstowcs(string + 1, DCCHARSET)) == NULL)
+ if((wpeer = icmbstowcs(string + 1, hub->charset)) == NULL)
return;
string = p;
}
if(wpeer == NULL)
wpeer = swcsdup(L"");
}
- if((chat = icmbstowcs(string, DCCHARSET)) == NULL)
+ if((chat = icmbstowcs(string, hub->charset)) == NULL)
{
if(wfrom != NULL)
free(wfrom);
char *ret;
int isfilelist;
+ isfilelist = 0;
if(!wcscmp(peer->transfer->path, L"files.xml") || !wcscmp(peer->transfer->path, L"files.xml.bz2") || !wcscmp(peer->transfer->path, L"MyList.DcLst"))
isfilelist = 1;
if(!isfilelist && (peer->transfer->hash != NULL) && isdchash(peer->transfer->hash) && supports(peer, "tthf"))
static void sendmynick(struct dcpeer *peer)
{
- struct dchub *hub;
+ struct fnetnode *fn;
- hub = (peer->fn == NULL)?NULL:(peer->fn->data);
- if(hub == NULL)
- qstrf(peer->sk, "$MyNick %s|", icswcstombs(confgetstr("cli", "defnick"), DCCHARSET, "DoldaConnectUser-IN"));
+ fn = peer->fn;
+ if(fn == NULL)
+ qstrf(peer->sk, "$MyNick %s|", icswcstombs(confgetstr("cli", "defnick"), peer->charset, "DoldaConnectUser-IN"));
else
- qstrf(peer->sk, "$MyNick %s|", hub->nativenick);
+ qstrf(peer->sk, "$MyNick %s|", icswcstombs(fn->mynick, peer->charset, "DoldaConnectUser-IN"));
}
static void sendpeerlock(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)
{
transferseterror(peer->transfer, TRNSE_NOTFOUND);
}
qstrf(peer->sk, "$UGetBlock %i %i %s|", peer->transfer->curpos, peer->transfer->size - peer->transfer->curpos, buf);
} else {
+ /* Use DCCHARSET for $Get paths until further researched... */
if((buf = icswcstombs(peer->transfer->path, DCCHARSET, NULL)) == NULL)
{
transferseterror(peer->transfer, TRNSE_NOTFOUND);
hub = fn->data;
qstrf(sk, "$MyINFO $ALL %s ", hub->nativenick);
- buf = tr(icswcstombs(confgetstr("dc", "desc"), DCCHARSET, "Charset_conv_failure"), "$_|_");
+ buf = tr(icswcstombs(confgetstr("dc", "desc"), hub->charset, "Charset_conv_failure"), "$_|_");
qstrf(sk, "%s", buf);
hn1 = hn2 = hn3 = 0;
for(cfn = fnetnodes; cfn != NULL; cfn = cfn->next)
confgetint("transfer", "slots")
);
qstrf(sk, "$ $");
- buf = tr(icswcstombs(confgetstr("dc", "speedstring"), DCCHARSET, "Charset_conv_failure"), "$_|_");
+ buf = tr(icswcstombs(confgetstr("dc", "speedstring"), hub->charset, "Charset_conv_failure"), "$_|_");
qstrf(sk, "%s\x01$", buf);
- buf = tr(icswcstombs(confgetstr("dc", "email"), DCCHARSET, "Charset_conv_failure"), "$_|_");
+ buf = tr(icswcstombs(confgetstr("dc", "email"), hub->charset, "Charset_conv_failure"), "$_|_");
qstrf(sk, "%s$", buf);
qstrf(sk, "%llu$|", sharesize);
}
if(hub->nativename == NULL)
free(hub->nativename);
hub->nativename = sstrdup(args);
- buf = icmbstowcs(args, DCCHARSET);
+ buf = icmbstowcs(args, hub->charset);
fnetsetname(fn, (buf == NULL)?L"Hubname conv error":buf);
if(buf != NULL)
free(buf);
struct dchub *hub;
hub = fn->data;
- if((nick = icmbstowcs(args, DCCHARSET)) == NULL)
+ if((nick = icmbstowcs(args, hub->charset)) == NULL)
return;
if(strcmp(args, hub->nativenick) && (fnetfindpeer(fn, nick) == NULL))
fnetaddpeer(fn, nick, nick);
struct dchub *hub;
hub = fn->data;
- if((nick = icmbstowcs(args, DCCHARSET)) == NULL)
+ if((nick = icmbstowcs(args, hub->charset)) == NULL)
return;
if((peer = fnetfindpeer(fn, nick)) != NULL)
fnetdelpeer(peer);
while((p = strstr(args, "$$")) != NULL)
{
*p = 0;
- if((buf = icmbstowcs(args, DCCHARSET)) != NULL)
+ if((buf = icmbstowcs(args, hub->charset)) != NULL)
{
if((peer = fnetfindpeer(fn, buf)) == NULL)
peer = fnetaddpeer(fn, buf, buf);
while((p = strstr(args, "$$")) != NULL)
{
*p = 0;
- if((buf = icmbstowcs(args, DCCHARSET)) != NULL)
+ if((buf = icmbstowcs(args, hub->charset)) != NULL)
{
if((peer = fnetfindpeer(fn, buf)) != NULL)
peer->flags.b.op = 1;
if((p2 = strchr(p, ' ')) == NULL)
return;
*p2 = 0;
- if((buf = icmbstowcs(p, DCCHARSET)) == NULL)
+ if((buf = icmbstowcs(p, hub->charset)) == NULL)
return;
if((peer = fnetfindpeer(fn, buf)) == NULL)
peer = fnetaddpeer(fn, buf, buf);
if((p2 = strstr(p, "$ $")) == NULL)
return;
*p2 = 0;
- if((buf = icmbstowcs(p, DCCHARSET)) == NULL)
+ if((buf = icmbstowcs(p, hub->charset)) == NULL)
return;
- if((wcslen(buf) > 0) && (buf[wcslen(buf) - 1] == L'>') && ((wp = wcschr(buf, L'<')) != NULL))
+ if((wcslen(buf) > 0) && (buf[wcslen(buf) - 1] == L'>') && ((wp = wcsrchr(buf, L'<')) != NULL))
{
buf[wcslen(buf) - 1] = L'\0';
*(wp++) = L'\0';
if((p2 = strchr(p, '$')) == NULL)
return;
*(p2 - 1) = 0;
- if((buf = icmbstowcs(p, DCCHARSET)) == NULL)
+ if((buf = icmbstowcs(p, hub->charset)) == NULL)
return;
fnetpeersetstr(peer, L"dc-speed", buf);
free(buf);
if((p2 = strchr(p, '$')) == NULL)
return;
*p2 = 0;
- if((buf = icmbstowcs(p, DCCHARSET)) == NULL)
+ if((buf = icmbstowcs(p, hub->charset)) == NULL)
return;
fnetpeersetstr(peer, L"email", buf);
free(buf);
} else {
freeargs = 0;
}
- if((newfn = fnetinitconnect(L"dc", args, NULL)) != NULL)
+ if((newfn = fnetinitconnect(L"dc", fn->owner, args, NULL)) != NULL)
{
linkfnetnode(newfn);
putfnetnode(newfn);
free(args);
}
-static char *getdcpath(struct sharecache *node, size_t *retlen)
+static char *getdcpath(struct sharecache *node, size_t *retlen, char *charset)
{
char *buf, *buf2;
size_t len, len2;
return(NULL);
if(node->parent == shareroot)
{
- if((buf = icwcstombs(node->name, DCCHARSET)) == NULL)
+ if((buf = icwcstombs(node->name, charset)) == NULL)
return(NULL);
if(retlen != NULL)
*retlen = strlen(buf);
return(buf);
} else {
- if((buf2 = icwcstombs(node->name, DCCHARSET)) == NULL)
+ if((buf2 = icwcstombs(node->name, charset)) == NULL)
return(NULL);
- if((buf = getdcpath(node->parent, &len)) == NULL)
+ if((buf = getdcpath(node->parent, &len, charset)) == NULL)
{
free(buf2);
return(NULL);
struct sockaddr_in addr;
struct sharecache *node;
int minsize, maxsize;
- int dotth, buflen;
+ int dotth;
+ size_t buflen;
int termnum, satisfied, skipcheck;
int level, tersat[32];
wchar_t *terms[32];
if(!dotth && !strncmp(p, "TTH:", 4))
{
dotth = 1;
- if((buf = base32decode(p + 4, &buflen)) == NULL)
- goto out;
- if(buflen != 24)
+ if(((buf = base32decode(p + 4, &buflen)) == NULL) || (buflen != 24))
+ {
+ free(buf);
goto out;
+ }
memcpy(hashtth, buf, 24);
free(buf);
} else {
- if((terms[termnum] = icmbstowcs(p, DCCHARSET)) != NULL)
+ if((terms[termnum] = icmbstowcs(p, hub->charset)) != NULL)
termnum++;
}
}
}
if(!skipcheck && (satisfied == termnum))
{
- if((buf = getdcpath(node, NULL)) != NULL)
+ /* Use DCCHARSET in $Get paths until further researched... */
+ if((buf = getdcpath(node, NULL, DCCHARSET)) != NULL)
{
if(node->f.b.hastth)
{
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);
+ newsk = netcsconn((struct sockaddr *)&addr, sizeof(addr), (int (*)(struct socket *, int, void *))peerconnect, fn);
getfnetnode(fn);
hubhandleaction(sk, fn, cmd, args);
}
if(tcpsock == NULL)
return;
- if(sockgetremotename(tcpsock, &addr, &addrlen) < 0)
+ if(sockgetremotename2(tcpsock, sk, &addr, &addrlen) < 0)
return;
if(addr->sa_family == AF_INET)
qstrf(sk, "$ConnectToMe %s %s|", nick, formataddress(addr, addrlen));
if((p2 = strstr(p, " (")) == NULL)
return;
*p2 = 0;
- if((wnick = icmbstowcs(nick, DCCHARSET)) == NULL)
+ if((wnick = icmbstowcs(nick, hub->charset)) == NULL)
return;
+ /* Use DCCHARSET in $Get paths until further researched... */
if((wfile = icmbstowcs(filename, DCCHARSET)) == NULL)
{
free(wnick);
hub = fn->data;
pw = wpfind(fn->args, L"password");
- if((pw == NULL) || ((mbspw = icwcstombs(pw, DCCHARSET)) == NULL))
+ if((pw == NULL) || ((mbspw = icwcstombs(pw, hub->charset)) == NULL))
{
killfnetnode(fn);
return;
peer->nativename = sstrdup(args);
if(peer->wcsname != NULL)
free(peer->wcsname);
- if((peer->wcsname = icmbstowcs(peer->nativename, DCCHARSET)) == NULL)
+ if((peer->wcsname = icmbstowcs(peer->nativename, peer->charset)) == NULL)
{
freedcpeer(peer);
return;
peer->direction = mydir;
if(peer->direction == TRNSD_UP)
{
+ if(confgetint("transfer", "ulquota") && hasupload(&dcnet, peer->wcsname))
+ {
+ freedcpeer(peer);
+ return;
+ }
transfer = newupload(peer->fn, &dcnet, peer->wcsname, &dctransfer, peer);
} else {
if((transfer = finddownload(peer->wcsname)) == NULL)
sendsupports(peer);
if((transfer = finddownload(peer->wcsname)) == NULL)
{
+ if(confgetint("transfer", "ulquota") && hasupload(&dcnet, peer->wcsname))
+ {
+ freedcpeer(peer);
+ return;
+ }
peer->direction = TRNSD_UP;
transfer = newupload(peer->fn, &dcnet, peer->wcsname, &dctransfer, peer);
} else {
peer->transfer = transfer;
qstrf(sk, "$Direction %s %i|", (peer->direction == TRNSD_UP)?"Upload":"Download", rand() % 10000);
qstrf(sk, "$Key %s|", key);
+ free(key);
} else {
if(peer->key != NULL)
free(peer->key);
canceltimer(peer->timeout);
peer->state = PEER_TRNS;
transferstartdl(peer->transfer, peer->sk);
- peer->sk->readcb = (void (*)(struct socket *, void *))transread;
- peer->sk->errcb = (void (*)(struct socket *, int, void *))transerr;
}
static void startul(struct dcpeer *peer)
canceltimer(peer->timeout);
peer->state = PEER_TRNS;
transferstartul(peer->transfer, peer->sk);
- peer->sk->writecb = (void (*)(struct socket *, void *))transwrite;
+ CBREG(peer->sk, socket_write, (int (*)(struct socket *, void *))transwrite, NULL, peer);
}
static void cmd_filelength(struct socket *sk, struct dcpeer *peer, char *cmd, char *args)
}
if(fd < 0)
{
+ /* Use DCCHARSET in $Get paths until further researched... */
if((node = resdcpath(args, DCCHARSET, '\\')) == NULL)
{
qstrf(sk, "$Error File not in share|");
if(!strcmp(cmd, "$UGetBlock") || !strcmp(cmd, "$UGetZBlock"))
charset = "UTF-8";
else
+ /* Use DCCHARSET in $Get paths until further researched... */
charset = DCCHARSET;
if(!strcmp(cmd, "$GetZBlock") || !strcmp(cmd, "$UGetZBlock"))
initcompress(peer, CPRS_ZLIB);
goto out;
}
startdl(peer);
- if(peer->inbufdata > 0)
- {
- sockpushdata(sk, peer->inbuf, peer->inbufdata);
- peer->inbufdata = 0;
- transread(sk, peer);
- }
+ transread(peer);
} else {
/* We certainly didn't request this...*/
freedcpeer(peer);
return;
}
startdl(peer);
- if(peer->inbufdata > 0)
- {
- sockpushdata(sk, peer->inbuf, peer->inbufdata);
- peer->inbufdata = 0;
- transread(sk, peer);
- }
+ transread(peer);
}
/*
errno = EFAULT;
return(1);
}
- if((mbsnick = icwcstombs(peer->id, DCCHARSET)) == NULL)
+ if((mbsnick = icwcstombs(peer->id, hub->charset)) == NULL)
return(1); /* Shouldn't happen, of course, but who knows... */
if(tcpsock != NULL)
{
char *mbsstring, *mbsto;
hub = fn->data;
- if((mbsto = icwcstombs(to, DCCHARSET)) == NULL)
+ if((mbsto = icwcstombs(to, hub->charset)) == NULL)
{
errno = EILSEQ;
return(1);
}
- if((mbsstring = icwcstombs(string, DCCHARSET)) == NULL)
+ if((mbsstring = icwcstombs(string, hub->charset)) == NULL)
{
errno = EILSEQ;
return(1);
return(h1);
break;
case SOP_OR:
- h1 = findsehash(sexpr->l);
- h2 = findsehash(sexpr->r);
+ if((h1 = findsehash(sexpr->l)) == NULL)
+ return(NULL);
+ if((h2 = findsehash(sexpr->r)) == NULL)
+ return(NULL);
if(hashcmp(h1, h2))
return(h1);
break;
if(minsize != 0)
{
sizebuf2(sstr, sstrdata + 32, 1);
- snprintf(sstr + sstrdata, sstrsize - sstrdata, "T?F?%i?1?", minsize);
+ sstrdata += snprintf(sstr + sstrdata, sstrsize - sstrdata, "T?F?%i?1?", minsize);
} else if(maxsize != -1) {
sizebuf2(sstr, sstrdata + 32, 1);
- snprintf(sstr + sstrdata, sstrsize - sstrdata, "T?T?%i?1?", maxsize);
+ sstrdata += snprintf(sstr + sstrdata, sstrsize - sstrdata, "T?T?%i?1?", maxsize);
} else {
bufcat(sstr, "F?F?0?1?", 8);
}
{
for(cur = list; cur != NULL; cur = cur->next)
{
+ /* Use DCCHARSET in $Get paths until further researched... */
if((buf = icwcstombs(cur->str, DCCHARSET)) == NULL)
{
/* Can't find anything anyway if the search expression
addtobuf(sstr, 0);
if(tcpsock != NULL)
{
- if(sockgetremotename(udpsock, &name, &namelen) < 0)
+ if(sockgetremotename2(udpsock, fn->sk, &name, &namelen) < 0)
{
flog(LOG_WARNING, "cannot get address of UDP socket");
} else {
#undef qstrf
#define cc(c) ((void (*)(struct socket *, void *, char *, char *))(c))
-struct command hubcmds[] =
+static struct command hubcmds[] =
{
{"$Lock", cc(cmd_lock)},
{"$HubName", cc(cmd_hubname)},
{NULL, NULL}
};
-struct command peercmds[] =
+static struct command peercmds[] =
{
{"$MyNick", cc(cmd_mynick)},
{"$Lock", cc(cmd_peerlock)},
static void dctransdetach(struct transfer *transfer, struct dcpeer *peer)
{
- CBUNREG(transfer, trans_filterout, peer);
+ CBUNREG(transfer, trans_filterout, trresumecb, peer);
if(peer->freeing)
return;
peer->transfer = NULL;
{
int ret;
void *buf;
- char outbuf[1024];
+ unsigned char outbuf[1024];
z_stream *cstr;
size_t bufsize;
transfersetstate(transfer, TRNS_HS);
socksettos(peer->sk, confgetint("fnet", "fnptos"));
transfer->flags.b.minislot = 0;
- peer->sk->writecb = NULL;
+ CBUNREG(peer->sk, socket_write, transwrite, peer);
}
}
}
peer->sk->ignread = 0;
}
-static void transread(struct socket *sk, struct dcpeer *peer)
+static void transread(struct dcpeer *peer)
{
- void *buf;
- size_t bufsize;
+ size_t num;
struct transfer *transfer;
- if((buf = sockgetinbuf(sk, &bufsize)) == NULL)
- return;
if(peer->transfer == NULL)
{
- free(buf);
freedcpeer(peer);
return;
}
- transferputdata(peer->transfer, buf, bufsize);
- free(buf);
+ if(peer->inbufsize > peer->transfer->size - peer->transfer->curpos)
+ num = peer->transfer->size - peer->transfer->curpos;
+ else
+ num = peer->inbufsize;
+ transferputdata(peer->transfer, peer->inbuf, num);
+ memmove(peer->inbuf, peer->inbuf + num, peer->inbufsize -= num);
if(peer->transfer->curpos >= peer->transfer->size)
{
transfer = peer->transfer;
return;
}
if(transferdatasize(peer->transfer) > 65535)
- sk->ignread = 1;
+ peer->sk->ignread = 1;
}
-static void transerr(struct socket *sk, int err, struct dcpeer *peer)
+static void transerr(struct dcpeer *peer)
{
struct transfer *transfer;
if((transfer = peer->transfer) == NULL)
- {
- freedcpeer(peer);
return;
- }
transferdetach(transfer);
transferendofdata(transfer);
}
-static void transwrite(struct socket *sk, struct dcpeer *peer)
+static int transwrite(struct socket *sk, struct dcpeer *peer)
{
if((peer->state != PEER_TRNS) && (peer->state != PEER_SYNC))
- return;
+ return(1);
if(peer->transfer == NULL)
{
freedcpeer(peer);
- return;
+ return(1);
}
dctransgotdata(peer->transfer, peer);
+ return(0);
}
-static void udpread(struct socket *sk, void *data)
+static int udpread(struct socket *sk, void *data)
{
char *buf, *p, *p2, *hashbuf;
size_t buflen, hashlen;
char *nick, *filename, *hubname;
+ struct sockaddr_in hubaddr;
int size, slots;
struct fnetnode *fn, *myfn;
struct dchub *hub;
struct hash *hash;
if((buf = sockgetinbuf(sk, &buflen)) == NULL)
- return;
+ return(0);
buf = srealloc(buf, buflen + 1);
buf[buflen] = 0;
if(!strncmp(buf, "$SR ", 4))
if((p2 = strchr(p, ' ')) == NULL)
{
free(buf);
- return;
+ return(0);
}
*p2 = 0;
p = p2 + 1;
if((p2 = strchr(p, 5)) == NULL)
{
free(buf);
- return;
+ return(0);
}
*p2 = 0;
p = p2 + 1;
if((p2 = strchr(p, ' ')) == NULL)
{
free(buf);
- return;
+ return(0);
}
*p2 = 0;
size = atoi(p);
if((p2 = strchr(p, '/')) == NULL)
{
free(buf);
- return;
+ return(0);
}
*p2 = 0;
slots = atoi(p);
if((p2 = strchr(p, 5)) == NULL)
{
free(buf);
- return;
+ return(0);
}
p = p2 + 1;
hubname = p;
if((p2 = strstr(p, " (")) == NULL)
{
free(buf);
- return;
+ return(0);
}
*p2 = 0;
- if((wnick = icmbstowcs(nick, DCCHARSET)) == NULL)
+ p = p2 + 2;
+ if((p2 = strchr(p, ':')) == NULL)
{
free(buf);
- return;
+ return(0);
}
+ *(p2++) = 0;
+ hubaddr.sin_family = AF_INET;
+ if(!inet_aton(p, &hubaddr.sin_addr))
+ {
+ free(buf);
+ return(0);
+ }
+ p = p2;
+ if((p2 = strchr(p, ')')) == NULL)
+ {
+ free(buf);
+ return(0);
+ }
+ *p2 = 0;
+ hubaddr.sin_port = htons(atoi(p));
+ /* Use DCCHARSET in $Get paths until further researched... */
if((wfile = icmbstowcs(filename, DCCHARSET)) == NULL)
{
- free(wnick);
free(buf);
- return;
+ return(0);
}
myfn = NULL;
hash = NULL;
}
}
}
+ if(myfn == NULL)
+ {
+ for(fn = fnetnodes; fn != NULL; fn = fn->next)
+ {
+ if((fn->fnet == &dcnet) && (fn->sk != NULL) && addreq(fn->sk->remote, (struct sockaddr *)&hubaddr))
+ {
+ myfn = fn;
+ break;
+ }
+ }
+ }
+ hub = NULL;
+ if(myfn != NULL)
+ hub = myfn->data;
+ if((wnick = icmbstowcs(nick, (hub == NULL)?DCCHARSET:(hub->charset))) == NULL)
+ {
+ free(buf);
+ return(0);
+ }
sr = newsrchres(&dcnet, wfile, wnick);
if(sr->peernick != NULL)
free(sr->peernick);
freesrchres(sr);
}
free(buf);
+ return(0);
}
static void hubread(struct socket *sk, struct fnetnode *fn)
char *buf;
hub = fn->data;
- if((buf = icwcstombs(newnick, DCCHARSET)) == NULL)
+ if((buf = icwcstombs(newnick, (hub == NULL)?DCCHARSET:(hub->charset))) == NULL)
return(1);
if((strchr(buf, ' ') != NULL) || (strchr(buf, '|') != NULL) || (strchr(buf, '$') != NULL))
{
{
struct dchub *new;
wchar_t *emu;
+ wchar_t *wcharset;
+ char *charset;
new = smalloc(sizeof(*new));
memset(new, 0, sizeof(*new));
if(*emu == L'n')
new->dcppemu = 0;
}
+ charset = NULL;
+ if((wcharset = wpfind(fn->args, L"charset")) != NULL)
+ {
+ if((charset = icwcstombs(wcharset, "US-ASCII")) != NULL)
+ {
+ if(!havecharset(charset))
+ {
+ free(charset);
+ charset = NULL;
+ }
+ }
+ }
+ if(charset != NULL)
+ new->charset = charset;
+ else
+ new->charset = sstrdup(DCCHARSET);
if(hubsetnick(fn, fn->mynick))
fnetsetnick(fn, L"DoldaConnectUser-IN");
/* IN as in Invalid Nick */
}
if(peer->timeout != NULL)
canceltimer(peer->timeout);
- if(peer->sk->data == peer)
- peer->sk->data = NULL;
- peer->sk->readcb = NULL;
- peer->sk->writecb = NULL;
- peer->sk->errcb = NULL;
+ /* XXX: Unregister transwrite from peer->sk->socket_write? */
+ CBUNREG(peer->sk, socket_read, peerread, peer);
+ CBUNREG(peer->sk, socket_err, peererror, peer);
putsock(peer->sk);
endcompress(peer);
if(peer->supports != NULL)
free(peer->wcsname);
if(peer->nativename != NULL)
free(peer->nativename);
+ if(peer->charset != NULL)
+ free(peer->charset);
if(peer->fn != NULL)
putfnetnode(peer->fn);
while((qcmd = ulqcmd(&peer->queue)) != NULL)
static void hubconnect(struct fnetnode *fn)
{
- fn->sk->readcb = (void (*)(struct socket *, void *))hubread;
- fn->sk->errcb = (void (*)(struct socket *, int, void *))huberr;
- getfnetnode(fn);
+ CBREG(fn->sk, socket_read, (int (*)(struct socket *, void *))hubread, (void (*)(void *))putfnetnode, getfnetnode(fn));
+ CBREG(fn->sk, socket_err, (int (*)(struct socket *, int, void *))huberr, (void (*)(void *))putfnetnode, getfnetnode(fn));
fn->data = newdchub(fn);
- fn->sk->data = fn;
return;
}
hub = (struct dchub *)fn->data;
if(fn->sk != NULL)
{
- if(fn->sk->data == fn)
- {
- fn->sk->data = NULL;
- putfnetnode(fn);
- }
+ CBUNREG(fn->sk, socket_read, hubread, fn);
+ CBUNREG(fn->sk, socket_err, huberr, fn);
}
if(hub == NULL)
return;
free(hub->nativename);
if(hub->nativenick != NULL)
free(hub->nativenick);
+ if(hub->charset != NULL)
+ free(hub->charset);
if(hub->inbuf != NULL)
free(hub->inbuf);
free(hub);
.filebasename = dcbasename
};
-static void peerread(struct socket *sk, struct dcpeer *peer)
+static void cmdread(struct dcpeer *peer)
{
- char *newbuf, *p;
- size_t datalen;
+ char *p;
struct command *cmd;
+ p = peer->inbuf;
+ 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)] == '|')))
+ break;
+ }
+ memmove(peer->inbuf, p, peer->inbufdata -= p - peer->inbuf);
+ if(cmd->stop)
+ {
+ peer->state = PEER_STOP;
+ break;
+ }
+ }
+}
+
+static int peerread(struct socket *sk, struct dcpeer *peer)
+{
+ char *newbuf;
+ size_t datalen;
+
if((newbuf = sockgetinbuf(sk, &datalen)) == NULL)
- return;
+ return(0);
sizebuf2(peer->inbuf, peer->inbufdata + datalen, 1);
memcpy(peer->inbuf + peer->inbufdata, newbuf, datalen);
free(newbuf);
peer->inbufdata += datalen;
if(peer->state == PEER_CMD)
{
- p = peer->inbuf;
- 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)] == '|')))
- break;
- }
- memmove(peer->inbuf, p, peer->inbufdata -= p - peer->inbuf);
- if(cmd->stop)
- {
- peer->state = PEER_STOP;
- break;
- }
- }
+ cmdread(peer);
+ } else if(peer->state == PEER_TRNS) {
+ transread(peer);
} else if(peer->state == PEER_TTHL) {
handletthl(peer);
}
+ return(0);
}
-static void peererror(struct socket *sk, int err, struct dcpeer *peer)
+static int peererror(struct socket *sk, int err, struct dcpeer *peer)
{
+ if(peer->state == PEER_TRNS)
+ transerr(peer);
freedcpeer(peer);
+ return(0);
}
-static void peerconnect(struct socket *sk, int err, struct fnetnode *fn)
+static int peerconnect(struct socket *sk, int err, struct fnetnode *fn)
{
struct dcpeer *peer;
struct dchub *hub;
if(err != 0)
{
putfnetnode(fn);
- return;
+ putsock(sk);
+ return(1);
}
hub = fn->data;
peer = newdcpeer(sk);
peer->fn = fn;
peer->accepted = 0;
peer->dcppemu = hub->dcppemu;
- sk->readcb = (void (*)(struct socket *, void *))peerread;
- sk->errcb = (void (*)(struct socket *, int, void *))peererror;
- sk->data = peer;
+ CBREG(sk, socket_read, (int (*)(struct socket *, void *))peerread, NULL, peer);
+ CBREG(sk, socket_err, (int (*)(struct socket *, int, void *))peererror, NULL, peer);
socksettos(sk, confgetint("fnet", "fnptos"));
putsock(sk);
peer->timeout = timercallback(ntime() + 180, (void (*)(int, void *))peertimeout, peer);
sendmynick(peer);
sendpeerlock(peer);
+ return(1);
}
-static void peeraccept(struct socket *sk, struct socket *newsk, void *data)
+static int peeraccept(struct socket *sk, struct socket *newsk, void *data)
{
struct dcpeer *peer;
peer = newdcpeer(newsk);
peer->accepted = 1;
- newsk->readcb = (void (*)(struct socket *, void *))peerread;
- newsk->errcb = (void (*)(struct socket *, int, void *))peererror;
- newsk->data = peer;
+ CBREG(sk, socket_read, (int (*)(struct socket *, void *))peerread, NULL, peer);
+ CBREG(sk, socket_err, (int (*)(struct socket *, int, void *))peererror, NULL, peer);
socksettos(newsk, confgetint("fnet", "fnptos"));
peer->timeout = timercallback(ntime() + 180, (void (*)(int, void *))peertimeout, peer);
+ return(0);
}
static void updatehmlist(void)
while(1)
{
ic = 0;
+ /* Use DCCHARSET in $Get paths until further researched... */
if((buf2 = icwcstombs(node->name, DCCHARSET)) != NULL)
{
for(i = 0; i < lev; i++)
fclose(real);
}
-static int shareupdate(unsigned long long uusharesize, void *data)
+static void listtimercb(int cancelled, void *uudata)
+{
+ listwritetimer = NULL;
+ if(!cancelled)
+ updatelists(1);
+}
+
+static void updatelists(int now)
{
+ if((hmlistname == NULL) || (xmllistname == NULL) || (xmlbz2listname == NULL))
+ now = 1;
+ if(!now)
+ {
+ if(listwritetimer == NULL)
+ listwritetimer = timercallback(ntime() + 300, listtimercb, NULL);
+ return;
+ }
+ if(listwritetimer != NULL)
+ canceltimer(listwritetimer);
updatehmlist();
updatexmllist();
updatexmlbz2list();
+}
+
+static int shareupdate(unsigned long long uusharesize, void *data)
+{
+ updatelists(0);
return(0);
}
flog(LOG_WARNING, "could not create new DC UDP socket, reverting to old: %s", strerror(errno));
return(0);
}
- newsock->readcb = udpread;
+ CBREG(newsock, socket_read, udpread, NULL, NULL);
if(udpsock != NULL)
putsock(udpsock);
udpsock = newsock;
flog(LOG_CRIT, "could not create DC UDP socket: %s", strerror(errno));
return(1);
}
- udpsock->readcb = udpread;
+ CBREG(udpsock, socket_read, udpread, NULL, NULL);
addr.sin_port = htons(confgetint("dc", "tcpport"));
if((tcpsock = 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");
Dolda2000 GitWeb / doldaconnect.git / blobdiff