X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Ffnet-dc.c;h=01592c6deb1a0aca78fcace2206457f837e6bc15;hb=4b5443306b321ea1e4736c8dcac53486fb23c8b2;hp=1bd90111b04e098816b23f2feb5feb533e156858;hpb=a478552c065cf714a051990b8b72b12ee2de39f8;p=doldaconnect.git

diff --git a/daemon/fnet-dc.c b/daemon/fnet-dc.c
index 1bd9011..01592c6 100644
--- a/daemon/fnet-dc.c
+++ b/daemon/fnet-dc.c
@@ -1,6 +1,6 @@
 /*
  *  Dolda Connect - Modular multiuser Direct Connect-style client
- *  Copyright (C) 2004 Fredrik Tolf (fredrik@dolda2000.com)
+ *  Copyright (C) 2004 Fredrik Tolf <fredrik@dolda2000.com>
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -19,13 +19,11 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <wchar.h>
-#include <malloc.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <alloca.h>
 #include <wctype.h>
 #include <time.h>
 #include <errno.h>
@@ -44,7 +42,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
@@ -103,12 +101,15 @@ struct qcommand
 
 struct dchub
 {
+    struct socket *sk;
     char *inbuf;
     size_t inbufdata, inbufsize;
     struct qcommand *queue;
-    int extended;
+    int extended, dcppemu;
+    char *charset;
     char *nativename;
     char *nativenick;
+    char **supports;
 };
 
 struct dcexppeer
@@ -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,6 +158,7 @@ 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 void freedcpeer(struct dcpeer *peer);
@@ -165,6 +169,7 @@ 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)
 {
@@ -240,6 +245,24 @@ static int isdchash(struct hash *hash)
     return(1);
 }
 
+/*
+ * Uncomment when used!
+ 
+static int hubsupports(struct dchub *hub, char *cap)
+{
+    char **p;
+    
+    if(hub->supports == NULL)
+	return(0);
+    for(p = hub->supports; *p != NULL; p++)
+    {
+	if(!strcasecmp(*p, cap))
+	    return(1);
+    }
+    return(0);
+}
+*/
+
 static int supports(struct dcpeer *peer, char *cap)
 {
     char **p;
@@ -387,7 +410,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 +420,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 +438,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 +446,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 +469,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;
@@ -575,8 +608,12 @@ static char *getadcid(struct dcpeer *peer)
 {
     char *buf;
     char *ret;
+    int isfilelist;
     
-    if((peer->transfer->hash != NULL) && isdchash(peer->transfer->hash) && supports(peer, "tthf"))
+    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"))
     {
 	buf = base32encode(peer->transfer->hash->buf, 24);
 	ret = sprintf2("TTH/%.39s", buf);
@@ -611,31 +648,33 @@ 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");
+	if(!confgetint("dc", "hidedeflate"))
+	    qstr(peer->sk, " GetZBlock ZLIG");
+	qstr(peer->sk, "|");
+    }
 }
 
 static void requestfile(struct dcpeer *peer)
@@ -644,6 +683,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);
@@ -673,6 +713,7 @@ static void requestfile(struct dcpeer *peer)
 	    sendadc(peer->sk, "0");
 	    sendadc(peer->sk, "-1");
 	    qstr(peer->sk, "|");
+	    peer->fetchingtthl = 1;
 	    return;
 	}
     }
@@ -709,15 +750,16 @@ static void requestfile(struct dcpeer *peer)
 	    freedcpeer(peer);
 	    return;
 	}
-	qstrf(peer->sk, "$UGetBlock %i %i %s|", peer->transfer->curpos, peer->transfer->size - peer->transfer->curpos, buf);
+	qstrf(peer->sk, "$UGetBlock %zi %zi %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);
 	    freedcpeer(peer);
 	    return;
 	}
-	qstrf(peer->sk, "$Get %s$%i|", buf, peer->transfer->curpos + 1);
+	qstrf(peer->sk, "$Get %s$%zi|", buf, peer->transfer->curpos + 1);
     }
 }
 
@@ -726,29 +768,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);
 }
