Merge branch 'master' into socket

[doldaconnect.git] / daemon / net.c

diff --git a/daemon/net.c b/daemon/net.c
index 7a68dae..240855a 100644 (file)
--- 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}
 };
 
@@ -211,6 +215,7 @@ static struct socket *newsock1(int dgram)
     new->refcount = 1;
     new->state = -1;
     new->dgram = dgram;
+    new->maxbuf = 65536;
     numsocks++;
     return(new);
 }
@@ -756,9 +761,14 @@ size_t sockgetdatalen(struct socket *sk)
     return(ret);
 }
 
-size_t sockqueuesize(struct socket *sk)
+/* size_t sockqueuesize(struct socket *sk) */
+/* { */
+/*     return(sockgetdatalen(sk->back)); */
+/* } */
+
+ssize_t sockqueueleft(struct socket *sk)
 {
-    return(sockgetdatalen(sk->back));
+    return(sk->back->maxbuf - sockgetdatalen(sk->back));
 }
 
 /*
@@ -1038,7 +1048,7 @@ int pollsocks(int timeout)
     for(maxfd = 0, ufd = ufds; ufd != NULL; ufd = ufd->next) {
        if(ufd->fd < 0)
            continue;
-       if(!ufd->ignread)
+       if(!ufd->ignread && ((ufd->sk == NULL) || (sockqueueleft(ufd->sk) > 0)))
            FD_SET(ufd->fd, &rfds);
        if(ufd->sk != NULL) {
            if(sockgetdatalen(ufd->sk) > 0)
@@ -1149,6 +1159,7 @@ int socksettos(struct socket *sk, int tos)
 {
     int buf;
     struct ufd *ufd;
+    int dscp2tos;
     
     ufd = getskufd(sk);
     if(ufd->type != UFD_SOCK) {
@@ -1159,22 +1170,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);
@@ -1529,13 +1553,13 @@ int getucred(struct socket *sk, uid_t *uid, gid_t *gid)
     return(0);
 }
 
-void sockblock(struct socket *sk, int block)
-{
-    struct ufd *ufd;
+/* void sockblock(struct socket *sk, int block) */
+/* { */
+/*     struct ufd *ufd; */
     
-    ufd = getskufd(sk);
-    ufd->ignread = block;
-}
+/*     ufd = getskufd(sk); */
+/*     ufd->ignread = block; */
+/* } */
 
 int sockfamily(struct socket *sk)
 {