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

Comparing rxvt-unicode/src/ptytty.C (file contents):
Revision 1.36 by root, Tue Jan 17 10:59:32 2006 UTC vs.
Revision 1.44 by ayin, Tue Jan 17 17:59:31 2006 UTC

…		…
22	---------------------------------------------------------------------/	22	---------------------------------------------------------------------/
23		23
24	#include "../config.h" /* NECESSARY */	24	#include "../config.h" /* NECESSARY */
25	#include "rxvt.h"	25	#include "rxvt.h"
26		26
27	# include <cstdlib>	27	#include <cstdlib>
28	# include <cstring>	28	#include <cstring>
29		29
30	#ifdef HAVE_SYS_TYPES_H
31	# include <sys/types.h>	30	#include <sys/types.h>
32	#endif	31	#include <sys/socket.h>
33	#ifdef HAVE_UNISTD_H
34	# include <unistd.h>	32	#include <unistd.h>
35	#endif
36	#ifdef HAVE_FCNTL_H
37	# include <fcntl.h>	33	#include <fcntl.h>
38	#endif	34
39	#ifdef HAVE_SYS_IOCTL_H	35	#ifdef HAVE_SYS_IOCTL_H
40	# include <sys/ioctl.h>	36	# include <sys/ioctl.h>
41	#endif	37	#endif
42	#if defined(PTYS_ARE_PTMX) && defined(HAVE_SYS_STROPTS_H)	38	#if defined(PTYS_ARE_PTMX) && defined(HAVE_SYS_STROPTS_H)
43	# include <sys/stropts.h> /* for I_PUSH */	39	# include <sys/stropts.h> /* for I_PUSH */
…		…
53	# include <util.h>	49	# include <util.h>
54	#endif	50	#endif
55		51
56	#include <cstdio>	52	#include <cstdio>
57	#include <grp.h>	53	#include <grp.h>
		54
		55	#include "rxvtutil.h"
		56	#include "fdpass.h"
		57	#include "ptytty.h"
