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.13 by ayin, Mon Sep 11 08:48:37 2006 UTC vs.
Revision 1.14 by root, Sun May 3 21:44:08 2009 UTC

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

Diff Legend

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