X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Fnet.c;h=86bc5522f206c3784230c74e5b03bb4336a851d9;hb=5760093c6a76eee741d70f8b8d71e9e52bd655ee;hp=a9238cbcf5cd61e5ea855ca5ac21a928c7be6c5d;hpb=b2e73d7b835172abbc5e217b75faaa2daec2110d;p=doldaconnect.git

diff --git a/daemon/net.c b/daemon/net.c
index a9238cb..86bc552 100644
--- a/daemon/net.c
+++ b/daemon/net.c
@@ -66,8 +66,6 @@ static struct configvar myvars[] =
      * and net.visibleipv4 are unspecified the address of the hub
      * connection is used. */
     {CONF_VAR_STRING, "publicif", {.str = L""}},
-    /* Diffserv should be supported on IPv4, too, but I don't know the
-     * API to do that. */
     /** The Diffserv value to use on IPv6 connections when the
      * minimize cost TOS value is used (see the TOS VALUES
      * section). */
@@ -84,6 +82,12 @@ static struct configvar myvars[] =
      * minimize delay TOS value is used (see the TOS VALUES
      * section). */
     {CONF_VAR_INT, "diffserv-mindelay", {.num = 0}},
+    /** If enabled, the IP TOS interface will be used to set Diffserv
+     * codepoints on IPv4 sockets, by shifting the DSCP value two bits
+     * to the left (remember, the DSCP field in the IPv4 header is
+     * defined as the 6 uppermost bits of the TOS field, the lower two
+     * being left for ECN). This may only work on Linux. */
+    {CONF_VAR_BOOL, "dscp-tos", {.num = 0}},
     {CONF_VAR_END}
 };
 
@@ -361,12 +365,15 @@ void getsock(struct socket *sk)
 static void sockdebug(int level, struct socket *sk, char *format, ...)
 {
     va_list args;
+    char *tb;
     
-    if((sk->dbgnm == NULL) || (level < sk->dbglvl))
+    if((sk->dbgnm == NULL) || (level > sk->dbglvl))
 	return;
     va_start(args, format);
-    vfprintf(stderr, format, args);
+    tb = vsprintf2(format, args);
     va_end(args);
+    fprintf(stderr, "%s: %s\n", sk->dbgnm, tb);
+    free(tb);
 }
 
 void socksetdebug(struct socket *sk, int level, char *nm, ...)
@@ -382,6 +389,7 @@ void socksetdebug(struct socket *sk, int level, char *nm, ...)
     free(tb);
     sk->dbglvl = level;
     sk->back->dbglvl = level;
+    sockdebug(1, sk, "enabled debugging");
 }
 
 static void freesock(struct socket *sk)
@@ -514,7 +522,7 @@ void *sockgetinbuf(struct socket *sk, size_t *size)
 	sk->buf.s.bufsize = sk->buf.s.datasize = 0;
 	sockread(sk);
     }
-    sockdebug(2, sk, "read %ji bytes", *size);
+    sockdebug(2, sk, "read %zi bytes", *size);
     return(buf);
 }
 
@@ -524,7 +532,7 @@ void sockqueue(struct socket *sk, void *data, size_t size)
     struct sockaddr *remote;
     socklen_t remotelen;
     
-    sockdebug(2, sk, "queued %ji bytes", size);
+    sockdebug(2, sk, "queued %zi bytes", size);
     if(size == 0)
 	return;
     if(sk->state == SOCK_STL)
@@ -999,6 +1007,8 @@ struct socket *netcsconn(struct sockaddr *addr, socklen_t addrlen, void (*func)(
 	memcpy(sk->ufd->d.s.remote = smalloc(addrlen), addr, sk->ufd->d.s.remotelen = addrlen);
 	sk->back->conncb = func;
 	sk->back->data = data;
+	getsock(sk->back);
+	putsock(sk);
 	if(!connect(sk->ufd->fd, addr, addrlen))
 	{
 	    sksetstate(sk, SOCK_EST);
@@ -1070,10 +1080,18 @@ static void runbatches(void)
 static void cleansocks(void)
 {
     struct ufd *ufd, *next;
+    int dead;
     
     for(ufd = ufds; ufd != NULL; ufd = next) {
 	next = ufd->next;
-	if(ufd->sk && ((ufd->fd < 0) || (sockgetdatalen(ufd->sk) == 0))) {
+	if(ufd->sk) {
+	    dead = (ufd->fd < 0);
+	    if(ufd->sk->state == SOCK_STL)
+		dead = 1;
+	    if((ufd->sk->state == SOCK_EST) && (sockgetdatalen(ufd->sk) == 0))
+		dead = 1;
+	    if(!dead)
+		continue;
 	    if(ufd->sk->eos == 1) {
 		ufd->sk->eos = 2;
 		closeufd(ufd);
@@ -1217,6 +1235,7 @@ int socksettos(struct socket *sk, int tos)
 {
     int buf;
     struct ufd *ufd;
+    int dscp2tos;
     
     ufd = getskufd(sk);
     if(ufd->type != UFD_SOCK) {
@@ -1227,22 +1246,35 @@ int socksettos(struct socket *sk, int tos)
 	return(0); /* Unix sockets are always perfect. :) */
     if(ufd->d.s.family == AF_INET)
     {
+	dscp2tos = confgetint("net", "dscp-tos");
 	switch(tos)
 	{
 	case 0:
 	    buf = 0;
 	    break;
 	case SOCK_TOS_MINCOST:
-	    buf = 0x02;
+	    if(dscp2tos)
+		buf = confgetint("net", "diffserv-mincost") << 2;
+	    else
+		buf = 0x02;
 	    break;
 	case SOCK_TOS_MAXREL:
-	    buf = 0x04;
+	    if(dscp2tos)
+		buf = confgetint("net", "diffserv-maxrel") << 2;
+	    else
+		buf = 0x04;
 	    break;
 	case SOCK_TOS_MAXTP:
-	    buf = 0x08;
+	    if(dscp2tos)
+		buf = confgetint("net", "diffserv-maxtp") << 2;
+	    else
+		buf = 0x08;
 	    break;
 	case SOCK_TOS_MINDELAY:
-	    buf = 0x10;
+	    if(dscp2tos)
+		buf = confgetint("net", "diffserv-mindelay") << 2;
+	    else
+		buf = 0x10;
 	    break;
 	default:
 	    flog(LOG_WARNING, "attempted to set unknown TOS value %i to IPv4 sock", tos);