@@ -787,11 +836,14 @@ 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");
+	    if(!confgetint("dc", "hidedeflate"))
+		qstr(sk, " GetZBlock");
+	    qstr(sk, "|");
+	}
     }
     key = dcmakekey(args);
     qstrf(sk, "$Key %s|", key);
@@ -808,7 +860,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);
@@ -821,7 +873,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);
@@ -836,7 +888,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);
@@ -857,7 +909,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);
@@ -890,7 +942,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;
@@ -917,7 +969,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);
@@ -926,9 +978,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';
@@ -955,7 +1007,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);
@@ -963,7 +1015,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);
@@ -993,7 +1045,7 @@ static void cmd_forcemove(struct socket *sk, struct fnetnode *fn, char *cmd, cha
     } else {
 	freeargs = 0;
     }
-    if((newfn = fnetinitconnect(L"dc", args)) != NULL)
+    if((newfn = fnetinitconnect(L"dc", fn->owner, args, NULL)) != NULL)
     {
 	linkfnetnode(newfn);
 	putfnetnode(newfn);
@@ -1003,7 +1055,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;
@@ -1012,15 +1064,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);
@@ -1059,7 +1111,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];
@@ -1083,7 +1136,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(fn->sk->remote, fn->sk->remotelen), args + 4);
+	postfix = sprintf2(" (%s)\005%s|", formataddress(hub->sk->remote, hub->sk->remotelen), args + 4);
 	dsk = sk;
 	getsock(dsk);
     } else {
@@ -1096,7 +1149,7 @@ 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(fn->sk->remote, fn->sk->remotelen));
+	postfix = sprintf2(" (%s)|", formataddress(hub->sk->remote, hub->sk->remotelen));
 	netdgramconn(dsk = netdupsock(udpsock), (struct sockaddr *)&addr, sizeof(addr));
     }
     
@@ -1142,14 +1195,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++;
 		}
 	    }
@@ -1197,15 +1251,16 @@ 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)
 		{
 		    buf2 = base32encode(node->hashtth, 24);
-		    qstrf(dsk, "%s%s\005%i%sTTH:%.39s%s", prefix, buf, node->size, infix, buf2, postfix);
+		    qstrf(dsk, "%s%s\005%zi%sTTH:%.39s%s", prefix, buf, node->size, infix, buf2, postfix);
 		    free(buf2);
 		} else {
-		    qstrf(dsk, "%s%s\005%i%s%s%s", prefix, buf, node->size, infix, hub->nativename, postfix);
+		    qstrf(dsk, "%s%s\005%zi%s%s%s", prefix, buf, node->size, infix, hub->nativename, postfix);
 		}
 		free(buf);
 	    }
@@ -1283,7 +1338,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));
@@ -1346,7 +1401,7 @@ static void cmd_to(struct socket *sk, struct fnetnode *fn, char *cmd, char *args
 	return;
     *p2 = 0;
     p2 += 2;
-    hubrecvchat(fn->sk, fn, p, p2);
+    hubrecvchat(hub->sk, fn, p, p2);
     hubhandleaction(sk, fn, cmd, args);
 }
 
@@ -1388,8 +1443,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);
@@ -1423,16 +1479,75 @@ static void cmd_usercommand(struct socket *sk, struct fnetnode *fn, char *cmd, c
     /* Do nothing for now. */
 }
 
+static void cmd_getpass(struct socket *sk, struct fnetnode *fn, char *cmd, char *args)
+{
+    struct dchub *hub;
+    wchar_t *pw;
+    char *mbspw;
+    
+    hub = fn->data;
+    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_hubsupports(struct socket *sk, struct fnetnode *fn, char *cmd, char *args)
+{
+    struct dchub *hub;
+    int i;
+    char *p, *p2;
+    char **arr;
+    size_t arrsize, arrdata;
+    
+    hub = fn->data;
+    if(hub->supports != NULL)
+    {
+	for(i = 0; hub->supports[i] != NULL; i++)
+	    free(hub->supports[i]);
+	free(hub->supports);
+    }
+    arr = NULL;
+    arrsize = arrdata = 0;
+    p = args;
+    do
+    {
+	if((p2 = strchr(p, ' ')) != NULL)
+	    *(p2++) = 0;
+	if(*p == 0)
+	    continue;
+	addtobuf(arr, sstrdup(p));
+    } while((p = p2) != NULL);
+    addtobuf(arr, NULL);
+    hub->supports = arr;
+}
+
 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;
@@ -1448,8 +1563,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);
 	}
     }
