summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2010-10-30 16:23:49 +0200
committerStefan Metzmacher <metze@samba.org>2011-03-03 22:57:26 +0100
commit4a736f0fbe58fabf6c0a0650cbc38882cb0446ab (patch)
tree11673a82c7ef21058c03a2664aa651e804042c13
parenta2db6b4dba2650c582aa4572276d96dac521a3d8 (diff)
downloadsamba-4a736f0fbe58fabf6c0a0650cbc38882cb0446ab.tar.gz
samba-4a736f0fbe58fabf6c0a0650cbc38882cb0446ab.tar.bz2
samba-4a736f0fbe58fabf6c0a0650cbc38882cb0446ab.zip
socket_wrapper: use swrap_sendmsg_before()/after() in swrap_send()
metze
-rw-r--r--lib/socket_wrapper/socket_wrapper.c55
1 files changed, 18 insertions, 37 deletions
diff --git a/lib/socket_wrapper/socket_wrapper.c b/lib/socket_wrapper/socket_wrapper.c
index 2f9dc1b0ef..d514ae4535 100644
--- a/lib/socket_wrapper/socket_wrapper.c
+++ b/lib/socket_wrapper/socket_wrapper.c
@@ -2251,55 +2251,36 @@ _PUBLIC_ ssize_t swrap_read(int s, void *buf, size_t len)
_PUBLIC_ ssize_t swrap_send(int s, const void *buf, size_t len, int flags)
{
- int ret;
+ struct msghdr msg;
+ struct iovec tmp;
+ struct sockaddr_un un_addr;
+ ssize_t ret;
struct socket_info *si = find_socket_info(s);
if (!si) {
return real_send(s, buf, len, flags);
}
- if (si->type == SOCK_STREAM) {
- /* cut down to 1500 byte packets for stream sockets,
- * which makes it easier to format PCAP capture files
- * (as the caller will simply continue from here) */
- len = MIN(len, 1500);
- }
-
- if (si->defer_connect) {
- struct sockaddr_un un_addr;
- int bcast = 0;
-
- if (si->bound == 0) {
- ret = swrap_auto_bind(si, si->family);
- if (ret == -1) return -1;
- }
-
- ret = sockaddr_convert_to_un(si, si->peername, si->peername_len,
- &un_addr, 0, &bcast);
- if (ret == -1) return -1;
+ tmp.iov_base = discard_const_p(char, buf);
+ tmp.iov_len = len;
- ret = real_connect(s, (struct sockaddr *)(void *)&un_addr,
- sizeof(un_addr));
+ msg.msg_name = NULL; /* optional address */
+ msg.msg_namelen = 0; /* size of address */
+ msg.msg_iov = &tmp; /* scatter/gather array */
+ msg.msg_iovlen = 1; /* # elements in msg_iov */
+ msg.msg_control = NULL; /* ancillary data, see below */
+ msg.msg_controllen = 0; /* ancillary data buffer len */
+ msg.msg_flags = 0; /* flags on received message */
- /* to give better errors */
- if (ret == -1 && errno == ENOENT) {
- errno = EHOSTUNREACH;
- }
+ ret = swrap_sendmsg_before(si, &msg, &tmp, &un_addr, NULL, NULL, NULL);
+ if (ret == -1) return -1;
- if (ret == -1) {
- return ret;
- }
- si->defer_connect = 0;
- }
+ buf = msg.msg_iov[0].iov_base;
+ len = msg.msg_iov[0].iov_len;
ret = real_send(s, buf, len, flags);
- if (ret == -1) {
- swrap_dump_packet(si, NULL, SWRAP_SEND, buf, len);
- swrap_dump_packet(si, NULL, SWRAP_SEND_RST, NULL, 0);
- } else {
- swrap_dump_packet(si, NULL, SWRAP_SEND, buf, ret);
- }
+ swrap_sendmsg_after(si, &msg, NULL, ret);
return ret;
}