X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Fui.c;h=9c89b504de0699380daf431d0518e4f813cd4253;hb=049aedb6ec90e163d2e0cc51ab66f65d18700a86;hp=970be52a40a642d03df5dcfa1d6cadfdee3d7349;hpb=65643d01099d276dfce32c0bda08ed1dbfc2afb7;p=doldaconnect.git diff --git a/daemon/ui.c b/daemon/ui.c index 970be52..9c89b50 100644 --- a/daemon/ui.c +++ b/daemon/ui.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -123,14 +124,18 @@ struct uidata { int fnact:1; int fnchat:1; + int fnpeer:1; int tract:1; int trprog:1; int srch:1; + int msg:1; } b; int w; } notify; wchar_t *username; struct uiuser *userinfo; + int id; + wchar_t *regname; uid_t uid; struct notif *fnotif, *lnotif; char *fcmdbuf; @@ -142,7 +147,7 @@ struct uidata size_t inbufsize, indata; /* Wordset storage */ wchar_t **argv; - int argc, args; + size_t argc, args; /* WCS conversation stuff */ wchar_t *cb; /* Conversation buffer */ size_t cbsize, cbdata; @@ -154,13 +159,18 @@ struct uidata size_t cwsize, cwdata; }; +static int uiread(struct socket *sk, struct uidata *data); +static int uierror(struct socket *sk, int err, struct uidata *data); static int srcheta(struct search *srch, void *uudata); static int srchcommit(struct search *srch, void *uudata); static int srchres(struct search *srch, struct srchres *sr, void *uudata); +static struct notif *newnotif(struct uidata *data, int code, ...); +static void notifappend(struct notif *notif, ...); struct uiuser *users = NULL; struct uidata *actives = NULL; struct socket *uisocket = NULL; +static time_t starttime; static wchar_t *quoteword(wchar_t *word) { @@ -314,6 +324,7 @@ static int haspriv(struct uidata *data, int perm) static void cmd_connect(struct socket *sk, struct uidata *data, int argc, wchar_t **argv) { int valid; + struct in6_addr mv4lo; if(confgetint("ui", "onlylocal")) { @@ -323,7 +334,12 @@ static void cmd_connect(struct socket *sk, struct uidata *data, int argc, wchar_ valid = ((struct sockaddr_in *)sk->remote)->sin_addr.s_addr == INADDR_LOOPBACK; break; case AF_INET6: - valid = !memcmp(&((struct sockaddr_in6 *)sk->remote)->sin6_addr, &in6addr_loopback, sizeof(in6addr_loopback)); + inet_pton(AF_INET6, "::ffff:127.0.0.1", &mv4lo); + valid = 0; + if(!memcmp(&((struct sockaddr_in6 *)sk->remote)->sin6_addr, &in6addr_loopback, sizeof(in6addr_loopback))) + valid = 1; + if(!memcmp(&((struct sockaddr_in6 *)sk->remote)->sin6_addr, &mv4lo, sizeof(in6addr_loopback))) + valid = 1; break; default: valid = 0; @@ -429,19 +445,20 @@ static void cmd_login(struct socket *sk, struct uidata *data, int argc, wchar_t if(data->uid == -1) { sq(sk, 0, L"506", L"Authentication error", NULL); - flog(LOG_INFO, "user %ls authenticated successfully, but no account existed", data->username); + flog(LOG_INFO, "user %ls authenticated successfully from %s, but no account existed", data->username, formataddress(sk->remote, sk->remotelen)); logout(data); } else if((data->userinfo == NULL) || (data->userinfo->perms & PERM_DISALLOW)) { sq(sk, 0, L"506", L"Authentication error", NULL); - flog(LOG_INFO, "user %ls authenticated successfully, but was not authorized", data->username); + flog(LOG_INFO, "user %ls authenticated successfully from %s, but was not authorized", data->username, formataddress(sk->remote, sk->remotelen)); logout(data); } else { sq(sk, 0, L"200", L"Welcome", NULL); - flog(LOG_INFO, "%ls (UID %i) logged in", data->username, data->uid); + flog(LOG_INFO, "%ls (UID %i) logged in from %s", data->username, data->uid, formataddress(sk->remote, sk->remotelen)); } break; case AUTH_DENIED: sq(sk, 0, L"506", L"Authentication error", L"%%ls", (data->auth->text == NULL)?L"":(data->auth->text), NULL); + flog(LOG_INFO, "authentication failed for %ls from %s", data->username, formataddress(sk->remote, sk->remotelen)); logout(data); break; case AUTH_PASS: @@ -502,19 +519,20 @@ static void cmd_pass(struct socket *sk, struct uidata *data, int argc, wchar_t * if(data->uid == -1) { sq(sk, 0, L"506", L"Authentication error", NULL); - flog(LOG_INFO, "user %ls authenticated successfully, but no account existed", data->username); + flog(LOG_INFO, "user %ls authenticated successfully from %s, but no account existed", data->username, formataddress(sk->remote, sk->remotelen)); logout(data); } else if((data->userinfo == NULL) || (data->userinfo->perms & PERM_DISALLOW)) { sq(sk, 0, L"506", L"Authentication error", NULL); - flog(LOG_INFO, "user %ls authenticated successfully, but was not authorized", data->username); + flog(LOG_INFO, "user %ls authenticated successfully from %s, but was not authorized", data->username, formataddress(sk->remote, sk->remotelen)); logout(data); } else { sq(sk, 0, L"200", L"Welcome", NULL); - flog(LOG_INFO, "%ls (UID %i) logged in", data->username, data->uid); + flog(LOG_INFO, "%ls (UID %i) logged in from %s", data->username, data->uid, formataddress(sk->remote, sk->remotelen)); } break; case AUTH_DENIED: sq(sk, 0, L"506", L"Authentication error", L"%%ls", (data->auth->text == NULL)?L"":(data->auth->text), NULL); + flog(LOG_INFO, "authentication failed for %ls from %s", data->username, formataddress(sk->remote, sk->remotelen)); logout(data); break; case AUTH_PASS: @@ -557,15 +575,24 @@ static void cmd_fnetconnect(struct socket *sk, struct uidata *data, int argc, wc char *buf; int err; struct fnetnode *fn; + struct wcspair *args; haveargs(3); havepriv(PERM_FNETCTL); + for(i = 0, fn = fnetnodes; fn != NULL; i++, fn = fn->next); + if((confgetint("fnet", "maxnodes") > 0) && (i >= confgetint("fnet", "maxnodes"))) { + sq(sk, 0, L"515", L"Too many fnetnodes connected already", NULL); + return; + } if((buf = icwcstombs(argv[2], NULL)) == NULL) { sq(sk, 0, L"504", L"Could not convert data to locale charset", NULL); return; } - fn = fnetinitconnect(argv[1], buf); + args = NULL; + for(i = 3; i < argc - 1; i += 2) + newwcspair(argv[i], argv[i + 1], &args); + fn = fnetinitconnect(argv[1], data->userinfo->name, buf, args); err = errno; free(buf); if(fn == NULL) @@ -576,15 +603,10 @@ static void cmd_fnetconnect(struct socket *sk, struct uidata *data, int argc, wc sq(sk, 0, L"509", L"Could not parse the address", L"%%s", strerror(err), NULL); return; } - for(i = 3; i < argc - 1; i += 2) - { - if(!wcscmp(argv[i], L"nick")) - fnetsetnick(fn, argv[i + 1]); - } linkfnetnode(fn); fnetsetname(fn, argv[2]); + sq(sk, 0, L"200", L"%%i", fn->id, L"Connection under way", NULL); putfnetnode(fn); - sq(sk, 0, L"200", L"Connection under way", NULL); } static void cmd_lsnodes(struct socket *sk, struct uidata *data, int argc, wchar_t **argv) @@ -598,7 +620,7 @@ static void cmd_lsnodes(struct socket *sk, struct uidata *data, int argc, wchar_ } for(fn = fnetnodes; fn != NULL; fn = fn->next) { - sq(sk, (fn->next != NULL)?1:0, L"200", L"%%i", fn->id, fn->fnet->name, (fn->name == NULL)?L"":fn->name, L"%%i", fn->numpeers, L"%%i", fn->state, NULL); + sq(sk, (fn->next != NULL)?1:0, L"200", L"%%i", fn->id, fn->fnet->name, (fn->name == NULL)?L"":fn->name, L"%%i", fn->numpeers, L"%%i", fn->state, L"%%ls", fn->pubid, NULL); } } @@ -621,6 +643,11 @@ static void cmd_disconnect(struct socket *sk, struct uidata *data, int argc, wch sq(sk, 0, L"510", L"No such node", NULL); return; } + if(wpfind(fn->args, L"locked") && !((data->userinfo->perms & PERM_ADMIN) || !wcscmp(data->userinfo->name, fn->owner))) + { + sq(sk, 0, L"502", L"This node is locked and you are neither administrator nor its owner", NULL); + return; + } killfnetnode(fn); unlinkfnetnode(fn); } @@ -666,7 +693,7 @@ static void cmd_lspeers(struct socket *sk, struct uidata *data, int argc, wchar_ } else { for(peer = fn->peers; peer != NULL; peer = peer->next) { - sq(sk, 2 | ((peer->next != NULL)?1:0), L"200", peer->id, peer->nick, NULL); + sq(sk, 2 | ((peer->next != NULL)?1:0), L"200", L"%%s", peer->id, L"%%s", peer->nick, NULL); for(i = 0; i < peer->dinum; i++) { if(peer->peerdi[i].datum->datatype == FNPD_INT) @@ -679,7 +706,7 @@ static void cmd_lspeers(struct socket *sk, struct uidata *data, int argc, wchar_ sq(sk, 2, peer->peerdi[i].datum->id, buf, NULL); } if((peer->peerdi[i].datum->datatype == FNPD_STR) && (peer->peerdi[i].data.str != NULL)) - sq(sk, 2, peer->peerdi[i].datum->id, peer->peerdi[i].data.str, NULL); + sq(sk, 2, peer->peerdi[i].datum->id, L"%%s", peer->peerdi[i].data.str, NULL); } sq(sk, 0, NULL); } @@ -742,9 +769,9 @@ static void cmd_download(struct socket *sk, struct uidata *data, int argc, wchar { if(!wcscmp(argv[i], L"hash")) { - transfer->hash = parsehash(argv[i + 1]); + transfersethash(transfer, parsehash(argv[i + 1])); } else { - transferaddarg(transfer, argv[i], argv[i + 1]); + newwcspair(argv[i], argv[i + 1], &transfer->args); } } } @@ -835,12 +862,16 @@ static void cmd_notify(struct socket *sk, struct uidata *data, int argc, wchar_t 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")) { data->notify.b.trprog = val; } else if(!wcscasecmp(argv[i], L"srch:act")) { data->notify.b.srch = val; + } else if(!wcscasecmp(argv[i], L"msg")) { + data->notify.b.msg = val; } } sq(sk, 0, L"200", L"Notification alteration succeeded", NULL); @@ -1025,18 +1056,19 @@ static void cmd_cansrch(struct socket *sk, struct uidata *data, int argc, wchar_ sq(sk, 0, L"200", L"Search cancelled", NULL); } -static void fcmdread(struct socket *sk, struct uidata *data) +static int fcmdread(struct socket *sk, struct uidata *data) { char *buf; size_t bufsize; if((buf = sockgetinbuf(sk, &bufsize)) == NULL) - return; + return(0); bufcat(data->fcmdbuf, buf, bufsize); free(buf); + return(0); } -static void fcmderr(struct socket *sk, int err, struct uidata *data) +static int fcmderr(struct socket *sk, int err, struct uidata *data) { wchar_t *wbuf, *p, *p2; @@ -1053,7 +1085,7 @@ static void fcmderr(struct socket *sk, int err, struct uidata *data) } data->fcmdbufsize = data->fcmdbufdata = 0; sq(data->sk, 0, L"505", L"An error occurred on the pipe to the filtercmd", L"%%s", strerror(err), NULL); - return; + return(0); } putsock(data->fcmdsk); data->fcmdsk = NULL; @@ -1071,7 +1103,7 @@ static void fcmderr(struct socket *sk, int err, struct uidata *data) if(wbuf == NULL) { sq(data->sk, 0, L"504", L"Filtercmd sent data which could not be converted from the local charset", NULL); - return; + return(0); } p = wbuf; for(p2 = wcschr(p, L'\n'); p2 != NULL; p2 = wcschr(p, L'\n')) @@ -1088,6 +1120,7 @@ static void fcmderr(struct socket *sk, int err, struct uidata *data) sq(data->sk, 0, L"200", L"%%ls", p, NULL); } free(wbuf); + return(0); } static void cmd_filtercmd(struct socket *sk, struct uidata *data, int argc, wchar_t **argv) @@ -1108,7 +1141,7 @@ static void cmd_filtercmd(struct socket *sk, struct uidata *data, int argc, wcha sq(sk, 0, L"505", L"System error - Could not fork session", "Internal error", NULL); return; } - if((filtercmd = findfile(icswcstombs(confgetstr("ui", "filtercmd"), NULL, NULL), "dcdl-filtercmd", pwent->pw_dir)) == NULL) + if((filtercmd = findfile(icswcstombs(confgetstr("ui", "filtercmd"), NULL, NULL), "dcdl-filtercmd", pwent->pw_dir, 0)) == NULL) { flog(LOG_WARNING, "could not find filtercmd executable for user %s", pwent->pw_name); sq(sk, 0, L"505", L"System error - Could not fork session", L"Could not find filtercmd executable", NULL); @@ -1153,15 +1186,14 @@ static void cmd_filtercmd(struct socket *sk, struct uidata *data, int argc, wcha data->fcmdbuf = NULL; } data->fcmdbufsize = data->fcmdbufdata = 0; - data->fcmdsk->data = data; - data->fcmdsk->readcb = (void (*)(struct socket *, void *))fcmdread; - data->fcmdsk->errcb = (void (*)(struct socket *, int, void *))fcmderr; + CBREG(data->fcmdsk, socket_read, (int (*)(struct socket *, void *))fcmdread, NULL, data); + CBREG(data->fcmdsk, socket_err, (int (*)(struct socket *, int, void *))fcmderr, NULL, data); } static void cmd_lstrarg(struct socket *sk, struct uidata *data, int argc, wchar_t **argv) { struct transfer *transfer; - struct transarg *ta; + struct wcspair *ta; haveargs(2); havepriv(PERM_TRANS); @@ -1180,7 +1212,7 @@ static void cmd_lstrarg(struct socket *sk, struct uidata *data, int argc, wchar_ sq(sk, 0, L"201", L"Transfer has no arguments", NULL); } else { for(ta = transfer->args; ta != NULL; ta = ta->next) - sq(sk, ta->next != NULL, L"200", L"%%ls", ta->rec, L"%%ls", ta->val, NULL); + sq(sk, ta->next != NULL, L"200", L"%%ls", ta->key, L"%%ls", ta->val, NULL); } } @@ -1202,6 +1234,90 @@ static void cmd_hashstatus(struct socket *sk, struct uidata *data, int argc, wch sq(sk, 0, L"200", L"%%i", total, L"tth", L"%%i", hashed, NULL); } +static void cmd_transstatus(struct socket *sk, struct uidata *data, int argc, wchar_t **argv) +{ + wchar_t *buf1, *buf2; + + havepriv(PERM_TRANS); + buf1 = swprintf2(L"%lli", bytesdownload); + buf2 = swprintf2(L"%lli", bytesupload); + sq(sk, 0, L"200", L"%%ls", buf1, L"%%ls", buf2, NULL); + free(buf1); + free(buf2); +} + +static void cmd_register(struct socket *sk, struct uidata *data, int argc, wchar_t **argv) +{ + struct uidata *d2; + + haveargs(2); + if(data->userinfo == NULL) { + sq(sk, 0, L"502", L"Must be logged in", NULL); + return; + } + if(argv[1][0] == L'#') { + sq(sk, 0, L"509", L"Name must not begin with a hash sign", NULL); + return; + } + for(d2 = actives; d2 != NULL; d2 = d2->next) { + if((d2 != data) && (d2->userinfo == data->userinfo) && d2->regname && !wcscmp(d2->regname, argv[1])) { + sq(sk, 0, L"516", L"Name already in use", NULL); + return; + } + } + if(data->regname != NULL) + free(data->regname); + data->regname = swcsdup(argv[1]); + sq(sk, 0, L"200", L"Registered", NULL); +} + +static void cmd_sendmsg(struct socket *sk, struct uidata *data, int argc, wchar_t **argv) +{ + int i, rcptid; + struct uidata *rcpt; + wchar_t *myname; + struct notif *notif; + + haveargs(2); + if(data->userinfo == NULL) { + sq(sk, 0, L"502", L"Must be logged in", NULL); + return; + } + if(argv[1][0] == L'#') { + rcptid = wcstol(argv[1] + 1, NULL, 0); + for(rcpt = actives; rcpt != NULL; rcpt = rcpt->next) { + if((rcpt->userinfo == data->userinfo) && (rcpt->id == rcptid)) + break; + } + } else { + for(rcpt = actives; rcpt != NULL; rcpt = rcpt->next) { + if((rcpt->userinfo == data->userinfo) && rcpt->regname && !wcscmp(rcpt->regname, argv[1])) + break; + } + } + if(rcpt == NULL) { + sq(sk, 0, L"517", L"No such recipient", NULL); + return; + } + if(!rcpt->notify.b.msg) { + sq(sk, 0, L"518", L"Recipient not listening for messages", NULL); + return; + } + if(data->regname != NULL) + myname = swcsdup(data->regname); + else + myname = swprintf2(L"#%i", data->id); + notif = newnotif(rcpt, 640, NOTIF_STR, myname, NOTIF_END); + for(i = 2; i < argc; i++) + notifappend(notif, NOTIF_STR, argv[i], NOTIF_END); + sq(sk, 0, L"200", L"Message sent", NULL); +} + +static void cmd_uptime(struct socket *sk, struct uidata *data, int argc, wchar_t **argv) +{ + sq(sk, 0, L"200", L"%%i", time(NULL) - starttime, NULL); +} + #undef haveargs #undef havepriv @@ -1237,6 +1353,10 @@ static struct command commands[] = {L"filtercmd", cmd_filtercmd}, {L"lstrarg", cmd_lstrarg}, {L"hashstatus", cmd_hashstatus}, + {L"transstatus", cmd_transstatus}, + {L"register", cmd_register}, + {L"sendmsg", cmd_sendmsg}, + {L"uptime", cmd_uptime}, {NULL, NULL} }; @@ -1267,18 +1387,10 @@ static struct qcommand *unlinkqcmd(struct uidata *data) 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; @@ -1298,6 +1410,29 @@ static struct notif *newnotif(struct uidata *data, int code, ...) 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; @@ -1379,8 +1514,8 @@ static void freeuidata(struct uidata *data) data->prev->next = data->next; if(data == actives) actives = data->next; - data->sk->readcb = NULL; - data->sk->errcb = NULL; + CBUNREG(data->sk, socket_read, uiread, data); + CBUNREG(data->sk, socket_err, uierror, data); putsock(data->sk); while((qcmd = unlinkqcmd(data)) != NULL) freequeuecmd(qcmd); @@ -1397,6 +1532,8 @@ static void freeuidata(struct uidata *data) } if(data->auth != NULL) authputhandle(data->auth); + if(data->regname != NULL) + free(data->regname); if(data->username != NULL) { if(data->userinfo != NULL) @@ -1434,9 +1571,11 @@ static void queuecmd(struct uidata *data, struct command *cmd, int argc, wchar_t static struct uidata *newuidata(struct socket *sk) { struct uidata *data; + static int curid = 0; data = smalloc(sizeof(*data)); memset(data, 0, sizeof(*data)); + data->id = curid++; data->sk = sk; getsock(sk); data->inbuf = smalloc(1024); @@ -1454,7 +1593,7 @@ static struct uidata *newuidata(struct socket *sk) return(data); } -static void uiread(struct socket *sk, struct uidata *data) +static int uiread(struct socket *sk, struct uidata *data) { int ret, done; char *newbuf; @@ -1466,7 +1605,7 @@ static void uiread(struct socket *sk, struct uidata *data) if(data->indata > 1024) data->indata = 0; if((newbuf = sockgetinbuf(sk, &datalen)) == NULL) - return; + return(0); sizebuf(&data->inbuf, &data->inbufsize, data->indata + datalen, 1, 1); memcpy(data->inbuf + data->indata, newbuf, datalen); free(newbuf); @@ -1619,26 +1758,29 @@ static void uiread(struct socket *sk, struct uidata *data) break; } } + return(0); } -static void uierror(struct socket *sk, int err, struct uidata *data) +static int uierror(struct socket *sk, int err, struct uidata *data) { if(err) flog(LOG_WARNING, "error occurred on UI socket: %s", strerror(err)); freeuidata(data); + return(0); } -static void uiaccept(struct socket *sk, struct socket *newsk, void *data) +static int uiaccept(struct socket *sk, struct socket *newsk, void *data) { struct uidata *uidata; - newsk->data = uidata = newuidata(newsk); + uidata = newuidata(newsk); socksettos(newsk, confgetint("ui", "uitos")); if(uidata == NULL) - return; - newsk->errcb = (void (*)(struct socket *, int, void *))uierror; - newsk->readcb = (void (*)(struct socket *, void *))uiread; + return(0); + CBREG(newsk, socket_err, (int (*)(struct socket *, int, void *))uierror, NULL, uidata); + CBREG(newsk, socket_read, (int (*)(struct socket *, void *))uiread, NULL, uidata); queuecmd(uidata, &commands[0], 0, NULL); + return(0); } static int srcheta(struct search *srch, void *uudata) @@ -1718,7 +1860,7 @@ static int fnactive(struct fnetnode *fn, wchar_t *attrib, void *uudata) 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; } } } @@ -1737,6 +1879,66 @@ static int fnunlink(struct fnetnode *fn, void *uudata) 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; @@ -1749,6 +1951,9 @@ static int newfnetnode(struct fnetnode *fn, void *uudata) 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); } @@ -1787,6 +1992,12 @@ static int transferchattr(struct transfer *transfer, wchar_t *attrib, void *uuda 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); } @@ -1816,7 +2027,7 @@ static int transferdestroyed(struct transfer *transfer, void *uudata) 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, 617, NOTIF_ID, transfer->id, NOTIF_END); + newnotif(data, 617, NOTIF_ID, transfer->id, NOTIF_STR, (transfer->exitstatus == NULL)?L"":(transfer->exitstatus), NOTIF_END); } return(0); } @@ -1930,41 +2141,11 @@ static void preinit(int hup) } } -#ifdef HAVE_IPV6 -static struct sockaddr *getnameforport(int port, socklen_t *len) -{ - static struct sockaddr_in6 addr; - - memset(&addr, 0, sizeof(addr)); - addr.sin6_family = AF_INET6; - addr.sin6_port = htons(port); - addr.sin6_addr = in6addr_any; - if(len != NULL) - *len = sizeof(addr); - return((struct sockaddr *)&addr); -} -#else -static struct sockaddr *getnameforport(int port, socklen_t *len) -{ - static struct sockaddr_in addr; - - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_port = htons(port); - if(len != NULL) - *len = sizeof(addr); - return((struct sockaddr *)&addr); -} -#endif - static int portupdate(struct configvar *var, void *uudata) { - struct sockaddr *addr; - socklen_t addrlen; struct socket *newsock; - addr = getnameforport(var->val.num, &addrlen); - if((uisocket = netcslistenlocal(SOCK_STREAM, addr, addrlen, uiaccept, NULL)) == NULL) + if((uisocket = netcstcplisten(var->val.num, 1, uiaccept, NULL)) == NULL) { flog(LOG_WARNING, "could not create new UI socket, reverting to old: %s", strerror(errno)); return(0); @@ -1977,8 +2158,6 @@ static int portupdate(struct configvar *var, void *uudata) static int init(int hup) { - struct sockaddr *addr; - socklen_t addrlen; struct uiuser *user, *next; if(hup) @@ -1992,10 +2171,10 @@ static int init(int hup) } if(!hup) { + starttime = time(NULL); if(uisocket != NULL) putsock(uisocket); - addr = getnameforport(confgetint("ui", "port"), &addrlen); - if((uisocket = netcslistenlocal(SOCK_STREAM, addr, addrlen, uiaccept, NULL)) == NULL) + if((uisocket = netcstcplisten(confgetint("ui", "port"), 1, uiaccept, NULL)) == NULL) { flog(LOG_CRIT, "could not create UI socket: %s", strerror(errno)); return(1);