[ViewVC] Diff of: cvs/rxvt-unicode/src/ptytty.C

Comparing rxvt-unicode/src/ptytty.C (file contents):
Revision 1.50 by root, Thu Jan 19 16:43:36 2006 UTC vs.
Revision 1.60 by root, Mon Jan 23 12:37:59 2006 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: ptytty.C	5	* File: ptytty.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) 1999-2001 Geoff Wing <gcw@pobox.com>	9	* Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com>
7	* Copyright (c) 2004-2006 Marc Lehmann <pcg@goof.com>	10	* Copyright (c) 2004-2006 Marc Lehmann <pcg@goof.com>
		11	* Copyright (c) 2006 Emanuele Giaquinta <e.giaquinta@glauco.it>
8	*	12	*
9	* This program is free software; you can redistribute it and/or modify	13	* This program is free software; you can redistribute it and/or modify
10	* it under the terms of the GNU General Public License as published by	14	* it under the terms of the GNU General Public License as published by
11	* the Free Software Foundation; either version 2 of the License, or	15	* the Free Software Foundation; either version 2 of the License, or
12	* (at your option) any later version.	16	* (at your option) any later version.
19	* You should have received a copy of the GNU General Public License	23	* You should have received a copy of the GNU General Public License
20	* along with this program; if not, write to the Free Software	24	* along with this program; if not, write to the Free Software
21	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	25	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22	---------------------------------------------------------------------/	26	---------------------------------------------------------------------/
23		27
24	#include "../config.h" /* NECESSARY */	28	#include "../config.h"
		29
25	#include "rxvt.h"	30	#include "ptytty.h"
26		31
27	#include <cstdlib>	32	#include <cstdlib>
28	#include <cstring>	33	#include <cstring>
		34	#include <csignal>
29		35
30	#include <sys/types.h>	36	#include <sys/types.h>
31	#include <sys/socket.h>	37	#include <sys/socket.h>
32	#include <unistd.h>	38	#include <unistd.h>
33	#include <fcntl.h>	39	#include <fcntl.h>
34		40
35	#ifdef HAVE_SYS_IOCTL_H	41	#ifdef HAVE_SYS_IOCTL_H
36	# include <sys/ioctl.h>	42	# include <sys/ioctl.h>
37	#endif	43	#endif
38	#if defined(PTYS_ARE_PTMX) && defined(HAVE_SYS_STROPTS_H)	44	#if defined(HAVE_DEV_PTMX) && defined(HAVE_SYS_STROPTS_H)
39	# include <sys/stropts.h> /* for I_PUSH */	45	# include <sys/stropts.h> /* for I_PUSH */
40	#endif	46	#endif
41	#ifdef HAVE_ISASTREAM	47	#ifdef HAVE_ISASTREAM
42	# include <stropts.h>	48	# include <stropts.h>
43	#endif	49	#endif
…		…
46	#elif defined(HAVE_LIBUTIL_H)	52	#elif defined(HAVE_LIBUTIL_H)
47	# include <libutil.h>	53	# include <libutil.h>
48	#elif defined(HAVE_UTIL_H)	54	#elif defined(HAVE_UTIL_H)
49	# include <util.h>	55	# include <util.h>
50	#endif	56	#endif
		57	#ifdef TTY_GID_SUPPORT
		58	#include <grp.h>
		59	#endif
51		60
52	#include <cstdio>	61	#include <cstdio>
53	#include <grp.h>
54
55	#include "rxvtutil.h"
56	#include "fdpass.h"
57	#include "ptytty.h"
58		62
59	/////////////////////////////////////////////////////////////////////////////	63	/////////////////////////////////////////////////////////////////////////////
60		64
61	/* ------------------------------------------------------------------------- *	65	/* ------------------------------------------------------------------------- *
62	* GET PSEUDO TELETYPE - MASTER AND SLAVE *	66	* GET PSEUDO TELETYPE - MASTER AND SLAVE *
…		…
64	/*	68	/*
65	* Returns pty file descriptor, or -1 on failure	69	* Returns pty file descriptor, or -1 on failure
66	* If successful, ttydev is set to the name of the slave device.	70	* If successful, ttydev is set to the name of the slave device.
67	* fd_tty _may_ also be set to an open fd to the slave device	71	* fd_tty _may_ also be set to an open fd to the slave device
68	*/	72	*/
69	static inline int	73	#if defined(UNIX98_PTY)
		74	static int
