From c7b7039a4643a975697615d263c1e30e126b9c37 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Tue, 10 Dec 2013 07:41:43 +0100
Subject: swrap: Add libc_recvfrom().

---
 src/socket_wrapper.c | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c
index 63a8301..6246925 100644
--- a/src/socket_wrapper.c
+++ b/src/socket_wrapper.c
@@ -702,6 +702,18 @@ static ssize_t libc_readv(int fd, const struct iovec *iov, int iovcnt)
 	return swrap.fns.libc_readv(fd, iov, iovcnt);
 }
 
+static int libc_recvfrom(int sockfd,
+			 void *buf,
+			 size_t len,
+			 int flags,
+			 struct sockaddr *src_addr,
+			 socklen_t *addrlen)
+{
+	swrap_load_lib_function(SWRAP_LIBSOCKET, recvfrom);
+
+	return swrap.fns.libc_recvfrom(sockfd, buf, len, flags, src_addr, addrlen);
+}
+
 /*********************************************************
  * SWRAP HELPER FUNCTIONS
  *********************************************************/
@@ -2844,12 +2856,12 @@ static ssize_t swrap_recvfrom(int s, void *buf, size_t len, int flags,
 	socklen_t ss_len = sizeof(ss);
 
 	if (!si) {
-		return swrap.fns.libc_recvfrom(s,
-					       buf,
-					       len,
-					       flags,
-					       from,
-					       fromlen);
+		return libc_recvfrom(s,
+				     buf,
+				     len,
+				     flags,
+				     from,
+				     fromlen);
 	}
 
 	if (!from) {
@@ -2863,12 +2875,12 @@ static ssize_t swrap_recvfrom(int s, void *buf, size_t len, int flags,
 
 	/* irix 6.4 forgets to null terminate the sun_path string :-( */
 	memset(&un_addr, 0, sizeof(un_addr));
-	ret = swrap.fns.libc_recvfrom(s,
-				      buf,
-				      len,
-				      flags,
-				      (struct sockaddr *)(void *)&un_addr,
-				      &un_addrlen);
+	ret = libc_recvfrom(s,
+			    buf,
+			    len,
+			    flags,
+			    (struct sockaddr *)(void *)&un_addr,
+			    &un_addrlen);
 	if (ret == -1) 
 		return ret;
 
-- 
cgit