@@ -1475,7 +1592,8 @@ static void cmd_direction(struct socket *sk, struct dcpeer *peer, char *cmd, cha
 	    freedcpeer(peer);
 	    return;
 	}
-	requestfile(peer);
+	if(peer->direction == TRNSD_DOWN)
+	    requestfile(peer);
     } else {
 	if(peer->wcsname == NULL)
 	{
@@ -1485,6 +1603,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)
@@ -1531,6 +1654,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 {
@@ -1542,6 +1670,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);
@@ -1556,6 +1685,8 @@ 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;
@@ -1564,6 +1695,8 @@ static void startdl(struct dcpeer *peer)
 
 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;
@@ -1572,6 +1705,7 @@ static void startul(struct dcpeer *peer)
 static void cmd_filelength(struct socket *sk, struct dcpeer *peer, char *cmd, char *args)
 {
     int size;
+    struct transfer *transfer;
     
     if(peer->transfer == NULL)
     {
@@ -1582,7 +1716,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);
@@ -1591,6 +1727,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);
@@ -1724,15 +1867,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|");
@@ -1760,6 +1899,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);
@@ -1770,7 +1917,7 @@ static void cmd_get(struct socket *sk, struct dcpeer *peer, char *cmd, char *arg
     lesk = wrapsock(fd);
     transferprepul(peer->transfer, sb.st_size, offset, -1, lesk);
     putsock(lesk);
-    qstrf(sk, "$FileLength %i|", peer->transfer->size);
+    qstrf(sk, "$FileLength %zi|", peer->transfer->size);
 }
 
 static void cmd_send(struct socket *sk, struct dcpeer *peer, char *cmd, char *args)
@@ -1853,6 +2000,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);
@@ -1863,14 +2011,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|");
@@ -1895,6 +2039,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);
@@ -1947,14 +2098,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)
@@ -1994,6 +2141,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|");
@@ -2053,9 +2206,12 @@ static void handletthl(struct dcpeer *peer)
     {
 	pushtigertree(&peer->tth, peer->inbuf);
 	memmove(peer->inbuf, peer->inbuf + 24, peer->inbufdata -= 24);
+	peer->curread += 24;
     }
