X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Fui.c;h=a7717eae3c8054b2ff45e64bedb7257421d44cdf;hb=0388d7345b17aeb284ad7d6276a2f672ade6ada7;hp=795f7d7c496bd36df0d8f4fc47398d36f25f1964;hpb=c45c9b793539cdabca7f47563087579755ab74ac;p=doldaconnect.git

diff --git a/daemon/ui.c b/daemon/ui.c
index 795f7d7..a7717ea 100644
--- a/daemon/ui.c
+++ b/daemon/ui.c
@@ -1,6 +1,6 @@
 /*
  *  Dolda Connect - Modular multiuser Direct Connect-style client
- *  Copyright (C) 2004 Fredrik Tolf (fredrik@dolda2000.com)
+ *  Copyright (C) 2004 Fredrik Tolf <fredrik@dolda2000.com>
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -62,6 +62,7 @@
 #define NOTIF_STR 2
 #define NOTIF_FLOAT 3
 #define NOTIF_ID 4
+#define NOTIF_OFF 5
 #define NOTIF_PEND 0
 #define NOTIF_WAIT 1
 
@@ -105,6 +106,7 @@ struct notif
 	union
 	{
 	    int n;
+	    off_t o;
 	    wchar_t *s;
 	    double d;
 	} d;
@@ -232,6 +234,12 @@ static void sq(struct socket *sk, int cont, ...)
 	    {
 		freepart = 1;
 		part = swprintf2(L"%i", va_arg(al, int));
+	    } else if(!wcscmp(tpart, L"zi")) {
+		freepart = 1;
+		part = swprintf2(L"%zi", va_arg(al, size_t));
+	    } else if(!wcscmp(tpart, L"oi")) {
+		freepart = 1;
+		part = swprintf2(L"%ji", (intmax_t)va_arg(al, off_t));
 	    } else if(!wcscmp(tpart, L"s")) {
 		freepart = 1;
 		part = icmbstowcs(sarg = va_arg(al, char *), NULL);
@@ -324,7 +332,7 @@ static int haspriv(struct uidata *data, int perm)
 
 /* Useful macros for the command functions: */
 #define haveargs(n) do { if(argc < n) { sq(sk, 0, L"501", L"Wrong number of arguments", NULL); return; } } while(0)
-#define havepriv(p) do { if((data->userinfo == NULL) || ((data->userinfo->perms & (p)) != (p))) { sq(sk, 0, L"502", L"Unauthorized request", L"needed", L"%x", (p), L"had", L"%x", data->userinfo->perms, NULL); return; } } while(0)
+#define havepriv(p) do { if((data->userinfo == NULL) || ((data->userinfo->perms & (p)) != (p))) { sq(sk, 0, L"502", L"Unauthorized request", L"needed", L"%x", (p), NULL); return; } } while(0)
 
 static void cmd_connect(struct socket *sk, struct uidata *data, int argc, wchar_t **argv)
 {
@@ -764,7 +772,7 @@ static void cmd_download(struct socket *sk, struct uidata *data, int argc, wchar
 	linktransfer(transfer);
     }
     if(argc > 4)
-	transfersetsize(transfer, wcstol(argv[4], NULL, 0));
+	transfersetsize(transfer, wcstoll(argv[4], NULL, 0));
     if(argc > 5)
     {
 	for(i = 5; i < argc; i += 2)
@@ -796,7 +804,7 @@ static void cmd_lstrans(struct socket *sk, struct uidata *data, int argc, wchar_
 		   L"%i", pt->state, pt->peerid,
 		   (pt->peernick == NULL)?L"":(pt->peernick),
 		   (pt->path == NULL)?L"":(pt->path),
-		   L"%i", pt->size, L"%i", pt->curpos,
+		   L"%oi", pt->size, L"%oi", pt->curpos,
 		   (pt->hash == NULL)?L"":unparsehash(pt->hash),
 		   NULL);
 	    pt = transfer;
@@ -809,7 +817,7 @@ static void cmd_lstrans(struct socket *sk, struct uidata *data, int argc, wchar_
 	   L"%i", pt->state, pt->peerid,
 	   (pt->peernick == NULL)?L"":(pt->peernick),
 	   (pt->path == NULL)?L"":(pt->path),
-	   L"%i", pt->size, L"%i", pt->curpos,
+	   L"%oi", pt->size, L"%oi", pt->curpos,
 	   (pt->hash == NULL)?L"":unparsehash(pt->hash),
 	   NULL);
 }
@@ -1048,7 +1056,7 @@ static void cmd_lssr(struct socket *sk, struct uidata *data, int argc, wchar_t *
 	for(sr = srch->results; sr != NULL; sr = sr->next)
 	{
 	    sq(sk, (sr->next != NULL)?1:0, L"200", L"%ls", sr->filename,
-	       sr->fnet->name, L"%ls", sr->peerid, L"%i", sr->size,
+	       sr->fnet->name, L"%ls", sr->peerid, L"%oi", sr->size,
 	       L"%i", sr->slots, L"%i", (sr->fn == NULL)?-1:(sr->fn->id),
 	       L"%f", sr->time,
 	       L"%ls", (sr->hash == NULL)?L"":unparsehash(sr->hash), NULL);
@@ -1434,8 +1442,11 @@ static void notifappendv(struct notif *notif, va_list args)
 	case NOTIF_ID:
 	    notif->argv[ca].d.n = va_arg(args, int);
 	    break;
+	case NOTIF_OFF:
+	    notif->argv[ca].d.o = va_arg(args, off_t);
+	    break;
 	case NOTIF_STR:
-	    notif->argv[ca].d.s = wcsdup(va_arg(args, wchar_t *));
+	    notif->argv[ca].d.s = swcsdup(va_arg(args, wchar_t *));
 	    break;
 	case NOTIF_FLOAT:
 	    notif->argv[ca].d.d = va_arg(args, double);
@@ -1548,6 +1559,7 @@ static void freeuidata(struct uidata *data)
 	actives = data->next;
     data->sk->readcb = NULL;
     data->sk->errcb = NULL;
+    closesock(data->sk);
     putsock(data->sk);
     while((qcmd = unlinkqcmd(data)) != NULL)
 	freequeuecmd(qcmd);
@@ -1844,7 +1856,7 @@ static int srchres(struct search *srch, struct srchres *sr, void *uudata)
     {
 	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,
+	    newnotif(data, 622, NOTIF_ID, srch->id, NOTIF_STR, sr->filename, NOTIF_STR, sr->fnet->name, NOTIF_STR, sr->peerid, NOTIF_OFF, 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);
 	}
     }
@@ -2007,7 +2019,7 @@ static int transferchattr(struct transfer *transfer, wchar_t *attrib, void *uuda
 	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, 613, NOTIF_ID, transfer->id, NOTIF_INT, transfer->size, NOTIF_END);
+		newnotif(data, 613, NOTIF_ID, transfer->id, NOTIF_OFF, transfer->size, NOTIF_END);
 	}
     } else if(!wcscmp(attrib, L"error")) {
 	for(data = actives; data != NULL; data = data->next)
@@ -2041,9 +2053,9 @@ static int transferprog(struct transfer *transfer, void *uudata)
 	if(haspriv(data, PERM_TRANS) && data->notify.b.trprog && ((transfer->owner == 0) || (transfer->owner == data->uid)))
 	{
 	    if((notif = findnotif(data->fnotif, 1, NOTIF_PEND, 615, transfer->id)) != NULL)
-		notif->argv[1].d.n = transfer->curpos;
+		notif->argv[1].d.o = transfer->curpos;
 	    else
-		newnotif(data, 615, NOTIF_ID, transfer->id, NOTIF_INT, transfer->curpos, NOTIF_END)->rlimit = 0.5;
+		newnotif(data, 615, NOTIF_ID, transfer->id, NOTIF_OFF, transfer->curpos, NOTIF_END)->rlimit = 0.5;
 	}
     }
     return(0);