70	get_pty_streams (int fd_tty, char *ttydev)	75	get_pty (int fd_tty, char *ttydev)
71	{	76	{
72	#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
73	# if defined(PTYS_ARE_GETPT) \|\| defined(PTYS_ARE_POSIX) \|\| defined(PTYS_ARE_PTMX)
74	int pfd;	77	int pfd;
75		78
76	# if defined(PTYS_ARE_GETPT)	79	# if defined(HAVE_GETPT)
77	pfd = getpt();	80	pfd = getpt();
78	# elif defined(PTYS_ARE_POSIX)	81	# elif defined(HAVE_POSIX_OPENPT)
79	pfd = posix_openpt (O_RDWR);	82	pfd = posix_openpt (O_RDWR);
80	# else	83	# else
81	pfd = open ("/dev/ptmx", O_RDWR \| O_NOCTTY, 0);	84	pfd = open (CLONE_DEVICE, O_RDWR \| O_NOCTTY, 0);
82	# endif	85	# endif
83	if (pfd >= 0)	86	if (pfd >= 0)
84	{	87	{
85	if (grantpt (pfd) == 0 /* change slave permissions */	88	if (grantpt (pfd) == 0 /* change slave permissions */
86	&& unlockpt (pfd) == 0)	89	&& unlockpt (pfd) == 0)
…		…
89	return pfd;	92	return pfd;
90	}	93	}
91		94
92	close (pfd);	95	close (pfd);
93	}	96	}
94	# endif
95	#endif
96		97
97	return -1;	98	return -1;
98	}	99	}
99		100	#elif defined(HAVE_OPENPTY)
100	static inline int	101	static int
101	get_pty_openpty (int fd_tty, char *ttydev)	102	get_pty (int fd_tty, char *ttydev)
102	{	103	{
103	#ifdef PTYS_ARE_OPENPTY
104	int pfd;	104	int pfd;
105	int res;	105	int res;
106	char tty_name[sizeof "/dev/pts/????\0"];	106	char tty_name[32];
107		107
108	res = openpty (&pfd, fd_tty, tty_name, NULL, NULL);	108	res = openpty (&pfd, fd_tty, tty_name, NULL, NULL);
109	if (res != -1)	109	if (res != -1)
110	{	110	{
111	*ttydev = strdup (tty_name);	111	*ttydev = strdup (tty_name);
112	return pfd;	112	return pfd;
113	}	113	}
114	#endif
115		114
116	return -1;	115	return -1;
117	}	116	}
118		117	#elif defined(HAVE__GETPTY)
119	static inline int	118	static int
120	get_pty__getpty (int fd_tty, char *ttydev)	119	get_pty (int fd_tty, char *ttydev)
121	{	120	{
122	#ifdef PTYS_ARE__GETPTY
123	int pfd;	121	int pfd;
124		122
125	*ttydev = _getpty (&pfd, O_RDWR \| O_NONBLOCK \| O_NOCTTY, 0622, 0);	123	*ttydev = _getpty (&pfd, O_RDWR \| O_NONBLOCK \| O_NOCTTY, 0622, 0);
126	if (*ttydev != NULL)	124	if (*ttydev != NULL)
127	return pfd;	125	return pfd;
128	#endif
129		126
130	return -1;	127	return -1;
131	}	128	}
132		129	#elif defined(HAVE_DEV_PTC)
133	static inline int	130	static int
134	get_pty_ptc (int fd_tty, char *ttydev)	131	get_pty (int fd_tty, char *ttydev)
135	{	132	{
136	#ifdef PTYS_ARE_PTC
137	int pfd;	133	int pfd;
138		134
139	if ((pfd = open ("/dev/ptc", O_RDWR \| O_NOCTTY, 0)) >= 0)	135	if ((pfd = open ("/dev/ptc", O_RDWR \| O_NOCTTY, 0)) >= 0)
140	{	136	{
141	*ttydev = strdup (ttyname (pfd));	137	*ttydev = strdup (ttyname (pfd));
142	return pfd;	138	return pfd;
143	}	139	}
144	#endif
145		140
146	return -1;	141	return -1;
147	}	142	}
148		143	#elif defined(HAVE_DEV_CLONE)
149	static inline int	144	static int
150	get_pty_clone (int fd_tty, char *ttydev)	145	get_pty (int fd_tty, char *ttydev)
151	{	146	{
152	#ifdef PTYS_ARE_CLONE
153	int pfd;	147	int pfd;
154		148
155	if ((pfd = open ("/dev/ptym/clone", O_RDWR \| O_NOCTTY, 0)) >= 0)	149	if ((pfd = open ("/dev/ptym/clone", O_RDWR \| O_NOCTTY, 0)) >= 0)
156	{	150	{
157	*ttydev = strdup (ptsname (pfd));	151	*ttydev = strdup (ptsname (pfd));
158	return pfd;	152	return pfd;
159	}	153	}
160	#endif
161		154
162	return -1;	155	return -1;
163	}	156	}
164		157	#else
165	static inline int	158	/* Based on the code in openssh/openbsd-compat/bsd-openpty.c */
166	get_pty_numeric (int fd_tty, char *ttydev)
167	{
168	#ifdef PTYS_ARE_NUMERIC
169	int pfd;
170	int idx;
171	char c1, c2;
172	char pty_name[] = "/dev/ptyp???";
173	char tty_name[] = "/dev/ttyp???";
174
175	c1 = &(pty_name[sizeof (pty_name) - 4]);
176	c2 = &(tty_name[sizeof (tty_name) - 4]);
177
178	for (idx = 0; idx < 256; idx++)
179	{
180	sprintf (c1, "%d", idx);
181	sprintf (c2, "%d", idx);
182
183	if (access (tty_name, F_OK) < 0)
184	{
185	idx = 256;
186	break;
187	}
188
189	if ((pfd = open (pty_name, O_RDWR \| O_NOCTTY, 0)) >= 0)
190	{
191	if (access (tty_name, R_OK \| W_OK) == 0)
192	{
193	*ttydev = strdup (tty_name);
194	return pfd;
195	}
196
197	close (pfd);
198	}
199	}
200	#endif
201
202	return -1;
203	}
204
205	static inline int
206	get_pty_searched (int fd_tty, char *ttydev)
207	{
208	#ifdef PTYS_ARE_SEARCHED
209	# ifndef PTYCHAR1
210	# define PTYCHAR1 "pqrstuvwxyz"
211	# endif
212	# ifndef PTYCHAR2
213	# define PTYCHAR2 "0123456789abcdef"
214	# endif
215	int pfd;
216	const char c1, c2;
217	char pty_name[] = "/dev/pty??";
218	char tty_name[] = "/dev/tty??";
219
220	for (c1 = PTYCHAR1; *c1; c1++)
221	{
222	pty_name[ (sizeof (pty_name) - 3)] =
223	tty_name[ (sizeof (pty_name) - 3)] = *c1;
224
225	for (c2 = PTYCHAR2; *c2; c2++)
226	{
227	pty_name[ (sizeof (pty_name) - 2)] =
228	tty_name[ (sizeof (pty_name) - 2)] = *c2;
229
230	if ((pfd = open (pty_name, O_RDWR \| O_NOCTTY, 0)) >= 0)
231	{
232	if (access (tty_name, R_OK \| W_OK) == 0)
233	{
234	*ttydev = strdup (tty_name);
235	return pfd;
236	}
237
238	close (pfd);
239	}
240	}
241	}
242	#endif
243
244	return -1;
245	}
246
247	static int	159	static int
248	get_pty (int fd_tty, char *ttydev)	160	get_pty (int fd_tty, char *ttydev)
249	{	161	{
250	int pfd;	162	int pfd;
251		163	int i;
252	if ((pfd = get_pty_streams (fd_tty, ttydev)) != -1	164	char pty_name[32];
253	\|\| (pfd = get_pty_openpty (fd_tty, ttydev)) != -1	165	char tty_name[32];
254	\|\| (pfd = get_pty__getpty (fd_tty, ttydev)) != -1	166	const char *majors = "pqrstuvwxyzabcde";
255	\|\| (pfd = get_pty_ptc (fd_tty, ttydev)) != -1	167	const char *minors = "0123456789abcdef";
256	\|\| (pfd = get_pty_clone (fd_tty, ttydev)) != -1	168	for (i = 0; i < 256; i++)
257	\|\| (pfd = get_pty_numeric (fd_tty, ttydev)) != -1	169	{
258	\|\| (pfd = get_pty_searched (fd_tty, ttydev)) != -1)	170	snprintf(pty_name, 32, "/dev/pty%c%c", majors[i / 16], minors[i % 16]);
		171	snprintf(tty_name, 32, "/dev/tty%c%c", majors[i / 16], minors[i % 16]);
		172	if ((pfd = open (pty_name, O_RDWR \| O_NOCTTY, 0)) == -1)
		173	{
		174	snprintf(pty_name, 32, "/dev/ptyp%d", i);
		175	snprintf(tty_name, 32, "/dev/ttyp%d", i);
		176	if ((pfd = open (pty_name, O_RDWR \| O_NOCTTY, 0)) == -1)
		177	continue;
		178	}
		179	if (access (tty_name, R_OK \| W_OK) == 0)
		180	{
		181	*ttydev = strdup (tty_name);
259	return pfd;	182	return pfd;
		183	}
260		184
261	return -1;	185	close (pfd);
		186	}
262	}	187	}
		188	#endif
