Revert to previous socket scheme.

[doldaconnect.git] / daemon / net.c

diff --git a/daemon/net.c b/daemon/net.c
index 647840c..2a8fdef 100644 (file)
--- a/daemon/net.c
+++ b/daemon/net.c
@@ -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;
@@ -1122,9 +1124,9 @@ int sockgetremotename2(struct socket *sk, struct socket *sk2, struct sockaddr **
        flog(LOG_ERR, "using sockgetremotename2 with sockets of differing family: %i %i", sk->family, sk2->family);
        return(-1);
     }
-    if(sockgetlocalname(sk, &name1, &len1))
+    if(sockgetremotename(sk, &name1, &len1))
        return(-1);
-    if(sockgetlocalname(sk2, &name2, &len2)) {
+    if(sockgetremotename(sk2, &name2, &len2)) {
        free(name1);
        return(-1);
     }