-    if((peer->curread += 24) >= peer->totalsize)
+    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);
@@ -2094,9 +2250,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")) {
@@ -2112,6 +2271,12 @@ 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);
+	}
     } else {
 	/* We certainly didn't request this...*/
 	freedcpeer(peer);
@@ -2139,6 +2304,12 @@ 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);
+    }
 }
 
 /*
@@ -2173,14 +2344,14 @@ 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)
     {
-	sendctm(peer->fn->sk, mbsnick);
+	sendctm(hub->sk, mbsnick);
 	expectpeer(mbsnick, peer->fn);
     } else {
-	qstrf(peer->fn->sk, "$RevConnectToMe %s %s|", hub->nativenick, mbsnick);
+	qstrf(hub->sk, "$RevConnectToMe %s %s|", hub->nativenick, mbsnick);
     }
     free(mbsnick);
     return(0);
@@ -2192,12 +2363,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);
@@ -2220,12 +2391,12 @@ static int hubsendchat(struct fnetnode *fn, int public, wchar_t *to, wchar_t *st
     {
 	if(*to == L'\0')
 	{
-	    qstrf(fn->sk, "<%s> %s|", hub->nativenick, mbsstring);
+	    qstrf(hub->sk, "<%s> %s|", hub->nativenick, mbsstring);
 	} else {
-	    qstrf(fn->sk, "$To: %s From: %s $<%s> %s|", mbsto, hub->nativenick, hub->nativenick, mbsstring);
+	    qstrf(hub->sk, "$To: %s From: %s $<%s> %s|", mbsto, hub->nativenick, hub->nativenick, mbsstring);
 	}
     } else {
-	qstrf(fn->sk, "$To: %s From: %s $<%s> %s|", mbsto, hub->nativenick, hub->nativenick, mbsstring);
+	qstrf(hub->sk, "$To: %s From: %s $<%s> %s|", mbsto, hub->nativenick, hub->nativenick, mbsstring);
     }
     free(mbsto);
     free(mbsstring);
@@ -2312,8 +2483,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;
@@ -2338,7 +2511,7 @@ static int hubsearch(struct fnetnode *fn, struct search *srch, struct srchfnnlis
     struct hash *hash;
     
     hub = fn->data;
-    if((fn->state != FNN_EST) || (fn->sk == NULL) || (fn->sk->state != SOCK_EST))
+    if((fn->state != FNN_EST) || (hub->sk == NULL) || (hub->sk->state != SOCK_EST))
 	return(1);
     list = findsexprstrs(srch->sexpr);
     findsizelimit(srch->sexpr, &minsize, &maxsize);
@@ -2367,10 +2540,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);
 	}
@@ -2378,6 +2551,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
@@ -2415,15 +2589,15 @@ 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, hub->sk, &name, &namelen) < 0)
 	{
 	    flog(LOG_WARNING, "cannot get address of UDP socket");
 	} else {
-	    qstrf(fn->sk, "$Search %s %s|", formataddress(name, namelen), sstr);
+	    qstrf(hub->sk, "$Search %s %s|", formataddress(name, namelen), sstr);
 	    free(name);
 	}
     } else {
-	qstrf(fn->sk, "$Search Hub:%s %s|", hub->nativenick, sstr);
+	qstrf(hub->sk, "$Search Hub:%s %s|", hub->nativenick, sstr);
     }
     free(sstr);
     freesl(&list);
@@ -2436,7 +2610,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)},
@@ -2454,10 +2628,13 @@ struct command hubcmds[] =
     {"$To:", cc(cmd_to)},
     {"$SR", cc(cmd_sr)},
     {"$UserCommand", cc(cmd_usercommand)},
+    {"$GetPass", cc(cmd_getpass)},
+    {"$LogedIn", cc(cmd_logedin)}, /* sic */
+    {"$Supports", cc(cmd_hubsupports)},
     {NULL, NULL}
 };
 
-struct command peercmds[] =
+static struct command peercmds[] =
 {
     {"$MyNick", cc(cmd_mynick)},
     {"$Lock", cc(cmd_peerlock)},
@@ -2493,7 +2670,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;
     
@@ -2550,10 +2727,13 @@ 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"));
+		    transfer->flags.b.minislot = 0;
 		    peer->sk->writecb = NULL;
 		}
 	    }
@@ -2630,6 +2810,7 @@ static void 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;
@@ -2689,14 +2870,30 @@ static void udpread(struct socket *sk, void *data)
 	    return;
 	}
 	*p2 = 0;
-	if((wnick = icmbstowcs(nick, DCCHARSET)) == NULL)
+	p = p2 + 2;
+	if((p2 = strchr(p, ':')) == NULL)
 	{
 	    free(buf);
 	    return;
 	}
+	*(p2++) = 0;
+	hubaddr.sin_family = AF_INET;
+	if(!inet_aton(p, &hubaddr.sin_addr))
+	{
+	    free(buf);
+	    return;
+	}
+	p = p2;
+	if((p2 = strchr(p, ')')) == NULL)
+	{
+	    free(buf);
+	    return;
+	}
+	*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;
 	}
@@ -2728,6 +2925,28 @@ static void udpread(struct socket *sk, void *data)
 		}
 	    }
 	}