263		189
264	/----------------------------------------------------------------------/	190	/----------------------------------------------------------------------/
265	/*	191	/*
266	* Returns tty file descriptor, or -1 on failure	192	* Returns tty file descriptor, or -1 on failure
267	*/	193	*/
…		…
278	static int	204	static int
279	control_tty (int fd_tty)	205	control_tty (int fd_tty)
280	{	206	{
281	setsid ();	207	setsid ();
282		208
283	#if defined(PTYS_ARE_PTMX) && defined(I_PUSH)	209	#if defined(HAVE_DEV_PTMX) && defined(I_PUSH)
284	/*	210	/*
285	* Push STREAMS modules:	211	* Push STREAMS modules:
286	* ptem: pseudo-terminal hardware emulation module.	212	* ptem: pseudo-terminal hardware emulation module.
287	* ldterm: standard terminal line discipline.	213	* ldterm: standard terminal line discipline.
288	* ttcompat: V7, 4BSD and XENIX STREAMS compatibility module.	214	* ttcompat: V7, 4BSD and XENIX STREAMS compatibility module.
…		…
310		236
311	ioctl (fd_tty, TIOCSCTTY, NULL);	237	ioctl (fd_tty, TIOCSCTTY, NULL);
312		238
313	int fd = open ("/dev/tty", O_WRONLY);	239	int fd = open ("/dev/tty", O_WRONLY);
314	if (fd < 0)	240	if (fd < 0)
315	return -1; /* fatal */	241	return -1; /* fatal */
316		242
317	close (fd);	243	close (fd);
318		244
319	return 0;	245	return 0;
320	}	246	}
321		247
322	void	248	void
323	rxvt_ptytty::close_tty ()	249	ptytty::close_tty ()
324	{	250	{
325	if (tty < 0)	251	if (tty < 0)
326	return;	252	return;
327		253
328	close (tty);	254	close (tty);
329	tty = -1;	255	tty = -1;
330	}	256	}
331		257
332	bool	258	bool
333	rxvt_ptytty::make_controlling_tty ()	259	ptytty::make_controlling_tty ()
334	{	260	{
335	return control_tty (tty) >= 0;	261	return control_tty (tty) >= 0;
336	}	262	}
337		263
338	void	264	void
339	rxvt_ptytty::set_utf8_mode (bool on)	265	ptytty::set_utf8_mode (bool on)
340	{	266	{
341	#ifdef IUTF8	267	#ifdef IUTF8
342	if (pty < 0)	268	if (pty < 0)
343	return;	269	return;
344		270
…		…
383	gid = 0;	309	gid = 0;
384	}	310	}
385	}	311	}
386	} ttyconf;	312	} ttyconf;
387		313
388	rxvt_ptytty_unix::rxvt_ptytty_unix ()	314	ptytty_unix::ptytty_unix ()
389	{	315	{
390	pty = tty = -1;
391	name = 0;	316	name = 0;
392	#if UTMP_SUPPORT	317	#if UTMP_SUPPORT
393	cmd_pid = 0;	318	cmd_pid = 0;
394	#endif	319	#endif
395	}	320	}
396		321
397	rxvt_ptytty_unix::~rxvt_ptytty_unix ()	322	ptytty_unix::~ptytty_unix ()
398	{	323	{
399	#if UTMP_SUPPORT	324	#if UTMP_SUPPORT
400	logout ();	325	logout ();
401	#endif	326	#endif
402	put ();	327	put ();
403	}	328	}
404		329
405	void	330	void
406	rxvt_ptytty_unix::put ()	331	ptytty_unix::put ()
407	{	332	{
408	chmod (name, RESTORE_TTY_MODE);	333	chmod (name, RESTORE_TTY_MODE);
409	chown (name, 0, ttyconf.gid);	334	chown (name, 0, ttyconf.gid);
410		335
411	close_tty ();	336	close_tty ();
…		…
418	pty = tty = -1;	343	pty = tty = -1;
419	name = 0;	344	name = 0;
420	}	345	}
421		346
422	bool	347	bool
423	rxvt_ptytty_unix::get ()	348	ptytty_unix::get ()
424	{	349	{
425	/* get master (pty) */	350	/* get master (pty) */
426	if ((pty = get_pty (&tty, &name)) < 0)	351	if ((pty = get_pty (&tty, &name)) < 0)
427	return false;	352	return false;
428		353
…		…
447	}	372	}
448		373
449	return true;	374	return true;
450	}	375	}
451		376
		377	/////////////////////////////////////////////////////////////////////////////
		378	// helper/proxy support
		379
