ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/fdpass.C
(Generate patch)

Comparing rxvt-unicode/src/fdpass.C (file contents):
Revision 1.8 by root, Sun Jan 22 01:00:46 2006 UTC vs.
Revision 1.15 by sf-exg, Wed Jul 21 08:46:13 2010 UTC

… …
21 * You should have received a copy of the GNU General Public License 21 * You should have received a copy of the GNU General Public License
22 * along with this program; if not, write to the Free Software 22 * along with this program; if not, write to the Free Software
23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
24 *----------------------------------------------------------------------*/ 24 *----------------------------------------------------------------------*/
25 25
26#include "../config.h" 26#include "config.h"
27 27
28#include <cstddef> // needed by broken bsds for NULL used in sys/uio.h
29#include <cstdlib>
30
31#include <sys/types.h>
28#include <sys/uio.h> 32#include <sys/uio.h>
29#include <sys/types.h>
30#include <sys/socket.h> 33#include <sys/socket.h>
31 34
32#include "libptytty.h" 35#include "libptytty.h"
33 36
34#ifndef CMSG_LEN // CMSG_SPACe && CMSG_LEN are rfc2292 extensions to unix 37// CMSG_SPACE & CMSG_LEN are rfc2292 extensions to unix
38#ifndef CMSG_SPACE
39# define CMSG_SPACE(len) (sizeof (cmsghdr) + len)
40#endif
41
42#ifndef CMSG_LEN
35# define CMSG_LEN(len) (sizeof (cmsghdr) + len) 43# define CMSG_LEN(len) (sizeof (cmsghdr) + len)
36#endif 44#endif
37 45
38int 46bool
39ptytty::send_fd (int socket, int fd) 47ptytty::send_fd (int socket, int fd)
40{ 48{
49 void *buf = malloc (CMSG_SPACE (sizeof (int)));
50
51 if (!buf)
52 return 0;
53
41 msghdr msg; 54 msghdr msg;
42 iovec iov; 55 iovec iov;
43 char buf [CMSG_LEN (sizeof (int))]; 56 cmsghdr *cmsg;
44 char data = 0; 57 char data = 0;
45 58
46 iov.iov_base = &data; 59 iov.iov_base = &data;
47 iov.iov_len = 1; 60 iov.iov_len = 1;
48 61
49 msg.msg_name = 0; 62 msg.msg_name = 0;
50 msg.msg_namelen = 0; 63 msg.msg_namelen = 0;
51 msg.msg_iov = &iov; 64 msg.msg_iov = &iov;
52 msg.msg_iovlen = 1; 65 msg.msg_iovlen = 1;
53 msg.msg_control = (void *)buf; 66 msg.msg_control = buf;
54 msg.msg_controllen = sizeof buf; 67 msg.msg_controllen = CMSG_SPACE (sizeof (int));
55 68
56 cmsghdr *cmsg = CMSG_FIRSTHDR (&msg); 69 cmsg = CMSG_FIRSTHDR (&msg);
57 cmsg->cmsg_level = SOL_SOCKET; 70 cmsg->cmsg_level = SOL_SOCKET;
58 cmsg->cmsg_type = SCM_RIGHTS; 71 cmsg->cmsg_type = SCM_RIGHTS;
59 cmsg->cmsg_len = CMSG_LEN (sizeof (int)); 72 cmsg->cmsg_len = CMSG_LEN (sizeof (int));
60 73
61 *(int *)CMSG_DATA (cmsg) = fd; 74 *(int *)CMSG_DATA (cmsg) = fd;
62 75
63 msg.msg_controllen = cmsg->cmsg_len; 76 ssize_t result = sendmsg (socket, &msg, 0);
64 77
65 return sendmsg (socket, &msg, 0); 78 free (buf);
79
80 return result >= 0;
66} 81}
67 82
68int 83int
69ptytty::recv_fd (int socket) 84ptytty::recv_fd (int socket)
70{ 85{
86 void *buf = malloc (CMSG_SPACE (sizeof (int)));
87
88 if (!buf)
89 return -1;
90
71 msghdr msg; 91 msghdr msg;
72 iovec iov; 92 iovec iov;
73 char buf [CMSG_LEN (sizeof (int))]; /* ancillary data buffer */
74 char data = 1; 93 char data = 1;
75 94
76 iov.iov_base = &data; 95 iov.iov_base = &data;
77 iov.iov_len = 1; 96 iov.iov_len = 1;
78 97
79 msg.msg_name = 0; 98 msg.msg_name = 0;
80 msg.msg_namelen = 0; 99 msg.msg_namelen = 0;
81 msg.msg_iov = &iov; 100 msg.msg_iov = &iov;
82 msg.msg_iovlen = 1; 101 msg.msg_iovlen = 1;
83 msg.msg_control = buf; 102 msg.msg_control = buf;
84 msg.msg_controllen = sizeof buf; 103 msg.msg_controllen = CMSG_SPACE (sizeof (int));
85 104
86 cmsghdr *cmsg = CMSG_FIRSTHDR (&msg); 105 int fd = -1;
87 cmsg->cmsg_level = SOL_SOCKET;
88 cmsg->cmsg_type = SCM_RIGHTS;
89 cmsg->cmsg_len = CMSG_LEN (sizeof (int));
90 106
91 msg.msg_controllen = cmsg->cmsg_len; 107 if (recvmsg (socket, &msg, 0) > 0
108 && data == 0
109 && msg.msg_controllen >= CMSG_SPACE (sizeof (int)))
110 {
111 cmsghdr *cmsg = CMSG_FIRSTHDR (&msg);
92 112
93 if (recvmsg (socket, &msg, 0) <= 0
94 || data != 0
95 || msg.msg_controllen < CMSG_LEN (sizeof (int))
96 || cmsg->cmsg_level != SOL_SOCKET 113 if (cmsg->cmsg_level == SOL_SOCKET
97 || cmsg->cmsg_type != SCM_RIGHTS 114 && cmsg->cmsg_type == SCM_RIGHTS
98 || cmsg->cmsg_len < CMSG_LEN (sizeof (int))) 115 && cmsg->cmsg_len >= CMSG_LEN (sizeof (int)))
99 return -1; 116 fd = *(int *)CMSG_DATA (cmsg);
117 }
100 118
101 return *(int *)CMSG_DATA (cmsg); 119 free (buf);
120
121 return fd;
102} 122}
103 123

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines