From ee6466ee26d8642137959d8d17029736a35cdb96 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Thu, 5 Dec 2013 12:11:57 +0100
Subject: swrap: Use swrap structure for getpeername.

---
 src/socket_wrapper.c | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c
index ef32cbe..30c5334 100644
--- a/src/socket_wrapper.c
+++ b/src/socket_wrapper.c
@@ -541,21 +541,6 @@ static void *libc_dlsym(const char *name)
 	return func;
 }
 
-static int (*libc_getpeername)(int sockfd,
-			       struct sockaddr *addr,
-			       socklen_t *addrlen);
-
-static int real_getpeername(int sockfd,
-			    struct sockaddr *addr,
-			    socklen_t *addrlen)
-{
-	if (libc_getpeername == NULL) {
-		*(void **)(&libc_getpeername) = libc_dlsym("getpeername");
-	}
-
-	return libc_getpeername(sockfd, addr, addrlen);
-}
-
 static int (*libc_getsockname)(int sockfd,
 			       struct sockaddr *addr,
 			       socklen_t *addrlen);
@@ -2493,7 +2478,7 @@ static int swrap_getpeername(int s, struct sockaddr *name, socklen_t *addrlen)
 	struct socket_info *si = find_socket_info(s);
 
 	if (!si) {
-		return real_getpeername(s, name, addrlen);
+		return swrap.fns.libc_getpeername(s, name, addrlen);
 	}
 
 	if (!si->peername)
-- 
cgit