452	#if PTYTTY_HELPER	380	#if PTYTTY_HELPER
453		381
454	static int sock_fd;	382	static int sock_fd = -1, lock_fd = -1;
455	static int pid;	383	static int helper_pid, owner_pid;
456		384
457	struct command	385	struct command
458	{	386	{
459	enum { get, login, destroy } type;	387	enum { get, login, destroy } type;
460		388
461	rxvt_ptytty *id;	389	ptytty *id;
462		390
463	bool login_shell;	391	bool login_shell;
464	int cmd_pid;	392	int cmd_pid;
465	char hostname[512]; // arbitrary, but should be plenty	393	char hostname[512]; // arbitrary, but should be plenty
466	};	394	};
467		395
468	struct rxvt_ptytty_proxy : zero_initialized, rxvt_ptytty	396	struct ptytty_proxy : ptytty
469	{	397	{
470	rxvt_ptytty *id;	398	ptytty *id;
471		399
		400	ptytty_proxy ()
		401	: id(0)
		402	{
		403	}
		404
472	~rxvt_ptytty_proxy ();	405	~ptytty_proxy ();
473		406
474	bool get ();	407	bool get ();
475	void login (int cmd_pid, bool login_shell, const char *hostname);	408	void login (int cmd_pid, bool login_shell, const char *hostname);
476	};	409	};
477		410
		411	#if PTYTTY_REENTRANT
		412	# define NEED_TOKEN do { char ch; read (lock_fd, &ch, 1); } while (0)
		413	# define GIVE_TOKEN do { char ch; write (lock_fd, &ch, 1); } while (0)
		414	#else
		415	# define NEED_TOKEN (void)0
		416	# define GIVE_TOKEN (void)0
		417	#endif
		418