+	if(myfn == NULL)
+	{
+	    for(fn = fnetnodes; fn != NULL; fn = fn->next)
+	    {
+		if((fn->fnet == &dcnet) && ((hub = fn->data) != NULL))
+		{
+		    if((hub->sk != NULL) && addreq(hub->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;
+	}
 	sr = newsrchres(&dcnet, wfile, wnick);
 	if(sr->peernick != NULL)
 	    free(sr->peernick);
@@ -2784,7 +3003,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))
     {
@@ -2805,10 +3024,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 */
@@ -2824,6 +3071,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)
@@ -2853,6 +3102,8 @@ static void freedcpeer(struct dcpeer *peer)
 	    resettransfer(peer->transfer);
 	transferdetach(peer->transfer);
     }
+    if(peer->timeout != NULL)
+	canceltimer(peer->timeout);
     if(peer->sk->data == peer)
 	peer->sk->data = NULL;
     peer->sk->readcb = NULL;
@@ -2874,6 +3125,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)
@@ -2882,43 +3135,53 @@ static void freedcpeer(struct dcpeer *peer)
     numdcpeers--;
 }
 
-static void hubconnect(struct fnetnode *fn)
+static void hubconnect(struct fnetnode *fn, struct socket *sk)
 {
-    fn->sk->readcb = (void (*)(struct socket *, void *))hubread;
-    fn->sk->errcb = (void (*)(struct socket *, int, void *))huberr;
-    getfnetnode(fn);
-    fn->data = newdchub(fn);
-    fn->sk->data = fn;
+    struct dchub *hub;
+    
+    sk->readcb = (void (*)(struct socket *, void *))hubread;
+    sk->errcb = (void (*)(struct socket *, int, void *))huberr;
+    fn->data = hub = newdchub(fn);
+    sk->data = fn;
+    getsock(hub->sk = sk);
     return;
 }
 
 static void hubdestroy(struct fnetnode *fn)
 {
+    int i;
     struct dchub *hub;
     struct qcommand *qcmd;
     
     hub = (struct dchub *)fn->data;
-    if(fn->sk != NULL)
-    {
-	if(fn->sk->data == fn)
-	{
-	    fn->sk->data = NULL;
-	    putfnetnode(fn);
-	}
-    }
-    if(hub == NULL)
-	return;
+    putsock(hub->sk);
     while((qcmd = ulqcmd(&hub->queue)) != NULL)
 	freeqcmd(qcmd);
+    if(hub->supports != NULL)
+    {
+	for(i = 0; hub->supports[i] != NULL; i++)
+	    free(hub->supports[i]);
+	free(hub->supports);
+    }
     if(hub->nativename != NULL)
 	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);
 }
 
+static void hubkill(struct fnetnode *fn)
+{
+    struct dchub *hub;
+    
+    hub = (struct dchub *)fn->data;
+    hub->sk->close = 1;
+}
+
 static wchar_t *dcbasename(wchar_t *filename)
 {
     wchar_t *ret;
@@ -2941,6 +3204,7 @@ static struct fnet dcnet =
     .name = L"dc",
     .connect = hubconnect,
     .destroy = hubdestroy,
+    .kill = hubkill,
     .setnick = hubsetnick,
     .reqconn = hubreqconn,
     .sendchat = hubsendchat,
@@ -2969,15 +3233,15 @@ static void peerread(struct socket *sk, struct dcpeer *peer)
 	    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)] == 0))
+		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;
 	    }
-	    memmove(peer->inbuf, p, peer->inbufdata -= p - peer->inbuf);
 	}
     } else if(peer->state == PEER_TTHL) {
 	handletthl(peer);
@@ -2992,20 +3256,25 @@ static void peererror(struct socket *sk, int err, struct dcpeer *peer)
 static void peerconnect(struct socket *sk, int err, struct fnetnode *fn)
 {
     struct dcpeer *peer;
+    struct dchub *hub;
     
     if(err != 0)
     {
 	putfnetnode(fn);
+	putsock(sk);
 	return;
     }
+    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;
     socksettos(sk, confgetint("fnet", "fnptos"));
     putsock(sk);
+    peer->timeout = timercallback(ntime() + 180, (void (*)(int, void *))peertimeout, peer);
     sendmynick(peer);
     sendpeerlock(peer);
 }
@@ -3020,6 +3289,7 @@ static void peeraccept(struct socket *sk, struct socket *newsk, void *data)
     newsk->errcb = (void (*)(struct socket *, int, void *))peererror;
     newsk->data = peer;
     socksettos(newsk, confgetint("fnet", "fnptos"));
+    peer->timeout = timercallback(ntime() + 180, (void (*)(int, void *))peertimeout, peer);
 }
 
 static void updatehmlist(void)