58		58
59	/////////////////////////////////////////////////////////////////////////////	59	/////////////////////////////////////////////////////////////////////////////
60		60
61	/* ------------------------------------------------------------------------- *	61	/* ------------------------------------------------------------------------- *
62	* GET PSEUDO TELETYPE - MASTER AND SLAVE *	62	* GET PSEUDO TELETYPE - MASTER AND SLAVE *
…		…
64	/*	64	/*
65	* Returns pty file descriptor, or -1 on failure	65	* Returns pty file descriptor, or -1 on failure
66	* If successful, ttydev is set to the name of the slave device.	66	* 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	67	* fd_tty _may_ also be set to an open fd to the slave device
68	*/	68	*/
69	static int	69	static inline int
70	get_pty (int fd_tty, char *ttydev)	70	get_pty_streams (int fd_tty, char *ttydev)
71	{	71	{
		72	#ifdef NO_SETOWNER_TTYDEV
72	int pfd;	73	int pfd;
73		74
		75	# ifdef PTYS_ARE_GETPT
		76	pfd = getpt();
		77	# else
		78	# ifdef PTYS_ARE_POSIX
		79	pfd = posix_openpt (O_RDWR);
		80	# else
		81	pfd = open ("/dev/ptmx", O_RDWR \| O_NOCTTY, 0);
		82	# endif
		83	# endif
		84	if (pfd >= 0)
		85	{
		86	if (grantpt (pfd) == 0 /* change slave permissions */
		87	&& unlockpt (pfd) == 0)
		88	{ /* slave now unlocked */
		89	ttydev = strdup (ptsname (pfd)); / get slave's name */
		90	return pfd;
		91	}
		92	close (pfd);
		93	}
		94	#endif
		95	return -1;
		96	}
		97
		98	static inline int
		99	get_pty_openpty (int fd_tty, char *ttydev)
		100	{
74	#ifdef PTYS_ARE_OPENPTY	101	#ifdef PTYS_ARE_OPENPTY
		102	int pfd;
		103	int res;
75	char tty_name[sizeof "/dev/pts/????\0"];	104	char tty_name[sizeof "/dev/pts/????\0"];
76		105
77	rxvt_privileges(RESTORE);
78	int res = openpty (&pfd, fd_tty, tty_name, NULL, NULL);	106	res = openpty (&pfd, fd_tty, tty_name, NULL, NULL);
79	rxvt_privileges(IGNORE);
80
81	if (res != -1)	107	if (res != -1)
82	{	108	{
83	*ttydev = strdup (tty_name);	109	*ttydev = strdup (tty_name);
84	return pfd;	110	return pfd;
85	}	111	}
86	#endif	112	#endif
		113	return -1;
		114	}
87		115
		116	static inline int
		117	get_pty__getpty (int fd_tty, char *ttydev)
		118	{
88	#ifdef PTYS_ARE__GETPTY	119	#ifdef PTYS_ARE__GETPTY
		120	int pfd;
		121
89	*ttydev = _getpty (&pfd, O_RDWR \| O_NONBLOCK \| O_NOCTTY, 0622, 0);	122	*ttydev = _getpty (&pfd, O_RDWR \| O_NONBLOCK \| O_NOCTTY, 0622, 0);
90	if (*ttydev != NULL)	123	if (*ttydev != NULL)
91	return pfd;	124	return pfd;
92	#endif	125	#endif
		126	return -1;
		127	}
93		128
94	#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)	129	static inline int
95	# if defined(PTYS_ARE_GETPT) \|\| defined(PTYS_ARE_POSIX) \|\| defined(PTYS_ARE_PTMX)	130	get_pty_ptc (int fd_tty, char *ttydev)
96		131	{
97	{
98	# ifdef PTYS_ARE_GETPT
99	pfd = getpt();
100	# else
101	# ifdef PTYS_ARE_POSIX
102	pfd = posix_openpt (O_RDWR);
103	# else
104	pfd = open ("/dev/ptmx", O_RDWR \| O_NOCTTY, 0);
105	# endif
106	# endif
107
108	if (pfd >= 0)
109	{
110	if (grantpt (pfd) == 0 /* change slave permissions */
111	&& unlockpt (pfd) == 0)
112	{ /* slave now unlocked */
113	ttydev = strdup (ptsname (pfd)); / get slave's name */
114	return pfd;
115	}
116	close (pfd);
117	}
118	}
119	# endif
120	#endif
121
122	#ifdef PTYS_ARE_PTC	132	#ifdef PTYS_ARE_PTC
		133	int pfd;
		134
123	if ((pfd = open ("/dev/ptc", O_RDWR \| O_NOCTTY, 0)) >= 0)	135	if ((pfd = open ("/dev/ptc", O_RDWR \| O_NOCTTY, 0)) >= 0)
124	{	136	{
125	*ttydev = strdup (ttyname (pfd));	137	*ttydev = strdup (ttyname (pfd));
126	return pfd;	138	return pfd;
127	}	139	}
128	#endif	140	#endif
		141	return -1;
		142	}
129		143
		144	static inline int
		145	get_pty_clone (int fd_tty, char *ttydev)
		146	{
130	#ifdef PTYS_ARE_CLONE	147	#ifdef PTYS_ARE_CLONE
		148	int pfd;
		149
131	if ((pfd = open ("/dev/ptym/clone", O_RDWR \| O_NOCTTY, 0)) >= 0)	150	if ((pfd = open ("/dev/ptym/clone", O_RDWR \| O_NOCTTY, 0)) >= 0)
132	{	151	{
133	*ttydev = strdup (ptsname (pfd));	152	*ttydev = strdup (ptsname (pfd));
134	return pfd;	153	return pfd;
135	}	154	}
136	#endif	155	#endif
		156	return -1;
		157	}
137		158
		159	static inline int
		160	get_pty_numeric (int fd_tty, char *ttydev)
		161	{
138	#ifdef PTYS_ARE_NUMERIC	162	#ifdef PTYS_ARE_NUMERIC
139	{	163	int pfd;
140	int idx;	164	int idx;
141	char c1, c2;	165	char c1, c2;
142	char pty_name[] = "/dev/ptyp???";	166	char pty_name[] = "/dev/ptyp???";
143	char tty_name[] = "/dev/ttyp???";	167	char tty_name[] = "/dev/ttyp???";
144		168
…		…
163	}	187	}
164		188
165	close (pfd);	189	close (pfd);
166	}	190	}
167	}	191	}
168	}
169	#endif	192	#endif
		193	return -1;
		194	}
