X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Ffnet-dc.c;h=a8d9e2449f1e961b3794a8f15bffe81af0a90fa9;hb=7395a37ff4f11dc6f63515ed6f6bb91055f473da;hp=c88deef9e6dc036889350c9e6012beb089e59fff;hpb=b5010caaa4606ea37df9cd1334dc99fff05a8bd3;p=doldaconnect.git

diff --git a/daemon/fnet-dc.c b/daemon/fnet-dc.c
index c88deef..a8d9e24 100644
--- a/daemon/fnet-dc.c
+++ b/daemon/fnet-dc.c
@@ -24,7 +24,6 @@
 #include <string.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <alloca.h>
 #include <wctype.h>
 #include <time.h>
 #include <errno.h>
@@ -727,7 +726,7 @@ 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)
@@ -736,7 +735,7 @@ static void requestfile(struct dcpeer *peer)
 	    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);
     }
 }
 
@@ -1230,10 +1229,10 @@ static void cmd_search(struct socket *sk, struct fnetnode *fn, char *cmd, char *
 		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);
 	    }
@@ -1860,7 +1859,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)
@@ -3093,6 +3092,8 @@ static void hubdestroy(struct fnetnode *fn)
     if((fn->sk != NULL) && (fn->sk->data == fn))
     {
 	fn->sk->data = NULL;
+	fn->sk->readcb = NULL;
+	fn->sk->errcb = NULL;
 	putfnetnode(fn);
     }
     if(hub == NULL)
@@ -3244,7 +3245,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);
@@ -3419,7 +3420,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);
@@ -3529,7 +3530,7 @@ static void updatelists(int now)
     if(!now)
     {
 	if(listwritetimer == NULL)
-	    listwritetimer = timercallback(ntime() + 300, listtimercb, NULL);
+	    listwritetimer = timercallback(ntime() + confgetint("cli", "hashwritedelay"), listtimercb, NULL);
 	return;
     }
     if(listwritetimer != NULL)
@@ -3545,6 +3546,76 @@ static int shareupdate(unsigned long long uusharesize, void *data)
     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 *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(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;
@@ -3559,10 +3630,8 @@ static void dispatchcommand(struct qcommand *qcmd, struct command *cmdlist, stru
     }
     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"))
+	logunimpl(qcmd->string, p);
 }
 
 static int run(void)
@@ -3734,6 +3803,10 @@ static struct configvar myvars[] =
      * 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}},
     {CONF_VAR_END}
 };