Revert to previous socket scheme.

[doldaconnect.git] / daemon / transfer.c

diff --git a/daemon/transfer.c b/daemon/transfer.c
index ab862a2..56b237d 100644 (file)
--- a/daemon/transfer.c
+++ b/daemon/transfer.c
@@ -80,6 +80,8 @@ void freetransfer(struct transfer *transfer)
        free(transfer->filterbuf);
     if(transfer->hash != NULL)
        freehash(transfer->hash);
+    if(transfer->exitstatus != NULL)
+       free(transfer->exitstatus);
     if(transfer->localend != NULL)
     {
        transfer->localend->readcb = NULL;
@@ -153,6 +155,18 @@ struct transfer *finddownload(wchar_t *peerid)
     return(transfer);
 }
 
+struct transfer *hasupload(struct fnet *fnet, wchar_t *peerid)
+{
+    struct transfer *transfer;
+    
+    for(transfer = transfers; transfer != NULL; transfer = transfer->next)
+    {
+       if((transfer->dir == TRNSD_UP) && (transfer->fnet == fnet) && !wcscmp(transfer->peerid, peerid))
+           break;
+    }
+    return(transfer);
+}
+
 struct transfer *newupload(struct fnetnode *fn, struct fnet *fnet, wchar_t *nickid, struct transferiface *iface, void *data)
 {
     struct transfer *transfer;
@@ -566,6 +580,17 @@ static char *findfilter(struct passwd *pwd)
     return(NULL);
 }
 
+static void handletranscmd(struct transfer *transfer, wchar_t *cmd, wchar_t *arg)
+{
+    if(!wcscmp(cmd, L"status")) {
+       if(arg == NULL)
+           arg = L"";
+       if(transfer->exitstatus != NULL)
+           free(transfer->exitstatus);
+       transfer->exitstatus = swcsdup(arg);
+    }
+}
+
 static void filterread(struct socket *sk, struct transfer *transfer)
 {
     char *buf, *p, *p2;
@@ -576,7 +601,7 @@ static void filterread(struct socket *sk, struct transfer *transfer)
        return;
     bufcat(transfer->filterbuf, buf, bufsize);
     free(buf);
-    if((p = memchr(transfer->filterbuf, '\n', transfer->filterbufdata)) != NULL)
+    while((p = memchr(transfer->filterbuf, '\n', transfer->filterbufdata)) != NULL)
     {
        *(p++) = 0;
        if((p2 = strchr(transfer->filterbuf, ' ')) != NULL)
@@ -587,8 +612,9 @@ static void filterread(struct socket *sk, struct transfer *transfer)
            if(p2 != NULL)
            {
                if((arg = icmbstowcs(p2, NULL)) == NULL)
-                   flog(LOG_WARNING, "filter sent a string which could not be converted into the local charset: %s: %s", transfer->filterbuf, strerror(errno));
+                   flog(LOG_WARNING, "filter sent a string which could not be converted into the local charset: %s: %s", p2, strerror(errno));
            }
+           handletranscmd(transfer, cmd, arg);
            CBCHAINDOCB(transfer, trans_filterout, transfer, cmd, arg);
            if(arg != NULL)
                free(arg);
@@ -603,6 +629,8 @@ static void filterread(struct socket *sk, struct transfer *transfer)
 static void filterexit(pid_t pid, int status, void *data)
 {
     struct transfer *transfer;
+    struct fnet *fnet;
+    wchar_t *peerid;
     
     for(transfer = transfers; transfer != NULL; transfer = transfer->next)
     {
@@ -610,13 +638,14 @@ static void filterexit(pid_t pid, int status, void *data)
        {
            transfer->filter = -1;
            killfilter(transfer);
+           fnet = transfer->fnet;
+           peerid = swcsdup(transfer->peerid);
            if(WEXITSTATUS(status))
-           {
                resettransfer(transfer);
-           } else {
+           else
                freetransfer(transfer);
-           }
-           trytransferbypeer(transfer->fnet, transfer->peerid);
+           trytransferbypeer(fnet, peerid);
+           free(peerid);
            break;
        }
     }
@@ -773,6 +802,7 @@ static struct configvar myvars[] =
     {CONF_VAR_INT, "ultos", {.num = SOCK_TOS_MAXTP}},
     {CONF_VAR_INT, "dltos", {.num = SOCK_TOS_MAXTP}},
     {CONF_VAR_STRING, "filter", {.str = L"dc-filter"}},
+    {CONF_VAR_BOOL, "ulquota", {.num = 0}},
     {CONF_VAR_END}
 };