478	bool	419	bool
479	rxvt_ptytty_proxy::get ()	420	ptytty_proxy::get ()
480	{	421	{
		422	NEED_TOKEN;
		423
481	command cmd;	424	command cmd;
482		425
483	cmd.type = command::get;	426	cmd.type = command::get;
484		427
485	write (sock_fd, &cmd, sizeof (cmd));	428	write (sock_fd, &cmd, sizeof (cmd));
486		429
487	if (read (sock_fd, &id, sizeof (id)) != sizeof (id))	430	if (read (sock_fd, &id, sizeof (id)) != sizeof (id))
488	rxvt_fatal ("protocol error while creating pty using helper process, aborting.\n");	431	ptytty_fatal ("protocol error while creating pty using helper process, aborting.\n");
489		432
490	if (!id)	433	if (!id)
		434	{
		435	GIVE_TOKEN;
491	return false;	436	return false;
		437	}
492		438
493	if ((pty = rxvt_recv_fd (sock_fd)) < 0	439	if ((pty = recv_fd (sock_fd)) < 0
494	\|\| (tty = rxvt_recv_fd (sock_fd)) < 0)	440	\|\| (tty = recv_fd (sock_fd)) < 0)
495	rxvt_fatal ("protocol error while reading pty/tty fds from helper process, aborting.\n");	441	ptytty_fatal ("protocol error while reading pty/tty fds from helper process, aborting.\n");
496		442
		443	GIVE_TOKEN;
497	return true;	444	return true;
498	}	445	}
499		446
500	void	447	void
501	rxvt_ptytty_proxy::login (int cmd_pid, bool login_shell, const char *hostname)	448	ptytty_proxy::login (int cmd_pid, bool login_shell, const char *hostname)
502	{	449	{
		450	NEED_TOKEN;
		451
503	command cmd;	452	command cmd;
504		453
505	cmd.type = command::login;	454	cmd.type = command::login;
506	cmd.id = id;	455	cmd.id = id;
507	cmd.cmd_pid = cmd_pid;	456	cmd.cmd_pid = cmd_pid;
508	cmd.login_shell = login_shell;	457	cmd.login_shell = login_shell;
509	strncpy (cmd.hostname, hostname, sizeof (cmd.hostname));	458	strncpy (cmd.hostname, hostname, sizeof (cmd.hostname));
510		459
511	write (sock_fd, &cmd, sizeof (cmd));	460	write (sock_fd, &cmd, sizeof (cmd));
512	}
513		461
		462	GIVE_TOKEN;
		463	}
		464
