X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Fnet.c;h=9b5a34a8828c8c6fb9ddcc119d05d8b3ec216b9d;hb=e0cbc756d0375ee96cb9da2548117a6884d57a9f;hp=5471e45d50eca75570af6a21197078b175f3f96c;hpb=a8c5ada654f0ff7b7c8bb9542fcae9c4a917f353;p=doldaconnect.git

diff --git a/daemon/net.c b/daemon/net.c
index 5471e45..9b5a34a 100644
--- a/daemon/net.c
+++ b/daemon/net.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
@@ -549,7 +549,7 @@ void closesock(struct socket *sk)
 {
     struct sockaddr_un *un;
     
-    if((sk->family == AF_UNIX) && !sockgetlocalname(sk, (struct sockaddr **)&un, NULL) && (un->sun_family == PF_UNIX))
+    if((sk->family == AF_UNIX) && !sockgetlocalname(sk, (struct sockaddr **)(void *)&un, NULL) && (un->sun_family == PF_UNIX))
     {
 	if((sk->state == SOCK_LST) && strchr(un->sun_path, '/'))
 	{
@@ -1019,7 +1019,7 @@ int socksettos(struct socket *sk, int tos)
 	    flog(LOG_WARNING, "attempted to set unknown TOS value %i to IPv4 sock", tos);
 	    return(-1);
 	}
-	if(setsockopt(sk->fd, SOL_IP, IP_TOS, &buf, sizeof(buf)) < 0)
+	if(setsockopt(sk->fd, IPPROTO_IP, IP_TOS, &buf, sizeof(buf)) < 0)
 	{
 	    flog(LOG_WARNING, "could not set sock TOS to %i: %s", tos, strerror(errno));
 	    return(-1);
@@ -1083,7 +1083,7 @@ static void resolvecb(pid_t pid, int status, struct resolvedata *data)
     {
 	if((ret = read(data->fd, buf, sizeof(buf))) != 4)
 	{
-	    errno = ENONET;
+	    errno = ENOENT;
 	    data->callback(NULL, 0, data->data);
 	} else {
 	    ipv4 = (struct sockaddr_in *)&data->addr;
@@ -1091,7 +1091,7 @@ static void resolvecb(pid_t pid, int status, struct resolvedata *data)
 	    data->callback((struct sockaddr *)ipv4, sizeof(*ipv4), data->data);
 	}
     } else {
-	errno = ENONET;
+	errno = ENOENT;
 	data->callback(NULL, 0, data->data);
     }
     close(data->fd);