@@ -3037,6 +3307,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++)
@@ -3046,7 +3317,7 @@ static void updatehmlist(void)
 	    if(node->f.b.type == FILE_REG)
 	    {
 		addtobuf(buf, '|');
-		sprintf(numbuf, "%i", node->size);
+		sprintf(numbuf, "%zi", node->size);
 		bufcat(buf, numbuf, strlen(numbuf));
 	    }
 	    addtobuf(buf, 13);
@@ -3201,7 +3472,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;
@@ -3218,7 +3492,7 @@ static void updatexmllist(void)
 		lev++;
 		continue;
 	    } else {
-		fprintf(fs, "<File Name=\"%s\" Size=\"%i\"", namebuf, node->size);
+		fprintf(fs, "<File Name=\"%s\" Size=\"%zi\"", namebuf, node->size);
 		if(node->f.b.hastth)
 		{
 		    hashbuf = base32encode(node->hashtth, 24);
@@ -3246,11 +3520,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);
 }
 
@@ -3315,14 +3588,108 @@ 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() + confgetint("cli", "hashwritedelay"), listtimercb, NULL);
+	return;
+    }
+    if(listwritetimer != NULL)
+	canceltimer(listwritetimer);
     updatehmlist();
     updatexmllist();
     updatexmlbz2list();
+}
+
+static int shareupdate(unsigned long long uusharesize, void *data)
+{
+    updatelists(0);
     return(0);
 }
 
+static char *quotestr(char *str)
+{
+    unsigned char *buf;
+    unsigned char *p;
+    size_t bufsize, bufdata;
+    wchar_t *wbuf;
+    static char *enc = NULL;
+    size_t encsize, encdata;
+    
+    buf = NULL;
+    bufsize = bufdata = 0;
+    for(p = (unsigned char *)str; *p; p++)
+    {
+	if(*p == '\b')
+	    bufcat(buf, "\\b", 2);
+	else if(*p == '\t')
+	    bufcat(buf, "\\t", 2);
+	else if(*p == '\n')
+	    bufcat(buf, "\\n", 2);
+	else if(*p == '\r')
+	    bufcat(buf, "\\r", 2);
+	else if(*p == '\\')
+	    bufcat(buf, "\\\\", 2);
+	else if(*p >= 32)
+	    addtobuf(buf, *p);
+	else
+	    bprintf(buf, "\\x%02x", *p);
+    }
+    addtobuf(buf, 0);
+    if(enc != NULL)
+	free(enc);
+    enc = NULL;
+    if((wbuf = icmbstowcs((char *)buf, DCCHARSET)) != NULL)
+    {
+	enc = icwcstombs(wbuf, NULL);
+	free(wbuf);
+    }
+    if(enc == NULL)
+    {
+	encsize = encdata = 0;
+	for(p = buf; *p; p++) {
+	    if(*p < 128)
+		addtobuf(enc, *p);
+	    else
+		bprintf(buf, "\\x%x", *p);
+	}
+    }
+    free(buf);
+    return(enc);
+}
+
+static void logunimpl(char *list, char *cmd, char *args)
+{
+    FILE *log;
+    
+    if((log = fopen("/tmp/dc-unimpl", "a")) == NULL)
+    {
+	flog(LOG_WARNING, "could not open unimpl log: %s", strerror(errno));
+	return;
+    }
+    fputs(list, log);
+    fputc('\t', log);
+    fputs(quotestr(cmd), log);
+    if(args != NULL)
+    {
+	fputc('\t', log);
+	fputs(quotestr(args), log);
+    }
+    fputc('\n', log);
+    fclose(log);
+}
+
 static void dispatchcommand(struct qcommand *qcmd, struct command *cmdlist, struct socket *sk, void *data)
 {
     char *p;
@@ -3336,11 +3703,16 @@ static void dispatchcommand(struct qcommand *qcmd, struct command *cmdlist, stru
 	    break;
     }
     if(cmd->handler != NULL)
+    {
 	cmd->handler(sk, data, qcmd->string, p);
-/*
-    else
-	flog(LOG_DEBUG, "Unimplemented DC command: %s \"%s\"", qcmd->string, p?p:"noargs");
-*/
+    } else if(confgetint("dc", "logunimpl")) {
+	if(cmdlist == hubcmds)
+	    logunimpl("hub", qcmd->string, p);
+	else if(cmdlist == peercmds)
+	    logunimpl("peer", qcmd->string, p);
+	else
+	    logunimpl("other?!", qcmd->string, p);
+    }
 }
 
 static int run(void)