514	rxvt_ptytty_proxy::~rxvt_ptytty_proxy ()	465	ptytty_proxy::~ptytty_proxy ()
515	{	466	{
		467	if (id)
		468	{
		469	NEED_TOKEN;
		470
516	command cmd;	471	command cmd;
517		472
518	cmd.type = command::destroy;	473	cmd.type = command::destroy;
519	cmd.id = id;	474	cmd.id = id;
520		475
521	write (sock_fd, &cmd, sizeof (cmd));	476	write (sock_fd, &cmd, sizeof (cmd));
		477
		478	GIVE_TOKEN;
		479	}
522	}	480	}
523		481
524	static	482	static
525	void serve ()	483	void serve ()
526	{	484	{
527	command cmd;	485	command cmd;
528	vector<rxvt_ptytty *> ptys;	486	vector<ptytty *> ptys;
529		487
		488	for (;;)
		489	{
		490	GIVE_TOKEN;
		491
530	while (read (sock_fd, &cmd, sizeof (command)) == sizeof (command))	492	if (read (sock_fd, &cmd, sizeof (command)) != sizeof (command))
531	{	493	break;
		494
532	if (cmd.type == command::get)	495	if (cmd.type == command::get)
533	{	496	{
534	// -> id ptyfd ttyfd	497	// -> id ptyfd ttyfd
535	cmd.id = new rxvt_ptytty_unix;	498	cmd.id = new ptytty_unix;
536		499
537	if (cmd.id->get ())	500	if (cmd.id->get ())
538	{	501	{
539	write (sock_fd, &cmd.id, sizeof (cmd.id));	502	write (sock_fd, &cmd.id, sizeof (cmd.id));
540	ptys.push_back (cmd.id);	503	ptys.push_back (cmd.id);
541		504
542	rxvt_send_fd (sock_fd, cmd.id->pty);	505	ptytty::send_fd (sock_fd, cmd.id->pty);
543	rxvt_send_fd (sock_fd, cmd.id->tty);	506	ptytty::send_fd (sock_fd, cmd.id->tty);
544	}	507	}
545	else	508	else
546	{	509	{
547	delete cmd.id;	510	delete cmd.id;
548	cmd.id = 0;	511	cmd.id = 0;
…		…
550	}	513	}
551	}	514	}
552	else if (cmd.type == command::login)	515	else if (cmd.type == command::login)
553	{	516	{
554	#if UTMP_SUPPORT	517	#if UTMP_SUPPORT
555	if (find (ptys.begin (), ptys.end (), cmd.id))	518	if (find (ptys.begin (), ptys.end (), cmd.id) != ptys.end ())
556	{	519	{
557	cmd.hostname[sizeof (cmd.hostname) - 1] = 0;	520	cmd.hostname[sizeof (cmd.hostname) - 1] = 0;
558	cmd.id->login (cmd.cmd_pid, cmd.login_shell, cmd.hostname);	521	cmd.id->login (cmd.cmd_pid, cmd.login_shell, cmd.hostname);
559	}	522	}
560	#endif	523	#endif
561	}	524	}
562	else if (cmd.type == command::destroy)	525	else if (cmd.type == command::destroy)
563	{	526	{
564	rxvt_ptytty **pty = find (ptys.begin (), ptys.end (), cmd.id);	527	vector<ptytty *>::iterator pty = find (ptys.begin (), ptys.end (), cmd.id);
565		528
566	if (pty)	529	if (pty != ptys.end ())
567	{	530	{
568	delete *pty;	531	delete *pty;
569	ptys.erase (pty);	532	ptys.erase (pty);
570	}	533	}
571	}	534	}
572	else	535	else
573	break;	536	break;
		537
		538	NEED_TOKEN;
574	}	539	}
575		540
576	// destroy all ptys	541	// destroy all ptys
577	for (rxvt_ptytty **i = ptys.end (); i-- > ptys.begin (); )	542	for (vector<ptytty *>::iterator i = ptys.end (); i-- > ptys.begin (); )
578	delete *i;	543	delete *i;
579	}	544	}
580		545
581	void rxvt_ptytty_server ()	546	void
		547	ptytty::use_helper ()