170		195
		196	static inline int
		197	get_pty_searched (int fd_tty, char *ttydev)
		198	{
171	#ifdef PTYS_ARE_SEARCHED	199	#ifdef PTYS_ARE_SEARCHED
172	{	200	# ifndef PTYCHAR1
		201	# define PTYCHAR1 "pqrstuvwxyz"
		202	# endif
		203	# ifndef PTYCHAR2
		204	# define PTYCHAR2 "0123456789abcdef"
		205	# endif
		206	int pfd;
173	const char c1, c2;	207	const char c1, c2;
174	char pty_name[] = "/dev/pty??";	208	char pty_name[] = "/dev/pty??";
175	char tty_name[] = "/dev/tty??";	209	char tty_name[] = "/dev/tty??";
176
177	# ifndef PTYCHAR1
178	# define PTYCHAR1 "pqrstuvwxyz"
179	# endif
180	# ifndef PTYCHAR2
181	# define PTYCHAR2 "0123456789abcdef"
182	# endif
183		210
184	for (c1 = PTYCHAR1; *c1; c1++)	211	for (c1 = PTYCHAR1; *c1; c1++)
185	{	212	{
186	pty_name[ (sizeof (pty_name) - 3)] =	213	pty_name[ (sizeof (pty_name) - 3)] =
187	tty_name[ (sizeof (pty_name) - 3)] = *c1;	214	tty_name[ (sizeof (pty_name) - 3)] = *c1;
…		…
199		226
200	close (pfd);	227	close (pfd);
201	}	228	}
202	}	229	}
203	}	230	}
204	}
205	#endif	231	#endif
		232	return -1;
		233	}