@@ -3364,10 +3736,10 @@ static int run(void)
 	{
 	    if(*qcmd->string == '$')
 	    {
-		if((fn->sk != NULL) && (fn->sk->state == SOCK_EST))
-		    dispatchcommand(qcmd, hubcmds, fn->sk, fn);
+		if((hub->sk != NULL) && (hub->sk->state == SOCK_EST))
+		    dispatchcommand(qcmd, hubcmds, hub->sk, fn);
 	    } else if(*qcmd->string != 0) {
-		hubrecvchat(fn->sk, fn, NULL, qcmd->string);
+		hubrecvchat(hub->sk, fn, NULL, qcmd->string);
 	    }
 	    freeqcmd(qcmd);
 	    ret = 1;
@@ -3379,6 +3751,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);
@@ -3483,11 +3858,41 @@ static void terminate(void)
 
 static struct configvar myvars[] =
 {
+    /** Specifies the share description reported to other DC users. */
     {CONF_VAR_STRING, "desc", {.str = L""}},
+    /** Specifies the speed reported to other DC users. Normal values
+     * are 28.8Kbps, 33.6Kbps, 56Kbps, Satellite, ISDN, DSL, Cable,
+     * LAN(T1) or LAN(T3)*/
     {CONF_VAR_STRING, "speedstring", {.str = L"LAN(T1)"}},
+    /** The e-mail address to report to other DC users. */
     {CONF_VAR_STRING, "email", {.str = L"spam@spam.org"}},
+    /** Specifies a specific UDP port to use for DC search results. If
+     * left unspecified, a port is allocated dynamically. Useful for
+     * NAT routers (see also the net.visibleipv4 address for those
+     * cases). */
     {CONF_VAR_INT, "udpport", {.num = 0}},
+    /** Specifies a specific TCP port to use for DC peer
+     * connections. If left unspecified, a port is allocated
+     * dynamically. Useful for NAT routers (see also the
+     * net.visibleipv4 address for those cases). */
     {CONF_VAR_INT, "tcpport", {.num = 0}},
+    /** If set to true, doldacond will do its best to emulate DC++
+     * (currently v0.674). This should be left off if at all possible,
+     * since turning it on will violate the rules of most hubs and
+     * thus give hub owners an actual reason to kick you if it is
+     * detected. It might be needed for some of the more bone-headed
+     * hub owners, though. Note that DC++ emulation can also be turned
+     * on or off for individual hubs, overriding this setting. */
+    {CONF_VAR_BOOL, "dcppemu", {.num = 0}},
+    /** Use for debugging. If set to true, doldacond will log all
+     * unknown commands it receives, and their arguments, to
+     * /tmp/dc-unimpl. */
+    {CONF_VAR_BOOL, "logunimpl", {.num = 0}},
+    /** If set to true, doldacond will hide its support for deflate
+     * compression of transfers from other clients, so that they will
+     * not request compressed uploads. Compressed transfers may
+     * consume a non-trivial amount of CPU time on slower machines. */
+    {CONF_VAR_BOOL, "hidedeflate", {.num = 0}},
     {CONF_VAR_END}
 };