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.3 by root, Fri Jan 13 07:03:48 2006 UTC vs.
Revision 1.14 by root, Sun May 3 21:44:08 2009 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>
… …
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"
25 27
26#if ENABLE_FRILLS && HAVE_UNIX_FDPASS 28#include <cstddef> // needed by broken bsds for NULL used in sys/uio.h
29#include <cstdlib>
27 30
28#include <sys/types.h> 31#include <sys/types.h>
32#include <sys/uio.h>
29#include <sys/socket.h> 33#include <sys/socket.h>
30 34
31#include "fdpass.h" 35#include "libptytty.h"
32 36
33#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
34 41
35#ifndef CMSG_LEN // CMSG_SPACe && CMSG_LEN are rfc2292 extensions to unix 42#ifndef CMSG_LEN
36# define CMSG_LEN(len) (sizeof (cmsghdr) + len) 43# define CMSG_LEN(len) (sizeof (cmsghdr) + len)
37#endif 44#endif
38 45
39int 46bool
40rxvt_send_fd (int socket, int fd) 47ptytty::send_fd (int socket, int fd)
41{ 48{
49 void *buf = malloc (CMSG_SPACE (sizeof (int)));
50
51 if (!buf)
52 return 0;
53
42 msghdr msg; 54 msghdr msg;
43 iovec iov; 55 iovec iov;
44 char buf [CMSG_LEN (sizeof (int))]; 56 cmsghdr *cmsg;
45 char data = 0; 57 char data = 0;
46 58
47 iov.iov_base = &data; 59 iov.iov_base = &data;
48 iov.iov_len = 1; 60 iov.iov_len = 1;
49 61
50 msg.msg_name = 0; 62 msg.msg_name = 0;
51 msg.msg_namelen = 0; 63 msg.msg_namelen = 0;
52 msg.msg_iov = &iov; 64 msg.msg_iov = &iov;
53 msg.msg_iovlen = 1; 65 msg.msg_iovlen = 1;
54 msg.msg_control = (void *)buf; 66 msg.msg_control = buf;
55 msg.msg_controllen = sizeof buf; 67 msg.msg_controllen = CMSG_SPACE (sizeof (int));
56 68
57 cmsghdr *cmsg = CMSG_FIRSTHDR (&msg); 69 cmsg = CMSG_FIRSTHDR (&msg);
58 cmsg->cmsg_level = SOL_SOCKET; 70 cmsg->cmsg_level = SOL_SOCKET;
59 cmsg->cmsg_type = SCM_RIGHTS; 71 cmsg->cmsg_type = SCM_RIGHTS;
60 cmsg->cmsg_len = CMSG_LEN (sizeof (int)); 72 cmsg->cmsg_len = CMSG_LEN (sizeof (int));
61 73
62 *(int *)CMSG_DATA (cmsg) = fd; 74 *(int *)CMSG_DATA (cmsg) = fd;
63 75
64 msg.msg_controllen = cmsg->cmsg_len; 76 ssize_t result = sendmsg (socket, &msg, 0);
65 77
66 return sendmsg (socket, &msg, 0); 78 free (buf);
79
80 return result >= 0;
67} 81}
68 82
69int 83int
70rxvt_recv_fd (int socket) 84ptytty::recv_fd (int socket)
71{ 85{
86 void *buf = malloc (CMSG_SPACE (sizeof (int)));
87
88 if (!buf)
89 return -1;
90
72 msghdr msg; 91 msghdr msg;
73 iovec iov; 92 iovec iov;
74 char buf [CMSG_LEN (sizeof (int))]; /* ancillary data buffer */
75 char data = 1; 93 char data = 1;
76 94
77 iov.iov_base = &data; 95 iov.iov_base = &data;
78 iov.iov_len = 1; 96 iov.iov_len = 1;
79 97
80 msg.msg_name = 0; 98 msg.msg_name = 0;
81 msg.msg_namelen = 0; 99 msg.msg_namelen = 0;
82 msg.msg_iov = &iov; 100 msg.msg_iov = &iov;
83 msg.msg_iovlen = 1; 101 msg.msg_iovlen = 1;
84 msg.msg_control = buf; 102 msg.msg_control = buf;
85 msg.msg_controllen = sizeof buf; 103 msg.msg_controllen = CMSG_SPACE (sizeof (int));
86 104
87 cmsghdr *cmsg = CMSG_FIRSTHDR (&msg); 105 int fd = -1;
88 cmsg->cmsg_level = SOL_SOCKET;
89 cmsg->cmsg_type = SCM_RIGHTS;
90 cmsg->cmsg_len = CMSG_LEN (sizeof (int));
91 106
92 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);
93 112
94 if (recvmsg (socket, &msg, 0) <= 0
95 || data != 0
96 || msg.msg_controllen < CMSG_LEN (sizeof (int))
97 || cmsg->cmsg_level != SOL_SOCKET 113 if (cmsg->cmsg_level == SOL_SOCKET
98 || cmsg->cmsg_type != SCM_RIGHTS 114 && cmsg->cmsg_type == SCM_RIGHTS
99 || cmsg->cmsg_len < CMSG_LEN (sizeof (int))) 115 && cmsg->cmsg_len >= CMSG_LEN (sizeof (int)))
100 return -1; 116 fd = *(int *)CMSG_DATA (cmsg);
117 }
101 118
102 return *(int *)CMSG_DATA (cmsg); 119 free (buf);
120
121 return fd;
103} 122}
104 123
105#endif
106

Diff Legend

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