Merge branch 'master' into socket

Conflicts:

	daemon/net.c

diff --cc daemon/fnet-dc.c
Simple merge

diff --cc daemon/net.c
index d64e8c8,d0cd9c8..240855a
--- 1/daemon/net.c
--- 2/daemon/net.c
+++ b/daemon/net.c
@@@ -1154,17 -985,13 +1158,19 @@@ static struct ufd *getskufd(struct sock
  int socksettos(struct socket *sk, int tos)
  {
      int buf;
 +    struct ufd *ufd;
+     int dscp2tos;
      
 -    if(sk->family == AF_UNIX)
 +    ufd = getskufd(sk);
 +    if(ufd->type != UFD_SOCK) {
 +      errno = EOPNOTSUPP;
 +      return(-1);
 +    }
 +    if(ufd->d.s.family == AF_UNIX)
        return(0); /* Unix sockets are always perfect. :) */
 -    if(sk->family == AF_INET)
 +    if(ufd->d.s.family == AF_INET)
      {
+       dscp2tos = confgetint("net", "dscp-tos");
        switch(tos)
        {
        case 0:

diff --cc daemon/ui.c
Simple merge