@@ -2234,13 +2246,17 @@ static int unixsockupdate(struct configvar *var, void *uudata)
 {
     struct socket *newsock;
     struct sockaddr_un *un;
+    mode_t ou;
     
     newsock = NULL;
+    ou = umask(0111);
     if(((un = makeunixname()) != NULL) && ((newsock = netcslistenlocal(SOCK_STREAM, (struct sockaddr *)un, sizeof(*un), uiaccept, NULL)) == NULL))
     {
+	umask(ou);
 	flog(LOG_WARNING, "could not create new Unix UI socket, reverting to old: %s", strerror(errno));
 	return(0);
     }
+    umask(ou);
     if(unixsocket != NULL)
     {
 	putsock(unixsocket);
@@ -2256,6 +2272,7 @@ static int init(int hup)
     struct sockaddr_un *un;
     struct passwd *pwd;
     wchar_t *wcsname;
+    mode_t ou;
     
     if(hup)
     {
@@ -2275,11 +2292,14 @@ static int init(int hup)
 	    return(1);
 	}
 	CBREG(confgetvar("ui", "port"), conf_update, tcpportupdate, NULL, NULL);
+	ou = umask(0111);
 	if(((un = makeunixname()) != NULL) && ((unixsocket = netcslistenlocal(SOCK_STREAM, (struct sockaddr *)un, sizeof(*un), uiaccept, NULL)) == NULL))
 	{
+	    umask(ou);
 	    flog(LOG_CRIT, "could not create Unix UI socket: %s", strerror(errno));
 	    return(1);
 	}
+	umask(ou);
 	CBREG(confgetvar("ui", "unixsock"), conf_update, unixsockupdate, NULL, NULL);
 	GCBREG(newfncb, newfnetnode, NULL);
 	GCBREG(newtransfercb, newtransfernotify, NULL);
@@ -2350,6 +2370,9 @@ static int run(void)
 		case NOTIF_ID:
 		    sq(data->sk, 2, L"%i", notif->argv[i].d.n, NULL);
 		    break;
+		case NOTIF_OFF:
+		    sq(data->sk, 2, L"%oi", notif->argv[i].d.o, NULL);
+		    break;
 		case NOTIF_STR:
 		    if(notif->argv[i].d.s[0] == L'%')
 			sq(data->sk, 2, L"%ls", notif->argv[i].d.s, NULL);