206		234
		235	static int
		236	get_pty (int fd_tty, char *ttydev)
		237	{
		238	int pfd;
		239
		240	if ((pfd = get_pty_streams (fd_tty, ttydev)) != -1
		241	\|\| (pfd = get_pty_openpty (fd_tty, ttydev)) != -1
		242	\|\| (pfd = get_pty__getpty (fd_tty, ttydev)) != -1
		243	\|\| (pfd = get_pty_ptc (fd_tty, ttydev)) != -1
		244	\|\| (pfd = get_pty_clone (fd_tty, ttydev)) != -1
		245	\|\| (pfd = get_pty_numeric (fd_tty, ttydev)) != -1
		246	\|\| (pfd = get_pty_searched (fd_tty, ttydev)) != -1)
		247	return pfd;
207	return -1;	248	return -1;
208	}	249	}
209		250
210	/----------------------------------------------------------------------/	251	/----------------------------------------------------------------------/
211	/*	252	/*
…		…
222	* Make our tty a controlling tty so that /dev/tty points to us	263	* Make our tty a controlling tty so that /dev/tty points to us
223	*/	264	*/
224	static int	265	static int
225	control_tty (int fd_tty)	266	control_tty (int fd_tty)
226	{	267	{
227	#ifndef __QNX__
228	int fd;	268	int fd;
229		269
230	/* ---------------------------------------- */	270	/* ---------------------------------------- */
231	# ifdef HAVE_SETSID
232	setsid ();	271	setsid ();
233	# endif
234	# if defined(HAVE_SETPGID)
235	setpgid (0, 0);
236	# elif defined(HAVE_SETPGRP)
237	setpgrp (0, 0);
238	# endif
239
240	/* ---------------------------------------- */
241	# ifdef TIOCNOTTY
242	fd = open ("/dev/tty", O_RDWR \| O_NOCTTY);
243	if (fd >= 0)
244	{
245	ioctl (fd, TIOCNOTTY, NULL); /* void tty associations */
246	close (fd);
247	}
248	# endif
249
250	/* ---------------------------------------- */
251	fd = open ("/dev/tty", O_RDWR \| O_NOCTTY);
252	if (fd >= 0)
253	close (fd); /* ouch: still have controlling tty */
254		272
255	/* ---------------------------------------- */	273	/* ---------------------------------------- */
256	# if defined(PTYS_ARE_PTMX) && defined(I_PUSH)	274	# if defined(PTYS_ARE_PTMX) && defined(I_PUSH)
257	/*	275	/*
258	* Push STREAMS modules:	276	* Push STREAMS modules:
…		…
286	fd = open ("/dev/tty", O_WRONLY);	304	fd = open ("/dev/tty", O_WRONLY);
287	if (fd < 0)	305	if (fd < 0)
288	return -1; /* fatal */	306	return -1; /* fatal */
289	close (fd);	307	close (fd);
290	/* ---------------------------------------- */	308	/* ---------------------------------------- */
291	#endif /* ! __QNX__ */
292		309
293	return 0;	310	return 0;
294	}	311	}
295		312
296	void	313	void
…		…
367	void	384	void
368	rxvt_ptytty_unix::privileges (rxvt_privaction action)	385	rxvt_ptytty_unix::privileges (rxvt_privaction action)
369	{	386	{
370	if (!name \|\| !*name)	387	if (!name \|\| !*name)
371	return;	388	return;
372
373	rxvt_privileges (RESTORE);
374		389
375	if (action == SAVE)	390	if (action == SAVE)
376	{	391	{
377	# ifndef RESET_TTY_TO_COMMON_DEFAULTS	392	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
378	/* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */	393	/* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
…		…
401	chmod (name, (S_IRUSR \| S_IWUSR \| S_IRGRP \| S_IWGRP \| S_IROTH \| S_IWOTH));	416	chmod (name, (S_IRUSR \| S_IWUSR \| S_IRGRP \| S_IWGRP \| S_IROTH \| S_IWOTH));
402	chown (name, 0, 0);	417	chown (name, 0, 0);
403	# endif	418	# endif
404		419
405	}	420	}
406
407	rxvt_privileges (IGNORE);
408	}	421	}
409	#endif	422	#endif
410		423
411	rxvt_ptytty_unix::rxvt_ptytty_unix ()	424	rxvt_ptytty_unix::rxvt_ptytty_unix ()
412	{	425	{
…		…
420	#endif	433	#endif
421	}	434	}
422		435
423	rxvt_ptytty_unix::~rxvt_ptytty_unix ()	436	rxvt_ptytty_unix::~rxvt_ptytty_unix ()
424	{	437	{
		438	#if UTMP_SUPPORT
425	logout ();	439	logout ();
		440	#endif
426	put ();	441	put ();
427	}	442	}
428		443
429	void	444	void
430	rxvt_ptytty_unix::put ()	445	rxvt_ptytty_unix::put ()
…		…
465	}	480	}
466		481
467	return true;	482	return true;
468	}	483	}
469		484
		485	#if PTYTTY_HELPER
		486
		487	static int sock_fd;
		488	static int pid;
		489
		490	struct command
		491	{
		492	enum { get, login, destroy } type;
		493
		494	rxvt_ptytty *id;
		495
		496	bool login_shell;
		497	int cmd_pid;
		498	char hostname[512]; // arbitrary, but should be plenty
		499	};
		500
		501	struct rxvt_ptytty_proxy : zero_initialized, rxvt_ptytty
		502	{
		503	rxvt_ptytty *id;
		504
		505	~rxvt_ptytty_proxy ();
		506
		507	bool get ();
		508	void login (int cmd_pid, bool login_shell, const char *hostname);
		509	};
		510
		511	bool
		512	rxvt_ptytty_proxy::get ()
		513	{
		514	command cmd;
		515
		516	cmd.type = command::get;
		517
		518	write (sock_fd, &cmd, sizeof (cmd));
		519
		520	if (read (sock_fd, &id, sizeof (id)) != sizeof (id))
		521	rxvt_fatal ("protocol error while creating pty using helper process, aborting.\n");
		522
		523	if (!id)
		524	return false;
		525
		526	if ((pty = rxvt_recv_fd (sock_fd)) < 0
		527	\|\| (tty = rxvt_recv_fd (sock_fd)) < 0)
		528	rxvt_fatal ("protocol error while reading pty/tty fds from helper process, aborting.\n");
		529
		530	return true;
		531	}
		532
		533	void
		534	rxvt_ptytty_proxy::login (int cmd_pid, bool login_shell, const char *hostname)
		535	{
		536	command cmd;
		537
		538	cmd.type = command::login;
		539	cmd.id = id;
		540	cmd.cmd_pid = cmd_pid;
		541	cmd.login_shell = login_shell;
		542	strncpy (cmd.hostname, hostname, sizeof (cmd.hostname));
		543
		544	write (sock_fd, &cmd, sizeof (cmd));
		545	}
		546
		547	rxvt_ptytty_proxy::~rxvt_ptytty_proxy ()
		548	{
		549	command cmd;
		550
		551	cmd.type = command::destroy;
		552	cmd.id = id;
		553
		554	write (sock_fd, &cmd, sizeof (cmd));
		555	}
		556
		557	static
		558	void serve ()
		559	{
		560	command cmd;
		561	vector<rxvt_ptytty *> ptys;
		562
		563	while (read (sock_fd, &cmd, sizeof (command)) == sizeof (command))
		564	{
		565	if (cmd.type == command::get)
		566	{
		567	// -> id ptyfd ttyfd
		568	cmd.id = new rxvt_ptytty_unix;
		569
		570	if (cmd.id->get ())
		571	{
		572	write (sock_fd, &cmd.id, sizeof (cmd.id));
		573	ptys.push_back (cmd.id);
		574
		575	rxvt_send_fd (sock_fd, cmd.id->pty);
		576	rxvt_send_fd (sock_fd, cmd.id->tty);
		577	}
		578	else
		579	{
		580	delete cmd.id;
		581	cmd.id = 0;
		582	write (sock_fd, &cmd.id, sizeof (cmd.id));
		583	}
		584	}
		585	else if (cmd.type == command::login)
		586	{
		587	#if UTMP_SUPPORT
		588	if (find (ptys.begin (), ptys.end (), cmd.id))
		589	{
		590	cmd.hostname[sizeof (cmd.hostname) - 1] = 0;
		591	cmd.id->login (cmd.cmd_pid, cmd.login_shell, cmd.hostname);
		592	}
		593	#endif
		594	}
		595	else if (cmd.type == command::destroy)
		596	{
		597	rxvt_ptytty **pty = find (ptys.begin (), ptys.end (), cmd.id);
		598
		599	if (pty)
		600	{
		601	delete *pty;
		602	ptys.erase (pty);
		603	}
		604	}
		605	else
		606	break;
		607	}
		608
		609	// destroy all ptys
		610	for (rxvt_ptytty **i = ptys.end (); i-- > ptys.begin (); )
		611	delete *i;
		612	}
		613
		614	void rxvt_ptytty_server ()
		615	{
		616	int sv[2];
		617
		618	if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv))
		619	rxvt_fatal ("could not create socket to communicate with pty/sessiondb helper, aborting.\n");
		620
		621	pid = fork ();
		622
		623	if (pid < 0)
		624	rxvt_fatal ("could not create pty/sessiondb helper process, aborting.\n");
		625
		626	if (pid)
		627	{
		628	// client, urxvt
		629	sock_fd = sv[0];
		630	close (sv[1]);
		631	fcntl (sock_fd, F_SETFD, FD_CLOEXEC);
		632	}
		633	else
		634	{
		635	setgid (getegid ());
		636	setuid (geteuid ());
		637
		638	// server, pty-helper
		639	sock_fd = sv[1];
		640
		641	for (int fd = 0; fd < 1023; fd++)
		642	if (fd != sock_fd && fd != 1)
		643	close (fd);
		644
		645	serve ();
		646	_exit (EXIT_SUCCESS);
		647	}
		648	}
		649	#endif
		650
		651	// a "factory" g
		652	rxvt_ptytty *
		653	rxvt_new_ptytty ()
		654	{
		655	#if PTYTTY_HELPER
		656	if (pid > 0)
		657	// use helper process
		658	return new rxvt_ptytty_proxy;
		659	else
		660	#endif
		661	return new rxvt_ptytty_unix;
		662	}
		663
470	/----------------------- end-of-file (C source) -----------------------/	664	/----------------------- end-of-file (C source) -----------------------/
471		665

Diff Legend

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

Comparing rxvt-unicode/src/ptytty.C (file contents): Revision 1.36 by root, Tue Jan 17 10:59:32 2006 UTC vs. Revision 1.44 by ayin, Tue Jan 17 17:59:31 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/ptytty.C (file contents):
Revision 1.36 by root, Tue Jan 17 10:59:32 2006 UTC vs.
Revision 1.44 by ayin, Tue Jan 17 17:59:31 2006 UTC