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.4 by root, Tue Jan 17 15:17:39 2006 UTC vs.
Revision 1.15 by sf-exg, Wed Jul 21 08:46:13 2010 UTC

1// This file is part of libptytty. Do not make local modifications.
2// http://software.schmorp.de/pkg/libptytty
3
1/*--------------------------------*-C-*---------------------------------* 4/*----------------------------------------------------------------------*
2 * File: fdpass.C 5 * File: fdpass.C
3 *----------------------------------------------------------------------* 6 *----------------------------------------------------------------------*
4 * 7 *
5 * All portions of code are copyright by their respective author/s. 8 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com> 9 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com>
… …
18 * 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
19 * along with this program; if not, write to the Free Software 22 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 *----------------------------------------------------------------------*/ 24 *----------------------------------------------------------------------*/
22 25
23#include "../config.h" 26#include "config.h"
24#include "rxvt.h" 27
28#include <cstddef> // needed by broken bsds for NULL used in sys/uio.h
29#include <cstdlib>
25 30
26#include <sys/types.h> 31#include <sys/types.h>
32#include <sys/uio.h>
27#include <sys/socket.h> 33#include <sys/socket.h>
28 34
29#include "fdpass.h" 35#include "libptytty.h"
30 36
31#include <cstdio> //d 37// CMSG_SPACE & CMSG_LEN are rfc2292 extensions to unix
38#ifndef CMSG_SPACE
39# define CMSG_SPACE(len) (sizeof (cmsghdr) + len)
40#endif
32 41
33#ifndef CMSG_LEN // CMSG_SPACe && CMSG_LEN are rfc2292 extensions to unix 42#ifndef CMSG_LEN
34# define CMSG_LEN(len) (sizeof (cmsghdr) + len) 43# define CMSG_LEN(len) (sizeof (cmsghdr) + len)
35#endif 44#endif
36 45
37int 46bool
38rxvt_send_fd (int socket, int fd) 47ptytty::send_fd (int socket, int fd)
39{ 48{
49 void *buf = malloc (CMSG_SPACE (sizeof (int)));
50
51 if (!buf)
52 return 0;
53
40 msghdr msg; 54 msghdr msg;
41 iovec iov; 55 iovec iov;
42 char buf [CMSG_LEN (sizeof (int))]; 56 cmsghdr *cmsg;
43 char data = 0; 57 char data = 0;
44 58
45 iov.iov_base = &data; 59 iov.iov_base = &data;
46 iov.iov_len = 1; 60 iov.iov_len = 1;
47 61
48 msg.msg_name = 0; 62 msg.msg_name = 0;
49 msg.msg_namelen = 0; 63 msg.msg_namelen = 0;
50 msg.msg_iov = &iov; 64 msg.msg_iov = &iov;
51 msg.msg_iovlen = 1; 65 msg.msg_iovlen = 1;
52 msg.msg_control = (void *)buf; 66 msg.msg_control = buf;
53 msg.msg_controllen = sizeof buf; 67 msg.msg_controllen = CMSG_SPACE (sizeof (int));
54 68
55 cmsghdr *cmsg = CMSG_FIRSTHDR (&msg); 69 cmsg = CMSG_FIRSTHDR (&msg);
56 cmsg->cmsg_level = SOL_SOCKET; 70 cmsg->cmsg_level = SOL_SOCKET;
57 cmsg->cmsg_type = SCM_RIGHTS; 71 cmsg->cmsg_type = SCM_RIGHTS;
58 cmsg->cmsg_len = CMSG_LEN (sizeof (int)); 72 cmsg->cmsg_len = CMSG_LEN (sizeof (int));
59 73
60 *(int *)CMSG_DATA (cmsg) = fd; 74 *(int *)CMSG_DATA (cmsg) = fd;
61 75
62 msg.msg_controllen = cmsg->cmsg_len; 76 ssize_t result = sendmsg (socket, &msg, 0);
63 77
64 return sendmsg (socket, &msg, 0); 78 free (buf);
79
80 return result >= 0;
65} 81}
66 82
67int 83int
68rxvt_recv_fd (int socket) 84ptytty::recv_fd (int socket)
69{ 85{
86 void *buf = malloc (CMSG_SPACE (sizeof (int)));
87
88 if (!buf)
89 return -1;
90
70 msghdr msg; 91 msghdr msg;
71 iovec iov; 92 iovec iov;
72 char buf [CMSG_LEN (sizeof (int))]; /* ancillary data buffer */
73 char data = 1; 93 char data = 1;
74 94
75 iov.iov_base = &data; 95 iov.iov_base = &data;
76 iov.iov_len = 1; 96 iov.iov_len = 1;
77 97
78 msg.msg_name = 0; 98 msg.msg_name = 0;
79 msg.msg_namelen = 0; 99 msg.msg_namelen = 0;
80 msg.msg_iov = &iov; 100 msg.msg_iov = &iov;
81 msg.msg_iovlen = 1; 101 msg.msg_iovlen = 1;
82 msg.msg_control = buf; 102 msg.msg_control = buf;
83 msg.msg_controllen = sizeof buf; 103 msg.msg_controllen = CMSG_SPACE (sizeof (int));
84 104
85 cmsghdr *cmsg = CMSG_FIRSTHDR (&msg); 105 int fd = -1;
86 cmsg->cmsg_level = SOL_SOCKET;
87 cmsg->cmsg_type = SCM_RIGHTS;
88 cmsg->cmsg_len = CMSG_LEN (sizeof (int));
89 106
90 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);
91 112
92 if (recvmsg (socket, &msg, 0) <= 0
93 || data != 0
94 || msg.msg_controllen < CMSG_LEN (sizeof (int))
95 || cmsg->cmsg_level != SOL_SOCKET 113 if (cmsg->cmsg_level == SOL_SOCKET
96 || cmsg->cmsg_type != SCM_RIGHTS 114 && cmsg->cmsg_type == SCM_RIGHTS
97 || cmsg->cmsg_len < CMSG_LEN (sizeof (int))) 115 && cmsg->cmsg_len >= CMSG_LEN (sizeof (int)))
98 return -1; 116 fd = *(int *)CMSG_DATA (cmsg);
117 }
99 118
100 return *(int *)CMSG_DATA (cmsg); 119 free (buf);
120
121 return fd;
101} 122}
102 123

Diff Legend

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