X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Ffnet-dc.c;h=804bd2c70838c955af73b717d89a284d8893d115;hb=5ec60e4217863b0e2d6a86ba3f60f60c68608227;hp=ed01d06a468a4a42e8dd186f967272787d917973;hpb=485090895614fdf8c01ea9f0c8d32e43a623ddd4;p=doldaconnect.git

diff --git a/daemon/fnet-dc.c b/daemon/fnet-dc.c
index ed01d06..804bd2c 100644
--- a/daemon/fnet-dc.c
+++ b/daemon/fnet-dc.c
@@ -44,7 +44,7 @@
 #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
@@ -106,7 +106,8 @@ struct dchub
     char *inbuf;
     size_t inbufdata, inbufsize;
     struct qcommand *queue;
-    int extended;
+    int extended, dcppemu;
+    char *charset;
     char *nativename;
     char *nativenick;
 };
@@ -128,16 +129,18 @@ struct dcpeer
     size_t inbufdata, inbufsize;
     size_t curread, totalsize;
     int freeing;
+    struct timer *timeout;
     struct qcommand *queue;
     struct transfer *transfer;
     int state;
     int ptclose;      /* Close after transfer is complete */
     int accepted;     /* If false, we connected, otherwise, we accepted */
-    int extended;
+    int extended, dcppemu;
     int direction;    /* Using the constants from transfer.h */
     int compress;
-    int hascurpos, notthl;
+    int hascurpos, fetchingtthl, notthl;
     struct tigertreehash tth;
+    char *charset;
     void *cprsdata;
     char *key;
     char *nativename;
@@ -155,16 +158,20 @@ static struct dcexppeer *expected = NULL;
 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)
 {
@@ -387,7 +394,9 @@ static void hubrecvchat(struct socket *sk, struct fnetnode *fn, char *from, char
     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));
@@ -395,7 +404,7 @@ static void hubrecvchat(struct socket *sk, struct fnetnode *fn, char *from, char
     {
 	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 {
@@ -413,7 +422,7 @@ static void hubrecvchat(struct socket *sk, struct fnetnode *fn, char *from, char
 		*(p++) = 0;
 		if(*p == ' ')
 		    p++;
-		if((wpeer = icmbstowcs(string + 1, DCCHARSET)) == NULL)
+		if((wpeer = icmbstowcs(string + 1, hub->charset)) == NULL)
 		    return;
 		string = p;
 	    }
@@ -421,7 +430,7 @@ static void hubrecvchat(struct socket *sk, struct fnetnode *fn, char *from, char
 	if(wpeer == NULL)
 	    wpeer = swcsdup(L"");
     }
-    if((chat = icmbstowcs(string, DCCHARSET)) == NULL)
+    if((chat = icmbstowcs(string, hub->charset)) == NULL)
     {
 	if(wfrom != NULL)
 	    free(wfrom);
@@ -444,6 +453,14 @@ static void hubrecvchat(struct socket *sk, struct fnetnode *fn, char *from, char
     free(chat);
 }
 
+static void peertimeout(int cancelled, struct dcpeer *peer)
+{
+    peer->timeout = NULL;
+    if(cancelled)
+	return;
+    freedcpeer(peer);
+}
+
 static void sendadc(struct socket *sk, char *arg)
 {
     char *buf;
@@ -577,6 +594,7 @@ static char *getadcid(struct dcpeer *peer)
     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"))
@@ -614,31 +632,29 @@ static int trresumecb(struct transfer *transfer, wchar_t *cmd, wchar_t *arg, str
 
 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)
 {
-#ifdef DCPP_MASQUERADE
-    qstrf(peer->sk, "$Lock EXTENDEDPROTOCOLABCABCABCABCABCABC Pk=DCPLUSPLUS0.674ABCABC|");
-#else
-    qstrf(peer->sk, "$Lock EXTENDEDPROTOCOLABCABCABCABCABCABC Pk=DOLDA%sABCABCABC|", VERSION);
-#endif
+    if(peer->dcppemu)
+	qstrf(peer->sk, "$Lock EXTENDEDPROTOCOLABCABCABCABCABCABC Pk=DCPLUSPLUS0.674ABCABC|");
+    else
+	qstrf(peer->sk, "$Lock EXTENDEDPROTOCOLABCABCABCABCABCABC Pk=DOLDA%sABCABCABC|", VERSION);
 }
 
 static void sendsupports(struct dcpeer *peer)
 {
-#ifdef DCPP_MASQUERADE
-    qstr(peer->sk, "$Supports MiniSlots XmlBZList ADCGet TTHL TTHF GetZBlock ZLIG |");
-#else
-    qstr(peer->sk, "$Supports MiniSlots XmlBZList ADCGet TTHL TTHF GetZBlock ZLIG|");
-#endif
+    if(peer->dcppemu)
+	qstr(peer->sk, "$Supports MiniSlots XmlBZList ADCGet TTHL TTHF GetZBlock ZLIG |");
+    else
+	qstr(peer->sk, "$Supports MiniSlots XmlBZList ADCGet TTHL TTHF GetZBlock ZLIG|");
 }
 
 static void requestfile(struct dcpeer *peer)
@@ -647,6 +663,7 @@ 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)
 	{
 	    transferseterror(peer->transfer, TRNSE_NOTFOUND);
@@ -676,6 +693,7 @@ static void requestfile(struct dcpeer *peer)
 	    sendadc(peer->sk, "0");
 	    sendadc(peer->sk, "-1");
 	    qstr(peer->sk, "|");
+	    peer->fetchingtthl = 1;
 	    return;
 	}
     }
@@ -714,6 +732,7 @@ static void requestfile(struct dcpeer *peer)
 	}
 	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);
@@ -729,29 +748,36 @@ static void sendmyinfo(struct socket *sk, struct fnetnode *fn)
     struct dchub *hub;
     char *buf;
     struct fnetnode *cfn;
-    int numhubs;
+    int hn1, hn2, hn3;
     
     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);
-    numhubs = 0;
+    hn1 = hn2 = hn3 = 0;
     for(cfn = fnetnodes; cfn != NULL; cfn = cfn->next)
     {
 	if((cfn->state == FNN_EST) || (cfn->state == FNN_HS))
-	    numhubs++;
+	{
+	    if(cfn->regstatus == FNNS_OP)
+		hn3++;
+	    else if(cfn->regstatus == FNNS_REG)
+		hn2++;
+	    else
+		hn1++;
+	}
     }
-    qstrf(sk, "<%s V:%s,M:%c,H:%i/0/0,S:%i>",
-	  DCIDTAG,
-	  DCIDTAGV,
+    qstrf(sk, "<%s V:%s,M:%c,H:%i/%i/%i,S:%i>",
+	  (hub->dcppemu)?"++":"Dolda",
+	  (hub->dcppemu)?"0.674":VERSION,
 	  (tcpsock == NULL)?'P':'A',
-	  numhubs,
+	  hn1, hn2, hn3,
 	  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);
 }
@@ -790,11 +816,10 @@ static void cmd_lock(struct socket *sk, struct fnetnode *fn, char *cmd, char *ar
 	*(p++) = 0;
     if(hub->extended)
     {
-#ifdef DCPP_MASQUERADE
-	qstrf(sk, "$Supports UserCommand NoGetINFO NoHello UserIP2 TTHSearch GetZBlock |");
-#else
-	qstrf(sk, "$Supports UserCommand NoGetINFO NoHello UserIP2 TTHSearch GetZBlock|");
-#endif
+	if(hub->dcppemu)
+	    qstrf(sk, "$Supports UserCommand NoGetINFO NoHello UserIP2 TTHSearch GetZBlock |");
+	else
+	    qstrf(sk, "$Supports UserCommand NoGetINFO NoHello UserIP2 TTHSearch GetZBlock|");
     }
     key = dcmakekey(args);
     qstrf(sk, "$Key %s|", key);
@@ -811,7 +836,7 @@ static void cmd_hubname(struct socket *sk, struct fnetnode *fn, char *cmd, char
     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);
@@ -824,7 +849,7 @@ static void cmd_hello(struct socket *sk, struct fnetnode *fn, char *cmd, char *a
     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);
@@ -839,7 +864,7 @@ static void cmd_quit(struct socket *sk, struct fnetnode *fn, char *cmd, char *ar
     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);
@@ -860,7 +885,7 @@ static void cmd_nicklist(struct socket *sk, struct fnetnode *fn, char *cmd, char
     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);
@@ -893,7 +918,7 @@ static void cmd_oplist(struct socket *sk, struct fnetnode *fn, char *cmd, char *
     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;
@@ -920,7 +945,7 @@ static void cmd_myinfo(struct socket *sk, struct fnetnode *fn, char *cmd, char *
     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);
@@ -929,9 +954,9 @@ static void cmd_myinfo(struct socket *sk, struct fnetnode *fn, char *cmd, char *
     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';
@@ -958,7 +983,7 @@ static void cmd_myinfo(struct socket *sk, struct fnetnode *fn, char *cmd, char *
     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);
@@ -966,7 +991,7 @@ static void cmd_myinfo(struct socket *sk, struct fnetnode *fn, char *cmd, char *
     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);
@@ -996,7 +1021,7 @@ static void cmd_forcemove(struct socket *sk, struct fnetnode *fn, char *cmd, cha
     } 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);
@@ -1006,7 +1031,7 @@ static void cmd_forcemove(struct socket *sk, struct fnetnode *fn, char *cmd, cha
 	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;
@@ -1015,15 +1040,15 @@ static char *getdcpath(struct sharecache *node, size_t *retlen)
 	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);
@@ -1062,7 +1087,8 @@ static void cmd_search(struct socket *sk, struct fnetnode *fn, char *cmd, char *
     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];
@@ -1145,14 +1171,15 @@ static void cmd_search(struct socket *sk, struct fnetnode *fn, char *cmd, char *
 		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++;
 		}
 	    }
@@ -1200,7 +1227,8 @@ static void cmd_search(struct socket *sk, struct fnetnode *fn, char *cmd, char *
 	}
 	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)
 		{
@@ -1274,7 +1302,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);
+    newsk = netcsconn((struct sockaddr *)&addr, sizeof(addr), (int (*)(struct socket *, int, void *))peerconnect, fn);
     getfnetnode(fn);
     hubhandleaction(sk, fn, cmd, args);
 }
