diff options
| -rw-r--r-- | src/io/fd.cpp | 30 | ||||
| -rw-r--r-- | src/io/fd.hpp | 10 | ||||
| -rw-r--r-- | src/net/socket.cpp | 2 |
3 files changed, 41 insertions, 1 deletions
diff --git a/src/io/fd.cpp b/src/io/fd.cpp index bb0bbd5..918fd5e 100644 --- a/src/io/fd.cpp +++ b/src/io/fd.cpp @@ -75,6 +75,36 @@ namespace io { return ::write(fd, buf, count); } + ssize_t FD::send(const void *buf, size_t count, int flags) + { + return ::send(fd, buf, count, flags); + } + ssize_t FD::sendmsg(const struct msghdr *msg, int flags) + { + return ::sendmsg(fd, msg, flags); + } + int FD::sendmmsg(struct mmsghdr *msgvec, unsigned int vlen, unsigned int flags) + { + return ::sendmmsg(fd, msgvec, vlen, flags); + } + ssize_t FD::sendto(const void *buf, size_t count, int flags, + const struct sockaddr *dest_addr, socklen_t addrlen) + { + return ::sendto(fd, buf, count, flags, dest_addr, addrlen); + } + ssize_t FD::recv(void *buf, size_t count, int flags) + { + return ::recv(fd, buf, count, flags); + } + ssize_t FD::recvfrom(void *buf, size_t count, int flags, + struct sockaddr *src_addr, socklen_t *addrlen) + { + return ::recvfrom(fd, buf, count, flags, src_addr, addrlen); + } + ssize_t FD::recvmsg(struct msghdr *msg, int flags) + { + return ::recvmsg(fd, msg, flags); + } ssize_t FD::pread(void *buf, size_t count, off_t offset) { return ::pread(fd, buf, count, offset); diff --git a/src/io/fd.hpp b/src/io/fd.hpp index 03a8b44..517c7af 100644 --- a/src/io/fd.hpp +++ b/src/io/fd.hpp @@ -77,6 +77,16 @@ namespace io ssize_t read(void *buf, size_t count); ssize_t write(const void *buf, size_t count); + ssize_t send(const void *buf, size_t count, int flags); + ssize_t sendto(const void *buf, size_t count, int flags, + const struct sockaddr *dest_addr, socklen_t addrlen); + ssize_t sendmsg(const struct msghdr *msg, int flags); + int sendmmsg(struct mmsghdr *msgvec, unsigned int vlen, + unsigned int flags); + ssize_t recv(void *buf, size_t len, int flags); + ssize_t recvfrom(void *buf, size_t len, int flags, + struct sockaddr *src_addr, socklen_t *addrlen); + ssize_t recvmsg(struct msghdr *msg, int flags); ssize_t pread(void *buf, size_t count, off_t offset); ssize_t pwrite(const void *buf, size_t count, off_t offset); ssize_t readv(const struct iovec *iov, int iovcnt); diff --git a/src/net/socket.cpp b/src/net/socket.cpp index fce45fb..7f71310 100644 --- a/src/net/socket.cpp +++ b/src/net/socket.cpp @@ -153,7 +153,7 @@ void recv_to_fifo(Session *s) static void send_from_fifo(Session *s) { - ssize_t len = s->fd.write(&s->wdata[0], s->wdata_size); + ssize_t len = s->fd.send(&s->wdata[0], s->wdata_size, MSG_NOSIGNAL); if (len > 0) { |