diff options
| -rw-r--r-- | base/unix_domain_socket_posix.cc | 6 | ||||
| -rw-r--r-- | base/unix_domain_socket_posix.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/base/unix_domain_socket_posix.cc b/base/unix_domain_socket_posix.cc index 08c41cf..73fa260 100644 --- a/base/unix_domain_socket_posix.cc +++ b/base/unix_domain_socket_posix.cc @@ -15,7 +15,8 @@ namespace base { -bool SendMsg(int fd, const void* buf, size_t length, std::vector<int>& fds) { +bool SendMsg(int fd, const void* buf, size_t length, + const std::vector<int>& fds) { struct msghdr msg; memset(&msg, 0, sizeof(msg)); struct iovec iov = {const_cast<void*>(buf), length}; @@ -26,11 +27,8 @@ bool SendMsg(int fd, const void* buf, size_t length, std::vector<int>& fds) { if (fds.size()) { const unsigned control_len = CMSG_SPACE(sizeof(int) * fds.size()); control_buffer = new char[control_len]; - if (!control_buffer) - return false; struct cmsghdr *cmsg; - msg.msg_control = control_buffer; msg.msg_controllen = control_len; cmsg = CMSG_FIRSTHDR(&msg); diff --git a/base/unix_domain_socket_posix.h b/base/unix_domain_socket_posix.h index 020127a..51c821b 100644 --- a/base/unix_domain_socket_posix.h +++ b/base/unix_domain_socket_posix.h @@ -17,7 +17,7 @@ namespace base { // Use sendmsg to write the given msg and include a vector // of file descriptors. Returns true iff successful. bool SendMsg(int fd, const void* msg, size_t length, - std::vector<int>& fds); + const std::vector<int>& fds); // Use recvmsg to read a message and an array of file descriptors. Returns // -1 on failure. Note: will read, at most, 16 descriptors. ssize_t RecvMsg(int fd, void* msg, size_t length, std::vector<int>* fds); |