diff options
| author | Andreas Schneider <asn@cryptomilk.org> | 2013-12-05 13:45:19 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2013-12-05 13:45:19 +0100 |
| commit | bc81181b2dfea7eb99cec9003f62705f6797d0dc (patch) | |
| tree | 0f36f7fb144ca57ec3fb6f22aa77b968cdfb07fc | |
| parent | 7c271fdbba87b4cc782077126c8ac4b0795b6b29 (diff) | |
| download | socket_wrapper-bc81181b2dfea7eb99cec9003f62705f6797d0dc.tar.gz socket_wrapper-bc81181b2dfea7eb99cec9003f62705f6797d0dc.tar.xz socket_wrapper-bc81181b2dfea7eb99cec9003f62705f6797d0dc.zip | |
swrap: Use swrap structure for readv.
| -rw-r--r-- | src/socket_wrapper.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c index 3779be1..8ae0efb 100644 --- a/src/socket_wrapper.c +++ b/src/socket_wrapper.c @@ -561,17 +561,6 @@ static int libc_vioctl(int d, unsigned long int request, va_list ap) return rc; } -static ssize_t (*libc_readv)(int fd, const struct iovec *iov, int iovcnt); - -static ssize_t real_readv(int fd, const struct iovec *iov, int iovcnt) -{ - if (libc_readv == NULL) { - *(void **)(&libc_readv) = libc_dlsym("readv"); - } - - return libc_readv(fd, iov, iovcnt); -} - static int (*libc_recv)(int sockfd, void *buf, size_t len, int flags); static int real_recv(int sockfd, void *buf, size_t len, int flags) @@ -3156,7 +3145,7 @@ static ssize_t swrap_readv(int s, const struct iovec *vector, int count) struct iovec v; if (!si) { - return real_readv(s, vector, count); + return swrap.fns.libc_readv(s, vector, count); } if (!si->connected) { @@ -3184,7 +3173,7 @@ static ssize_t swrap_readv(int s, const struct iovec *vector, int count) } } - ret = real_readv(s, vector, count); + ret = swrap.fns.libc_readv(s, vector, count); if (ret == -1 && errno != EAGAIN && errno != ENOBUFS) { swrap_dump_packet(si, NULL, SWRAP_RECV_RST, NULL, 0); } else if (ret == 0) { /* END OF FILE */ |