From 5123bec0afbabc5d3d385f81962dc97cbb8a379c Mon Sep 17 00:00:00 2001 From: fredrik Date: Sun, 16 Oct 2005 03:45:37 +0000 Subject: [PATCH] Allow setting hashes in cmd_download. Return hashes in lstrans. git-svn-id: svn+ssh://svn.dolda2000.com/srv/svn/repos/src/doldaconnect@380 959494ce-11ee-0310-bf91-de5d638817bd --- daemon/ui.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/daemon/ui.c b/daemon/ui.c index e77a4ef..c6d6e77 100644 --- a/daemon/ui.c +++ b/daemon/ui.c @@ -739,7 +739,14 @@ static void cmd_download(struct socket *sk, struct uidata *data, int argc, wchar if(argc > 5) { for(i = 5; i < argc; i += 2) - transferaddarg(transfer, argv[i], argv[i + 1]); + { + if(!wcscmp(argv[i], L"hash")) + { + transfer->hash = parsehash(argv[i + 1]); + } else { + transferaddarg(transfer, argv[i], argv[i + 1]); + } + } } sq(sk, 0, L"200", L"%%i", transfer->id, L"Download queued", NULL); transfersetactivity(transfer, L"create"); @@ -761,6 +768,7 @@ static void cmd_lstrans(struct socket *sk, struct uidata *data, int argc, wchar_ (pt->peernick == NULL)?L"":(pt->peernick), (pt->path == NULL)?L"":(pt->path), L"%%i", pt->size, L"%%i", pt->curpos, + (pt->hash == NULL)?L"":unparsehash(pt->hash), NULL); pt = transfer; } @@ -773,6 +781,7 @@ static void cmd_lstrans(struct socket *sk, struct uidata *data, int argc, wchar_ (pt->peernick == NULL)?L"":(pt->peernick), (pt->path == NULL)?L"":(pt->path), L"%%i", pt->size, L"%%i", pt->curpos, + (pt->hash == NULL)?L"":unparsehash(pt->hash), NULL); } @@ -1659,19 +1668,13 @@ static int srchcommit(struct search *srch, void *uudata) static int srchres(struct search *srch, struct srchres *sr, void *uudata) { struct uidata *data; - wchar_t *hbuf; for(data = actives; data != NULL; data = data->next) { if(haspriv(data, PERM_SRCH) && data->notify.b.srch && !wcscmp(srch->owner, data->username)) { - hbuf = NULL; - if(sr->hash != NULL) - hbuf = unparsehash(sr->hash); newnotif(data, 622, NOTIF_ID, srch->id, NOTIF_STR, sr->filename, NOTIF_STR, sr->fnet->name, NOTIF_STR, sr->peerid, NOTIF_INT, sr->size, - NOTIF_INT, sr->slots, NOTIF_INT, (sr->fn == NULL)?-1:(sr->fn->id), NOTIF_FLOAT, sr->time, NOTIF_STR, (hbuf == NULL)?L"":hbuf, NOTIF_END); - if(hbuf != NULL) - free(hbuf); + NOTIF_INT, sr->slots, NOTIF_INT, (sr->fn == NULL)?-1:(sr->fn->id), NOTIF_FLOAT, sr->time, NOTIF_STR, (sr->hash == NULL)?L"":unparsehash(sr->hash), NOTIF_END); } } return(0); -- 2.11.0