@@ -1286,7 +1314,7 @@ static void sendctm(struct socket *sk, char *nick)
     
     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));
@@ -1391,8 +1419,9 @@ static void cmd_sr(struct socket *sk, struct fnetnode *fn, char *cmd, char *args
     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);
@@ -1429,35 +1458,42 @@ static void cmd_usercommand(struct socket *sk, struct fnetnode *fn, char *cmd, c
 static void cmd_getpass(struct socket *sk, struct fnetnode *fn, char *cmd, char *args)
 {
     struct dchub *hub;
-    struct wcspair *arg;
+    wchar_t *pw;
     char *mbspw;
     
     hub = fn->data;
-    for(arg = fn->args; arg != NULL; arg = arg->next)
-    {
-	if(!wcscmp(arg->key, L"password"))
-	    break;
-    }
-    if((arg == NULL) || ((mbspw = icwcstombs(arg->val, DCCHARSET)) == NULL))
+    pw = wpfind(fn->args, L"password");
+    if((pw == NULL) || ((mbspw = icwcstombs(pw, hub->charset)) == NULL))
     {
 	killfnetnode(fn);
 	return;
     }
     qstrf(sk, "$MyPass %s|", mbspw);
     free(mbspw);
+    fn->regstatus = FNNS_REG;
+    hubhandleaction(sk, fn, cmd, args);
+}
+
+static void cmd_logedin(struct socket *sk, struct fnetnode *fn, char *cmd, char *args)
+{
+    struct dchub *hub;
+    
+    hub = fn->data;
+    fn->regstatus = FNNS_OP;
     hubhandleaction(sk, fn, cmd, args);
 }
 
 static void cmd_mynick(struct socket *sk, struct dcpeer *peer, char *cmd, char *args)
 {
     struct dcexppeer *expect;
+    struct dchub *hub;
 
     if(peer->nativename != NULL)
 	free(peer->nativename);
     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;
@@ -1473,8 +1509,10 @@ static void cmd_mynick(struct socket *sk, struct dcpeer *peer, char *cmd, char *
 	{
 	    peer->fn = NULL;
 	} else {
+	    hub = expect->fn->data;
 	    peer->fn = expect->fn;
 	    getfnetnode(peer->fn);
+	    peer->dcppemu = hub->dcppemu;
 	    freeexppeer(expect);
 	}
     }
@@ -1511,6 +1549,11 @@ static void cmd_direction(struct socket *sk, struct dcpeer *peer, char *cmd, cha
 	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)
@@ -1557,6 +1600,11 @@ static void cmd_peerlock(struct socket *sk, struct dcpeer *peer, char *cmd, char
 	    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 {
@@ -1568,6 +1616,7 @@ static void cmd_peerlock(struct socket *sk, struct dcpeer *peer, char *cmd, char
 	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);
@@ -1582,22 +1631,25 @@ static void cmd_key(struct socket *sk, struct dcpeer *peer, char *cmd, char *arg
 
 static void startdl(struct dcpeer *peer)
 {
+    if(peer->timeout != NULL)
+	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)
 {
+    if(peer->timeout != NULL)
+	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)
 {
     int size;
+    struct transfer *transfer;
     
     if(peer->transfer == NULL)
     {
@@ -1608,7 +1660,9 @@ static void cmd_filelength(struct socket *sk, struct dcpeer *peer, char *cmd, ch
     if(peer->transfer->size != size)
     {
 	transfersetsize(peer->transfer, size);
+	transfer = peer->transfer;
 	freedcpeer(peer);
+	trytransferbypeer(transfer->fnet, transfer->peerid);
 	return;
     }
     startdl(peer);
@@ -1617,6 +1671,13 @@ static void cmd_filelength(struct socket *sk, struct dcpeer *peer, char *cmd, ch
 
 static void cmd_error(struct socket *sk, struct dcpeer *peer, char *cmd, char *args)
 {
+    if(peer->fetchingtthl)
+    {
+	peer->fetchingtthl = 0;
+	peer->notthl = 1;
+	requestfile(peer);
+	return;
+    }
     if((peer->transfer != NULL) && (peer->transfer->dir == TRNSD_DOWN))
     {
 	transferseterror(peer->transfer, TRNSE_NOTFOUND);
@@ -1750,15 +1811,11 @@ static void cmd_get(struct socket *sk, struct dcpeer *peer, char *cmd, char *arg
     } else if(fd >= 0) {
 	if((buf2 = icsmbstowcs(args, DCCHARSET, NULL)) != NULL)
 	    transfersetpath(peer->transfer, buf2);
+	peer->transfer->flags.b.minislot = 1;
     }
     if(fd < 0)
     {
-	if(slotsleft() < 1)
-	{
-	    qstr(sk, "$MaxedOut|");
-	    freedcpeer(peer);
-	    return;
-	}
+	/* Use DCCHARSET in $Get paths until further researched... */
 	if((node = resdcpath(args, DCCHARSET, '\\')) == NULL)
 	{
 	    qstrf(sk, "$Error File not in share|");
@@ -1786,6 +1843,14 @@ static void cmd_get(struct socket *sk, struct dcpeer *peer, char *cmd, char *arg
 	freedcpeer(peer);
 	return;
     }
+    if(sb.st_size < 65536)
+	peer->transfer->flags.b.minislot = 1;
+    if(!peer->transfer->flags.b.minislot && (slotsleft() < 1)) {
+	close(fd);
+	qstr(sk, "$MaxedOut|");
+	freedcpeer(peer);
+	return;
+    }
     if((offset != 0) && (lseek(fd, offset, SEEK_SET) < 0))
     {
 	close(fd);
@@ -1879,6 +1944,7 @@ static void cmd_getblock(struct socket *sk, struct dcpeer *peer, char *cmd, char
     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);
@@ -1889,14 +1955,10 @@ static void cmd_getblock(struct socket *sk, struct dcpeer *peer, char *cmd, char
     } else if(fd >= 0) {
 	if((buf2 = icsmbstowcs(args, charset, NULL)) != NULL)
 	    transfersetpath(peer->transfer, buf2);
+	peer->transfer->flags.b.minislot = 1;
     }
     if(fd < 0)
     {
-	if(slotsleft() < 1)
-	{
-	    qstr(sk, "$MaxedOut|");
-	    return;
-	}
 	if((node = resdcpath(p, charset, '\\')) == NULL)
 	{
 	    qstr(sk, "$Error File not in cache|");
@@ -1921,6 +1983,13 @@ static void cmd_getblock(struct socket *sk, struct dcpeer *peer, char *cmd, char
 	qstr(sk, "$Error|");
 	return;
     }
+    if(sb.st_size < 65536)
+	peer->transfer->flags.b.minislot = 1;
+    if(!peer->transfer->flags.b.minislot && (slotsleft() < 1)) {
+	close(fd);
+	qstr(sk, "$MaxedOut|");
+	return;
+    }
     if((start != 0) && ((start >= sb.st_size) || (lseek(fd, start, SEEK_SET) < 0)))
     {
 	close(fd);
@@ -1973,14 +2042,10 @@ static void cmd_adcget(struct socket *sk, struct dcpeer *peer, char *cmd, char *
     } else if(fd >= 0) {
 	if((wbuf = icsmbstowcs(argv[1], "UTF-8", NULL)) != NULL)
 	    transfersetpath(peer->transfer, wbuf);
+	peer->transfer->flags.b.minislot = 1;
     }
     if(fd < 0)
     {
-	if(slotsleft() < 1)
-	{
-	    qstr(sk, "$MaxedOut|");
-	    goto out;
-	}
 	if(!strncmp(argv[1], "TTH/", 4))
 	{
 	    if((node = findbytth(argv[1] + 4)) == NULL)
@@ -2020,6 +2085,12 @@ static void cmd_adcget(struct socket *sk, struct dcpeer *peer, char *cmd, char *
 	    qstr(sk, "$Error|");
 	    goto out;
 	}
+	if(sb.st_size < 65536)
+	    peer->transfer->flags.b.minislot = 1;
+	if(!peer->transfer->flags.b.minislot && (slotsleft() < 1)) {
+	    qstr(sk, "$MaxedOut|");
+	    goto out;
+	}
 	if((start != 0) && ((start >= sb.st_size) || (lseek(fd, start, SEEK_SET) < 0)))
 	{
 	    qstr(sk, "$Error Offset out of range|");
@@ -2083,6 +2154,8 @@ static void handletthl(struct dcpeer *peer)
     }
     if(peer->curread >= peer->totalsize)
     {
+	if(peer->timeout == NULL)
+	    peer->timeout = timercallback(ntime() + 180, (void (*)(int, void *))peertimeout, peer);
 	peer->state = PEER_CMD;
 	synctigertree(&peer->tth);
 	restigertree(&peer->tth, buf);
@@ -2121,9 +2194,12 @@ static void cmd_adcsnd(struct socket *sk, struct dcpeer *peer, char *cmd, char *
 	    freedcpeer(peer);
 	    goto out;
 	}
+	if(peer->timeout != NULL)
+	    canceltimer(peer->timeout);
 	peer->state = PEER_TTHL;
 	peer->totalsize = numbytes;
 	peer->curread = 0;
+	peer->fetchingtthl = 0;
 	inittigertree(&peer->tth);
 	handletthl(peer);
     } else if(!strcmp(argv[0], "file")) {
@@ -2139,12 +2215,7 @@ static void cmd_adcsnd(struct socket *sk, struct dcpeer *peer, char *cmd, char *
 	    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);
@@ -2172,12 +2243,7 @@ static void cmd_sending(struct socket *sk, struct dcpeer *peer, char *cmd, char
 	return;
     }
     startdl(peer);
-    if(peer->inbufdata > 0)
-    {
-	sockpushdata(sk, peer->inbuf, peer->inbufdata);
-	peer->inbufdata = 0;
-	transread(sk, peer);
-    }
+    transread(peer);
 }
 
 /*
@@ -2212,7 +2278,7 @@ static int hubreqconn(struct fnetpeer *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)
     {
@@ -2231,12 +2297,12 @@ static int hubsendchat(struct fnetnode *fn, int public, wchar_t *to, wchar_t *st
     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);
@@ -2351,8 +2417,10 @@ static struct hash *findsehash(struct sexpr *sexpr)
 	    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;
@@ -2406,10 +2474,10 @@ static int hubsearch(struct fnetnode *fn, struct search *srch, struct srchfnnlis
 	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);
 	}
@@ -2417,6 +2485,7 @@ static int hubsearch(struct fnetnode *fn, struct search *srch, struct srchfnnlis
 	{
 	    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
@@ -2454,7 +2523,7 @@ static int hubsearch(struct fnetnode *fn, struct search *srch, struct srchfnnlis
     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 {
@@ -2475,7 +2544,7 @@ static int hubsearch(struct fnetnode *fn, struct search *srch, struct srchfnnlis
 #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)},
@@ -2494,10 +2563,11 @@ struct command hubcmds[] =
     {"$SR", cc(cmd_sr)},
     {"$UserCommand", cc(cmd_usercommand)},
     {"$GetPass", cc(cmd_getpass)},
+    {"$LogedIn", cc(cmd_logedin)}, /* sic */
     {NULL, NULL}
 };
 
-struct command peercmds[] =
+static struct command peercmds[] =
 {
     {"$MyNick", cc(cmd_mynick)},
     {"$Lock", cc(cmd_peerlock)},
@@ -2522,7 +2592,7 @@ struct command peercmds[] =
 
 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;
@@ -2533,7 +2603,7 @@ static void dctransgotdata(struct transfer *transfer, struct dcpeer *peer)
 {
     int ret;
     void *buf;
-    char outbuf[1024];
+    unsigned char outbuf[1024];
     z_stream *cstr;
     size_t bufsize;
     
@@ -2590,11 +2660,14 @@ static void dctransgotdata(struct transfer *transfer, struct dcpeer *peer)
 		{
 		    freedcpeer(peer);
 		} else {
+		    if(peer->timeout == NULL)
+			peer->timeout = timercallback(ntime() + 180, (void (*)(int, void *))peertimeout, peer);
 		    peer->state = PEER_CMD;
 		    endcompress(peer);
 		    transfersetstate(transfer, TRNS_HS);
 		    socksettos(peer->sk, confgetint("fnet", "fnptos"));
-		    peer->sk->writecb = NULL;
+		    transfer->flags.b.minislot = 0;
+		    CBUNREG(peer->sk, socket_write, transwrite, peer);
 		}
 	    }
 	}
@@ -2613,22 +2686,22 @@ static void dcwantdata(struct transfer *transfer, struct dcpeer *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;
@@ -2637,39 +2710,38 @@ static void transread(struct socket *sk, struct dcpeer *peer)
 	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;
@@ -2678,7 +2750,7 @@ static void udpread(struct socket *sk, void *data)
     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))
@@ -2688,7 +2760,7 @@ static void udpread(struct socket *sk, void *data)
 	if((p2 = strchr(p, ' ')) == NULL)
 	{
 	    free(buf);
-	    return;
+	    return(0);
 	}
 	*p2 = 0;
 	p = p2 + 1;
@@ -2696,14 +2768,14 @@ static void udpread(struct socket *sk, void *data)
 	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);
@@ -2711,7 +2783,7 @@ static void udpread(struct socket *sk, void *data)
 	if((p2 = strchr(p, '/')) == NULL)
 	{
 	    free(buf);
-	    return;
+	    return(0);
 	}
 	*p2 = 0;
 	slots = atoi(p);
@@ -2719,26 +2791,42 @@ static void udpread(struct socket *sk, void *data)
 	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;
@@ -2768,6 +2856,25 @@ static void udpread(struct socket *sk, void *data)
 		}
 	    }
 	}
+	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);
@@ -2784,6 +2891,7 @@ static void udpread(struct socket *sk, void *data)
 	freesrchres(sr);
     }
     free(buf);
+    return(0);
 }
 
 static void hubread(struct socket *sk, struct fnetnode *fn)
@@ -2824,7 +2932,7 @@ static int hubsetnick(struct fnetnode *fn, wchar_t *newnick)
     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))
     {
@@ -2845,10 +2953,38 @@ static int hubsetnick(struct fnetnode *fn, wchar_t *newnick)
 static struct dchub *newdchub(struct fnetnode *fn)
 {
     struct dchub *new;
+    wchar_t *emu;
+    wchar_t *wcharset;
+    char *charset;
     
     new = smalloc(sizeof(*new));
     memset(new, 0, sizeof(*new));
     fn->data = new;
+    if(confgetint("dc", "dcppemu"))
+	new->dcppemu = 1;
+    if((emu = wpfind(fn->args, L"dcppemu")) != NULL)
+    {
+	if(*emu == L'y')
+	    new->dcppemu = 1;
+	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 */
@@ -2864,6 +3000,8 @@ static struct dcpeer *newdcpeer(struct socket *sk)
     new->transfer = NULL;
     getsock(sk);
     new->sk = sk;
+    if(confgetint("dc", "dcppemu"))
+	new->dcppemu = 1;
     new->next = peers;
     new->prev = NULL;
     if(peers != NULL)
@@ -2893,11 +3031,11 @@ static void freedcpeer(struct dcpeer *peer)
 	    resettransfer(peer->transfer);
 	transferdetach(peer->transfer);
     }
-    if(peer->sk->data == peer)
-	peer->sk->data = NULL;
-    peer->sk->readcb = NULL;
-    peer->sk->writecb = NULL;
-    peer->sk->errcb = NULL;
+    if(peer->timeout != NULL)
+	canceltimer(peer->timeout);
+    /* 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)
@@ -2914,6 +3052,8 @@ static void freedcpeer(struct dcpeer *peer)
 	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)
@@ -2924,11 +3064,9 @@ static void freedcpeer(struct dcpeer *peer)
 
 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;
 }
 
@@ -2940,11 +3078,8 @@ static void hubdestroy(struct fnetnode *fn)
     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;
@@ -2954,6 +3089,8 @@ static void hubdestroy(struct fnetnode *fn)
 	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);
@@ -2988,78 +3125,97 @@ static struct fnet dcnet =
     .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;
-    sk->readcb = (void (*)(struct socket *, void *))peerread;
-    sk->errcb = (void (*)(struct socket *, int, void *))peererror;
-    sk->data = peer;
+    peer->dcppemu = hub->dcppemu;
+    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)
@@ -3077,6 +3233,7 @@ 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++)
@@ -3241,7 +3398,10 @@ static void updatexmllist(void)
     for(i = 0; i < sizeof(cidbuf) - 1; i++)
 	cidbuf[i] = (rand() % ('Z' - 'A' + 1)) + 'A';
     cidbuf[i] = 0;
-    fprintf(fs, "<FileListing Version=\"1\" CID=\"%s\" Base=\"/\" Generator=\"%s\">\r\n", cidbuf, DCIDFULL);
+    if(confgetint("dc", "dcppemu"))
+	fprintf(fs, "<FileListing Version=\"1\" CID=\"%s\" Base=\"/\" Generator=\"DC++ 0.674\">\r\n", cidbuf);
+    else
+	fprintf(fs, "<FileListing Version=\"1\" CID=\"%s\" Base=\"/\" Generator=\"%s\">\r\n", cidbuf, "DoldaConnect" VERSION);
     
     node = shareroot->child;
     lev = 0;
@@ -3286,11 +3446,10 @@ static void updatexmllist(void)
 	}
     }
     
-#ifdef DCPP_MASQUERADE
-    fprintf(fs, "</FileListing>");
-#else
-    fprintf(fs, "</FileListing>\r\n");
-#endif
+    if(confgetint("dc", "dcppemu"))
+	fprintf(fs, "</FileListing>");
+    else
+	fprintf(fs, "</FileListing>\r\n");
     fclose(fs);
 }
 
@@ -3355,11 +3514,33 @@ static void updatexmlbz2list(void)
     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);
 }
 
@@ -3419,6 +3600,9 @@ static int run(void)
 	nextpeer = peer->next;
 	if((qcmd = ulqcmd(&peer->queue)) != NULL)
 	{
+	    if(peer->timeout != NULL)
+		canceltimer(peer->timeout);
+	    peer->timeout = timercallback(ntime() + 180, (void (*)(int, void *))peertimeout, peer);
 	    if(*qcmd->string == '$')
 		dispatchcommand(qcmd, peercmds, peer->sk, peer);
 	    freeqcmd(qcmd);
@@ -3449,7 +3633,7 @@ static int updateudpport(struct configvar *var, void *uudata)
 	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;
@@ -3491,7 +3675,7 @@ static int init(int hup)
 	    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");
@@ -3528,6 +3712,7 @@ static struct configvar myvars[] =
     {CONF_VAR_STRING, "email", {.str = L"spam@spam.org"}},
     {CONF_VAR_INT, "udpport", {.num = 0}},
     {CONF_VAR_INT, "tcpport", {.num = 0}},
+    {CONF_VAR_BOOL, "dcppemu", {.num = 0}},
     {CONF_VAR_END}
 };