{
int fnact:1;
int fnchat:1;
+ int fnpeer:1;
int tract:1;
int trprog:1;
int srch:1;
if(argc > 5)
{
for(i = 5; i < argc; i += 2)
- transferaddarg(transfer, argv[i], argv[i + 1]);
+ {
+ if(!wcscmp(argv[i], L"hash"))
+ {
+ transfersethash(transfer, 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");
(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;
}
(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);
}
data->notify.b.fnchat = val;
} else if(!wcscasecmp(argv[i], L"fn:act")) {
data->notify.b.fnact = val;
+ } else if(!wcscasecmp(argv[i], L"fn:peer")) {
+ data->notify.b.fnpeer = val;
} else if(!wcscasecmp(argv[i], L"trans:act")) {
data->notify.b.tract = val;
} else if(!wcscasecmp(argv[i], L"trans:prog")) {
for(sr = srch->results; sr != NULL; sr = sr->next)
{
swprintf(buf, 64, L"%f", sr->time);
- sq(sk, (sr->next != NULL)?1:0, L"200", L"%%ls", sr->filename, sr->fnet->name, L"%%ls", sr->peerid, L"%%i", sr->size, L"%%i", sr->slots, L"%%i", (sr->fn == NULL)?-1:(sr->fn->id), buf, NULL);
+ sq(sk, (sr->next != NULL)?1:0, L"200", L"%%ls", sr->filename, sr->fnet->name, L"%%ls", sr->peerid, L"%%i", sr->size, L"%%i", sr->slots, L"%%i", (sr->fn == NULL)?-1:(sr->fn->id), buf, L"%%ls", (sr->hash == NULL)?L"":unparsehash(sr->hash), NULL);
}
}
}
return(qcmd);
}
-static struct notif *newnotif(struct uidata *data, int code, ...)
+static void notifappendv(struct notif *notif, va_list args)
{
- struct notif *notif;
- va_list args;
int dt, ca;
- notif = smalloc(sizeof(*notif));
- memset(notif, 0, sizeof(*notif));
- notif->rlimit = 0.0;
- notif->ui = data;
- notif->code = code;
- va_start(args, code);
while((dt = va_arg(args, int)) != NOTIF_END)
{
ca = notif->argc;
break;
}
}
+}
+
+static void notifappend(struct notif *notif, ...)
+{
+ va_list args;
+
+ va_start(args, notif);
+ notifappendv(notif, args);
+ va_end(args);
+}
+
+static struct notif *newnotif(struct uidata *data, int code, ...)
+{
+ struct notif *notif;
+ va_list args;
+
+ notif = smalloc(sizeof(*notif));
+ memset(notif, 0, sizeof(*notif));
+ notif->rlimit = 0.0;
+ notif->ui = data;
+ notif->code = code;
+ va_start(args, code);
+ notifappendv(notif, args);
va_end(args);
notif->next = NULL;
notif->prev = data->lnotif;
for(data = actives; data != NULL; data = data->next)
{
if(haspriv(data, PERM_SRCH) && data->notify.b.srch && !wcscmp(srch->owner, data->username))
- 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_END);
+ {
+ 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, (sr->hash == NULL)?L"":unparsehash(sr->hash), NOTIF_END);
+ }
}
return(0);
}
if((notif = findnotif(data->fnotif, 1, NOTIF_PEND, 605, fn->id)) != NULL)
notif->argv[1].d.n = fn->numpeers;
else
- newnotif(data, 605, NOTIF_ID, fn->id, NOTIF_INT, fn->numpeers, NOTIF_END);
+ newnotif(data, 605, NOTIF_ID, fn->id, NOTIF_INT, fn->numpeers, NOTIF_END)->rlimit = 0.5;
}
}
}
return(0);
}
+static int peernew(struct fnetnode *fn, struct fnetpeer *peer, void *uudata)
+{
+ struct uidata *data;
+
+ for(data = actives; data != NULL; data = data->next)
+ {
+ if(data->notify.b.fnpeer)
+ newnotif(data, 630, NOTIF_INT, fn->id, NOTIF_STR, peer->id, NOTIF_STR, peer->nick, NOTIF_END);
+ }
+ return(0);
+}
+
+static int peerdel(struct fnetnode *fn, struct fnetpeer *peer, void *uudata)
+{
+ struct uidata *data;
+
+ for(data = actives; data != NULL; data = data->next)
+ {
+ if(data->notify.b.fnpeer)
+ newnotif(data, 631, NOTIF_INT, fn->id, NOTIF_STR, peer->id, NOTIF_END);
+ }
+ return(0);
+}
+
+static int peerchange(struct fnetnode *fn, struct fnetpeer *peer, struct fnetpeerdi *di, void *uudata)
+{
+ struct uidata *data;
+ struct notif *notif;
+ wchar_t buf[32];
+
+ for(data = actives; data != NULL; data = data->next)
+ {
+ if(data->notify.b.fnpeer)
+ {
+ for(notif = data->fnotif; notif != NULL; notif = notif->next)
+ {
+ if((notif->code == 632) && (notif->state == NOTIF_PEND) && (notif->argv[0].d.n == fn->id) && !wcscmp(notif->argv[1].d.s, peer->id))
+ break;
+ }
+ if(notif == NULL)
+ notif = newnotif(data, 632, NOTIF_INT, fn->id, NOTIF_STR, peer->id, NOTIF_STR, peer->nick, NOTIF_END);
+ notifappend(notif, NOTIF_STR, di->datum->id, NOTIF_INT, di->datum->datatype, NOTIF_END);
+ switch(di->datum->datatype)
+ {
+ case FNPD_INT:
+ notifappend(notif, NOTIF_INT, di->data.num, NOTIF_END);
+ break;
+ case FNPD_STR:
+ notifappend(notif, NOTIF_STR, di->data.str, NOTIF_END);
+ break;
+ case FNPD_LL:
+ swprintf(buf, sizeof(buf) / sizeof(*buf), L"%lli", di->data.lnum);
+ notifappend(notif, NOTIF_STR, buf, NOTIF_END);
+ break;
+ }
+ }
+ }
+ return(0);
+}
+
static int newfnetnode(struct fnetnode *fn, void *uudata)
{
struct uidata *data;
CBREG(fn, fnetnode_ac, fnactive, NULL, NULL);
CBREG(fn, fnetnode_chat, recvchat, NULL, NULL);
CBREG(fn, fnetnode_unlink, fnunlink, NULL, NULL);
+ CBREG(fn, fnetpeer_new, peernew, NULL, NULL);
+ CBREG(fn, fnetpeer_del, peerdel, NULL, NULL);
+ CBREG(fn, fnetpeer_chdi, peerchange, NULL, NULL);
return(0);
}
if(haspriv(data, PERM_TRANS) && data->notify.b.tract && ((transfer->owner == 0) || (transfer->owner == data->uid)))
newnotif(data, 616, NOTIF_ID, transfer->id, NOTIF_STR, transfer->path, NOTIF_END);
}
+ } else if(!wcscmp(attrib, L"hash")) {
+ for(data = actives; data != NULL; data = data->next)
+ {
+ if(haspriv(data, PERM_TRANS) && data->notify.b.tract && ((transfer->owner == 0) || (transfer->owner == data->uid)))
+ newnotif(data, 618, NOTIF_ID, transfer->id, NOTIF_STR, (transfer->hash == NULL)?L"":unparsehash(transfer->hash), NOTIF_END);
+ }
}
return(0);
}