X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Fnet.c;h=2a8fdefe304015411ad4d5982a569e90dee59bda;hb=c26de38e9fc0ceb4f51af1085da37db42f4c4411;hp=d8038d1ed0fefca0e1ce24bdb1b88bd2e07095e9;hpb=6fb0c6ac0396f47c19f2ecc0394fd4e15cad89cb;p=doldaconnect.git

diff --git a/daemon/net.c b/daemon/net.c
index d8038d1..2a8fdef 100644
--- a/daemon/net.c
+++ b/daemon/net.c
@@ -109,7 +109,7 @@ int getpublicaddr(int af, struct sockaddr **addr, socklen_t *lenbuf)
 	ipv4 = NULL;
 	for(ifr = conf.ifc_ifcu.ifcu_req; (void *)ifr < bufend; ifr++)
 	{
-	    if(strcmp(ifr->ifrname, pif))
+	    if(strcmp(ifr->ifr_name, pif))
 		continue;
 	    memset(&req, 0, sizeof(req));
 	    memcpy(req.ifr_name, ifr->ifr_name, sizeof(ifr->ifr_name));
@@ -253,12 +253,14 @@ void putsock(struct socket *sk)
 	    {
 		sk->outbuf.d.f = buf->next;
 		free(buf->data);
+		free(buf->addr);
 		free(buf);
 	    }
 	    while((buf = sk->inbuf.d.f) != NULL)
 	    {
 		sk->inbuf.d.f = buf->next;
 		free(buf->data);
+		free(buf->addr);
 		free(buf);
 	    }
 	    break;
@@ -702,7 +704,8 @@ struct socket *netcsconn(struct sockaddr *addr, socklen_t addrlen, void (*func)(
 
 int pollsocks(int timeout)
 {
-    int i, num, ret, retlen;
+    int i, num, ret;
+    socklen_t retlen;
     int newfd;
     struct pollfd *pfds;
     struct socket *sk, *next, *newsk;
@@ -1039,9 +1042,47 @@ int sockgetlocalname(struct socket *sk, struct sockaddr **namebuf, socklen_t *le
     return(0);
 }
 
-int sockgetremotename(struct socket *sk, struct sockaddr **namebuf, socklen_t *lenbuf)
+static void sethostaddr(struct sockaddr *dst, struct sockaddr *src)
+{
+    if(dst->sa_family != src->sa_family)
+    {
+	flog(LOG_ERR, "BUG: non-matching socket families in sethostaddr (%i -> %i)", src->sa_family, dst->sa_family);
+	return;
+    }
+    switch(src->sa_family)
+    {
+    case AF_INET:
+	((struct sockaddr_in *)dst)->sin_addr = ((struct sockaddr_in *)src)->sin_addr;
+	break;
+    case AF_INET6:
+	((struct sockaddr_in6 *)dst)->sin6_addr = ((struct sockaddr_in6 *)src)->sin6_addr;
+	break;
+    default:
+	flog(LOG_WARNING, "sethostaddr unimplemented for family %i", src->sa_family);
+	break;
+    }
+}
+
+static int makepublic(struct sockaddr *addr)
 {
     int ret;
+    socklen_t plen;
+    struct sockaddr *pname;
+    
+    if((ret = getpublicaddr(addr->sa_family, &pname, &plen)) < 0)
+    {
+	flog(LOG_ERR, "could not get public address: %s", strerror(errno));
+	return(-1);
+    }
+    if(ret)
+	return(0);
+    sethostaddr(addr, pname);
+    free(pname);
+    return(0);
+}
+
+int sockgetremotename(struct socket *sk, struct sockaddr **namebuf, socklen_t *lenbuf)
+{
     socklen_t len;
     struct sockaddr *name;
     
@@ -1050,22 +1091,15 @@ int sockgetremotename(struct socket *sk, struct sockaddr **namebuf, socklen_t *l
     case 0:
 	*namebuf = NULL;
 	if((sk->state == SOCK_STL) || (sk->fd < 0))
-	    return(-1);
-	if((ret = getpublicaddr(sk->family, &name, &len)) < 0)
 	{
-	    flog(LOG_ERR, "could not get public address: %s", strerror(errno));
+	    errno = EBADF;
 	    return(-1);
 	}
-	if(ret == 0)
-	{
-	    *namebuf = name;
-	    *lenbuf = len;
-	    return(0);
-	}
 	if(!sockgetlocalname(sk, &name, &len))
 	{
 	    *namebuf = name;
 	    *lenbuf = len;
+	    makepublic(name);
 	    return(0);
 	}
 	flog(LOG_ERR, "could not get remotely accessible name by any means");
@@ -1080,6 +1114,29 @@ int sockgetremotename(struct socket *sk, struct sockaddr **namebuf, socklen_t *l
     }
 }
 
+int sockgetremotename2(struct socket *sk, struct socket *sk2, struct sockaddr **namebuf, socklen_t *lenbuf)
+{
+    struct sockaddr *name1, *name2;
+    socklen_t len1, len2;
+    
+    if(sk->family != sk2->family)
+    {
+	flog(LOG_ERR, "using sockgetremotename2 with sockets of differing family: %i %i", sk->family, sk2->family);
+	return(-1);
+    }
+    if(sockgetremotename(sk, &name1, &len1))
+	return(-1);
+    if(sockgetremotename(sk2, &name2, &len2)) {
+	free(name1);
+	return(-1);
+    }
+    sethostaddr(name1, name2);
+    free(name2);
+    *namebuf = name1;
+    *lenbuf = len1;
+    return(0);
+}
+
 int addreq(struct sockaddr *x, struct sockaddr *y)
 {
     struct sockaddr_un *u1, *u2;
@@ -1103,6 +1160,7 @@ int addreq(struct sockaddr *x, struct sockaddr *y)
 	if(n1->sin_addr.s_addr != n2->sin_addr.s_addr)
 	    return(0);
 	break;
+#ifdef HAVE_IPV6
     case AF_INET6:
 	s1 = (struct sockaddr_in6 *)x; s2 = (struct sockaddr_in6 *)y;
 	if(s1->sin6_port != s2->sin6_port)
@@ -1110,6 +1168,7 @@ int addreq(struct sockaddr *x, struct sockaddr *y)
 	if(memcmp(s1->sin6_addr.s6_addr, s2->sin6_addr.s6_addr, sizeof(s1->sin6_addr.s6_addr)))
 	    return(0);
 	break;
+#endif
     }
     return(1);
 }