582	{	548	{
		549	#ifndef PTYTTY_NO_PID_CHECK
		550	int pid = getpid ();
		551	#endif
		552
		553	if (sock_fd >= 0
		554	#ifndef PTYTTY_NO_PID_CHECK
		555	&& pid == owner_pid
		556	#endif
		557	)
		558	return;
		559
		560	#ifndef PTYTTY_NO_PID_CHECK
		561	owner_pid = pid;
		562	#endif
		563
583	int sv[2];	564	int sv[2];
584		565
585	if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv))	566	if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv))
586	rxvt_fatal ("could not create socket to communicate with pty/sessiondb helper, aborting.\n");	567	ptytty_fatal ("could not create socket to communicate with pty/sessiondb helper, aborting.\n");
587		568
		569	#ifdef PTYTTY_REENTRANT
		570	int lv[2];
		571
		572	if (socketpair (AF_UNIX, SOCK_STREAM, 0, lv))
		573	ptytty_fatal ("could not create socket to communicate with pty/sessiondb helper, aborting.\n");
		574	#endif
		575
588	pid = fork ();	576	helper_pid = fork ();
589		577
590	if (pid < 0)	578	if (helper_pid < 0)
591	rxvt_fatal ("could not create pty/sessiondb helper process, aborting.\n");	579	ptytty_fatal ("could not create pty/sessiondb helper process, aborting.\n");
592		580
593	if (pid)	581	if (helper_pid)
594	{	582	{
595	// client, urxvt	583	// client, process
596	sock_fd = sv[0];	584	sock_fd = sv[0];
597	close (sv[1]);	585	close (sv[1]);
598	fcntl (sock_fd, F_SETFD, FD_CLOEXEC);	586	fcntl (sock_fd, F_SETFD, FD_CLOEXEC);
		587	#ifdef PTYTTY_REENTRANT
		588	lock_fd = lv[0];
		589	close (lv[1]);
		590	fcntl (lock_fd, F_SETFD, FD_CLOEXEC);
		591	#endif
599	}	592	}
600	else	593	else
601	{	594	{
602	// server, pty-helper	595	// server, pty-helper
603	sock_fd = sv[1];	596	sock_fd = sv[1];
		597	#ifdef PTYTTY_REENTRANT
		598	lock_fd = lv[1];
		599	#endif
		600
		601	chdir ("/");
		602
		603	signal (SIGHUP, SIG_IGN);
		604	signal (SIGTERM, SIG_IGN);
		605	signal (SIGINT, SIG_IGN);
		606	signal (SIGPIPE, SIG_IGN);
604		607
605	for (int fd = 0; fd < 1023; fd++)	608	for (int fd = 0; fd < 1023; fd++)
606	if (fd != sock_fd)	609	if (fd != sock_fd && fd != lock_fd)
607	close (fd);	610	close (fd);
608		611
609	serve ();	612	serve ();
610	_exit (EXIT_SUCCESS);	613	_exit (EXIT_SUCCESS);
611	}	614	}
612	}	615	}
613		616
614	#endif	617	#endif
615		618
616	// a "factory" g
617	rxvt_ptytty *	619	ptytty *
618	rxvt_new_ptytty ()	620	ptytty::create ()
619	{	621	{
620	#if PTYTTY_HELPER	622	#if PTYTTY_HELPER
621	if (pid > 0)	623	if (helper_pid
		624	# ifndef PTYTTY_NO_PID_CHECK
		625	&& getpid () == owner_pid
		626	# endif
		627	)
622	// use helper process	628	// use helper process
623	return new rxvt_ptytty_proxy;	629	return new ptytty_proxy;
624	else	630	else
625	#endif	631	#endif
626	return new rxvt_ptytty_unix;	632	return new ptytty_unix;
627	}	633	}
628		634
629	/----------------------- end-of-file (C source) -----------------------/	635	void
		636	ptytty::init ()
		637	{
		638	uid_t uid = getuid ();
		639	gid_t gid = getgid ();
		640
		641	// before doing anything else, check for setuid/setgid operation,
		642	// start the helper process and drop privileges
		643	if (uid != geteuid ()
		644	\|\| gid != getegid ())
		645	{
		646	#if PTYTTY_HELPER
		647	use_helper ();
		648	#else
		649	ptytty_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
		650	#endif
630		651
		652	drop_privileges ();
		653	}
		654	}
		655
		656	void
		657	ptytty::drop_privileges ()
		658	{
		659	uid_t uid = getuid ();
		660	gid_t gid = getgid ();
		661
		662	// drop privileges
		663	#if HAVE_SETRESUID
		664	setresgid (gid, gid, gid);
		665	setresuid (uid, uid, uid);
		666	#elif HAVE_SETREUID
		667	setregid (gid, gid);
		668	setreuid (uid, uid);
		669	#elif HAVE_SETUID
		670	setgid (gid);
		671	setuid (uid);
		672	#endif
		673
		674	if (uid != geteuid ()
		675	\|\| gid != getegid ())
		676	ptytty_fatal ("unable to drop privileges, aborting.\n");
		677	}
		678
		679	/////////////////////////////////////////////////////////////////////////////
		680	// C API
		681
		682	#ifndef PTYTTY_NO_C_API
		683
		684	typedef void *PTYTTY;
		685
		686	#define DEFINE_METHOD(retval, name, args1, args2) \
		687	extern "C" retval ptytty_ ## name args1 \
		688	{ return ((struct ptytty *)ptytty)->name args2; }
		689
		690	DEFINE_METHOD(int,pty,(PTYTTY ptytty),)
		691	DEFINE_METHOD(int,tty,(PTYTTY ptytty),)
		692	DEFINE_METHOD(int,get,(PTYTTY ptytty),())
		693	DEFINE_METHOD(void,login,(PTYTTY ptytty, int cmd_pid, bool login_shell, const char *hostname),(cmd_pid,login_shell,hostname))
		694
		695	DEFINE_METHOD(void,close_tty,(PTYTTY ptytty),())
		696	DEFINE_METHOD(int,make_controlling_tty,(PTYTTY ptytty),())
		697	DEFINE_METHOD(void,set_utf8_mode,(PTYTTY ptytty, int on),(on))
		698
		699	#define DEFINE_STATIC(retval, name, args) \
		700	extern "C" retval ptytty_ ## name args \
		701	{ return ptytty::name args; }
		702
		703	DEFINE_STATIC(void,drop_privileges,())
		704	DEFINE_STATIC(void,use_helper,())
		705	DEFINE_STATIC(void,init,())
		706
		707	DEFINE_STATIC(PTYTTY ,create,())
		708
		709	void ptytty_delete (PTYTTY ptytty)
		710	{
		711	delete (struct ptytty *)ptytty;
		712	}
		713
		714	// send_fd, recv_fd not exposed
		715
		716	#endif

Diff Legend

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

Comparing rxvt-unicode/src/ptytty.C (file contents): Revision 1.50 by root, Thu Jan 19 16:43:36 2006 UTC vs. Revision 1.60 by root, Mon Jan 23 12:37:59 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/ptytty.C (file contents):
Revision 1.50 by root, Thu Jan 19 16:43:36 2006 UTC vs.
Revision 1.60 by root, Mon Jan 23 12:37:59 2006 UTC