ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/ptytty.C
(Generate patch)

Comparing rxvt-unicode/src/ptytty.C (file contents):
Revision 1.31 by root, Tue Jan 10 18:09:22 2006 UTC vs.
Revision 1.43 by root, Tue Jan 17 16:50:42 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
59/////////////////////////////////////////////////////////////////////////////
58 60
59/* ------------------------------------------------------------------------- * 61/* ------------------------------------------------------------------------- *
60 * GET PSEUDO TELETYPE - MASTER AND SLAVE * 62 * GET PSEUDO TELETYPE - MASTER AND SLAVE *
61 * ------------------------------------------------------------------------- */ 63 * ------------------------------------------------------------------------- */
62/* 64/*
… …
70 int pfd; 72 int pfd;
71 73
72#ifdef PTYS_ARE_OPENPTY 74#ifdef PTYS_ARE_OPENPTY
73 char tty_name[sizeof "/dev/pts/????\0"]; 75 char tty_name[sizeof "/dev/pts/????\0"];
74 76
75 rxvt_privileges(RESTORE);
76 int res = openpty (&pfd, fd_tty, tty_name, NULL, NULL); 77 int res = openpty (&pfd, fd_tty, tty_name, NULL, NULL);
77 rxvt_privileges(IGNORE);
78 78
79 if (res != -1) 79 if (res != -1)
80 { 80 {
81 *ttydev = strdup (tty_name); 81 *ttydev = strdup (tty_name);
82 return pfd; 82 return pfd;
… …
87 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0); 87 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0);
88 if (*ttydev != NULL) 88 if (*ttydev != NULL)
89 return pfd; 89 return pfd;
90#endif 90#endif
91 91
92#ifdef PTYS_ARE_GETPTY
93 char *ptydev;
94
95 while ((ptydev = getpty ()) != NULL)
96 if ((pfd = open (ptydev, O_RDWR | O_NOCTTY, 0)) >= 0)
97 {
98 *ttydev = ptydev;
99 return pfd;
100 }
101#endif
102
103#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT) 92#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
104# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX) 93# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_POSIX) || defined(PTYS_ARE_PTMX)
105 94
106 { 95 {
107# ifdef PTYS_ARE_GETPT 96# ifdef PTYS_ARE_GETPT
108 pfd = getpt (); 97 pfd = getpt();
98# else
99# ifdef PTYS_ARE_POSIX
100 pfd = posix_openpt (O_RDWR);
109# else 101# else
110 pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0); 102 pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0);
103# endif
111# endif 104# endif
112 105
113 if (pfd >= 0) 106 if (pfd >= 0)
114 { 107 {
115 if (grantpt (pfd) == 0 /* change slave permissions */ 108 if (grantpt (pfd) == 0 /* change slave permissions */
… …
225/*----------------------------------------------------------------------*/ 218/*----------------------------------------------------------------------*/
226/* 219/*
227 * Make our tty a controlling tty so that /dev/tty points to us 220 * Make our tty a controlling tty so that /dev/tty points to us
228 */ 221 */
229static int 222static int
230control_tty (int fd_tty, const char *ttydev) 223control_tty (int fd_tty)
231{ 224{
232#ifndef __QNX__
233 int fd; 225 int fd;
234 226
235 /* ---------------------------------------- */ 227 /* ---------------------------------------- */
236# ifdef HAVE_SETSID
237 setsid (); 228 setsid ();
238# endif
239# if defined(HAVE_SETPGID)
240 setpgid (0, 0);
241# elif defined(HAVE_SETPGRP)
242 setpgrp (0, 0);
243# endif
244 229
245 /* ---------------------------------------- */ 230 /* ---------------------------------------- */
246# ifdef TIOCNOTTY
247 fd = open ("/dev/tty", O_RDWR | O_NOCTTY);
248 if (fd >= 0)
249 {
250 ioctl (fd, TIOCNOTTY, NULL); /* void tty associations */
251 close (fd);
252 }
253# endif
254
255 /* ---------------------------------------- */
256 fd = open ("/dev/tty", O_RDWR | O_NOCTTY);
257 if (fd >= 0)
258 close (fd); /* ouch: still have controlling tty */
259
260 /* ---------------------------------------- */
261#if defined(PTYS_ARE_PTMX) && defined(I_PUSH) 231# if defined(PTYS_ARE_PTMX) && defined(I_PUSH)
262 /* 232 /*
263 * Push STREAMS modules: 233 * Push STREAMS modules:
264 * ptem: pseudo-terminal hardware emulation module. 234 * ptem: pseudo-terminal hardware emulation module.
265 * ldterm: standard terminal line discipline. 235 * ldterm: standard terminal line discipline.
266 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module. 236 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module.
… …
274 * documentation is really unclear about whether it is any close () on 244 * documentation is really unclear about whether it is any close () on
275 * the master side or the last close () - i.e. a proper STREAMS dismantling 245 * the master side or the last close () - i.e. a proper STREAMS dismantling
276 * close () - on the master side which causes a hang up to be sent 246 * close () - on the master side which causes a hang up to be sent
277 * through - Geoff Wing 247 * through - Geoff Wing
278 */ 248 */
279# ifdef HAVE_ISASTREAM 249# ifdef HAVE_ISASTREAM
280 if (isastream (fd_tty) == 1) 250 if (isastream (fd_tty) == 1)
281# endif 251# endif
282 { 252 {
283 ioctl (fd_tty, I_PUSH, "ptem"); 253 ioctl (fd_tty, I_PUSH, "ptem");
284 ioctl (fd_tty, I_PUSH, "ldterm"); 254 ioctl (fd_tty, I_PUSH, "ldterm");
285 ioctl (fd_tty, I_PUSH, "ttcompat"); 255 ioctl (fd_tty, I_PUSH, "ttcompat");
286 } 256 }
287#endif 257# endif
288 /* ---------------------------------------- */ 258 /* ---------------------------------------- */
289# if defined(TIOCSCTTY)
290 fd = ioctl (fd_tty, TIOCSCTTY, NULL); 259 fd = ioctl (fd_tty, TIOCSCTTY, NULL);
291# elif defined(TIOCSETCTTY)
292 fd = ioctl (fd_tty, TIOCSETCTTY, NULL);
293# else
294 fd = open (ttydev, O_RDWR);
295 if (fd >= 0)
296 close (fd);
297# endif
298 /* ---------------------------------------- */ 260 /* ---------------------------------------- */
299 fd = open ("/dev/tty", O_WRONLY); 261 fd = open ("/dev/tty", O_WRONLY);
300 if (fd < 0) 262 if (fd < 0)
301 return -1; /* fatal */ 263 return -1; /* fatal */
302 close (fd); 264 close (fd);
303 /* ---------------------------------------- */ 265 /* ---------------------------------------- */
304#endif /* ! __QNX__ */
305 266
306 return 0; 267 return 0;
307} 268}
269
270void
271rxvt_ptytty::close_tty ()
272{
273 if (tty < 0)
274 return;
275
276 close (tty);
277 tty = -1;
278}
279
280bool
281rxvt_ptytty::make_controlling_tty ()
282{
283 return control_tty (tty) >= 0;
284}
285
286void
287rxvt_ptytty::set_utf8_mode (bool on)
288{
289#ifdef IUTF8
290 if (pty < 0)
291 return;
292
293 struct termios tio;
294
295 if (tcgetattr (pty, &tio) != -1)
296 {
297 tcflag_t new_cflag = tio.c_iflag;
298
299 if (on)
300 new_cflag |= IUTF8;
301 else
302 new_cflag &= ~IUTF8;
303
304 if (new_cflag != tio.c_iflag)
305 {
306 tio.c_iflag = new_cflag;
307 tcsetattr (pty, TCSANOW, &tio);
308 }
309 }
310#endif
311}
312
313/////////////////////////////////////////////////////////////////////////////
308 314
309#ifndef NO_SETOWNER_TTYDEV 315#ifndef NO_SETOWNER_TTYDEV
310static struct ttyconf { 316static struct ttyconf {
311 gid_t gid; 317 gid_t gid;
312 mode_t mode; 318 mode_t mode;
… …
328 gid = getgid (); 334 gid = getgid ();
329 } 335 }
330 } 336 }
331} ttyconf; 337} ttyconf;
332 338
339/////////////////////////////////////////////////////////////////////////////
340
333void 341void
334rxvt_ptytty::privileges (rxvt_privaction action) 342rxvt_ptytty_unix::privileges (rxvt_privaction action)
335{ 343{
336 if (!name || !*name) 344 if (!name || !*name)
337 return; 345 return;
338
339 rxvt_privileges (RESTORE);
340 346
341 if (action == SAVE) 347 if (action == SAVE)
342 { 348 {
343# ifndef RESET_TTY_TO_COMMON_DEFAULTS 349# ifndef RESET_TTY_TO_COMMON_DEFAULTS
344 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */ 350 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
… …
367 chmod (name, (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 373 chmod (name, (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
368 chown (name, 0, 0); 374 chown (name, 0, 0);
369# endif 375# endif
370 376
371 } 377 }
372
373 rxvt_privileges (IGNORE);
374} 378}
375#endif 379#endif
376 380
377rxvt_ptytty::rxvt_ptytty () 381rxvt_ptytty_unix::rxvt_ptytty_unix ()
378{ 382{
379 pty = tty = -1; 383 pty = tty = -1;
380 name = 0; 384 name = 0;
381#ifndef NO_SETOWNER_TTYDEV 385#ifndef NO_SETOWNER_TTYDEV
382 saved = false; 386 saved = false;
383#endif 387#endif
388#if UTMP_SUPPORT
389 cmd_pid = 0;
390#endif
384} 391}
385 392
386rxvt_ptytty::~rxvt_ptytty () 393rxvt_ptytty_unix::~rxvt_ptytty_unix ()
387{ 394{
395#if UTMP_SUPPORT
396 logout ();
397#endif
388 put (); 398 put ();
389} 399}
390 400
391void 401void
392
393rxvt_ptytty::close_tty ()
394{
395 if (tty < 0)
396 return;
397
398 close (tty);
399 tty = -1;
400}
401
402void
403rxvt_ptytty::put () 402rxvt_ptytty_unix::put ()
404{ 403{
405#ifndef NO_SETOWNER_TTYDEV 404#ifndef NO_SETOWNER_TTYDEV
406 privileges (RESTORE); 405 privileges (RESTORE);
407#endif 406#endif
408 407
… …
413 pty = tty = -1; 412 pty = tty = -1;
414 name = 0; 413 name = 0;
415} 414}
416 415
417bool 416bool
418rxvt_ptytty::make_controlling_tty ()
419{
420 return control_tty (tty, name) >= 0;
421}
422
423bool
424rxvt_ptytty::get () 417rxvt_ptytty_unix::get ()
425{ 418{
426 /* get master (pty) */ 419 /* get master (pty) */
427 if ((pty = get_pty (&tty, &name)) < 0) 420 if ((pty = get_pty (&tty, &name)) < 0)
428 return false; 421 return false;
429 422
… …
444 } 437 }
445 438
446 return true; 439 return true;
447} 440}
448 441
442#if PTYTTY_HELPER
443
444static int sock_fd;
445static int pid;
446
447struct command
448{
449 enum { get, login, destroy } type;
450
451 rxvt_ptytty *id;
452
453 bool login_shell;
454 int cmd_pid;
455 char hostname[512]; // arbitrary, but should be plenty
456};
457
458struct rxvt_ptytty_proxy : zero_initialized, rxvt_ptytty
459{
460 rxvt_ptytty *id;
461
462 ~rxvt_ptytty_proxy ();
463
464 bool get ();
465 void login (int cmd_pid, bool login_shell, const char *hostname);
466};
467
468bool
469rxvt_ptytty_proxy::get ()
470{
471 command cmd;
472
473 cmd.type = command::get;
474
475 write (sock_fd, &cmd, sizeof (cmd));
476
477 if (read (sock_fd, &id, sizeof (id)) != sizeof (id))
478 rxvt_fatal ("protocol error while creating pty using helper process, aborting.\n");
479
480 if (!id)
481 return false;
482
483 if ((pty = rxvt_recv_fd (sock_fd)) < 0
484 || (tty = rxvt_recv_fd (sock_fd)) < 0)
485 rxvt_fatal ("protocol error while reading pty/tty fds from helper process, aborting.\n");
486
487 return true;
488}
489
449void 490void
450rxvt_ptytty::set_utf8_mode (bool on) 491rxvt_ptytty_proxy::login (int cmd_pid, bool login_shell, const char *hostname)
451{ 492{
452#ifdef IUTF8 493 command cmd;
453 if (pty < 0)
454 return;
455 494
456 struct termios tio; 495 cmd.type = command::login;
496 cmd.id = id;
497 cmd.cmd_pid = cmd_pid;
498 cmd.login_shell = login_shell;
499 strncpy (cmd.hostname, hostname, sizeof (cmd.hostname));
457 500
458 if (tcgetattr (pty, &tio) != -1) 501 write (sock_fd, &cmd, sizeof (cmd));
459 { 502}
460 tcflag_t new_cflag = tio.c_iflag;
461 503
462 if (on) 504rxvt_ptytty_proxy::~rxvt_ptytty_proxy ()
463 new_cflag |= IUTF8; 505{
506 command cmd;
507
508 cmd.type = command::destroy;
509 cmd.id = id;
510
511 write (sock_fd, &cmd, sizeof (cmd));
512}
513
514static
515void serve ()
516{
517 command cmd;
518 vector<rxvt_ptytty *> ptys;
519
520 while (read (sock_fd, &cmd, sizeof (command)) == sizeof (command))
521 {
522 if (cmd.type == command::get)
523 {
524 // -> id ptyfd ttyfd
525 cmd.id = new rxvt_ptytty_unix;
526
527 if (cmd.id->get ())
528 {
529 write (sock_fd, &cmd.id, sizeof (cmd.id));
530 ptys.push_back (cmd.id);
531
532 rxvt_send_fd (sock_fd, cmd.id->pty);
533 rxvt_send_fd (sock_fd, cmd.id->tty);
534 }
535 else
536 {
537 delete cmd.id;
538 cmd.id = 0;
539 write (sock_fd, &cmd.id, sizeof (cmd.id));
540 }
541 }
542 else if (cmd.type == command::login)
543 {
544#if UTMP_SUPPORT
545 if (find (ptys.begin (), ptys.end (), cmd.id))
546 {
547 cmd.hostname[sizeof (cmd.hostname) - 1] = 0;
548 cmd.id->login (cmd.cmd_pid, cmd.login_shell, cmd.hostname);
549 }
550#endif
551 }
552 else if (cmd.type == command::destroy)
553 {
554 rxvt_ptytty **pty = find (ptys.begin (), ptys.end (), cmd.id);
555
556 if (pty)
557 {
558 delete *pty;
559 ptys.erase (pty);
560 }
561 }
464 else 562 else
465 new_cflag &= ~IUTF8; 563 break;
564 }
466 565
467 if (new_cflag != tio.c_iflag) 566 // destroy all ptys
468 { 567 for (rxvt_ptytty **i = ptys.end (); i-- > ptys.begin (); )
469 tio.c_iflag = new_cflag; 568 delete *i;
470 tcsetattr (pty, TCSANOW, &tio); 569}
471 } 570
571void rxvt_ptytty_server ()
572{
573 int sv[2];
574
575 if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv))
576 rxvt_fatal ("could not create socket to communicate with pty/sessiondb helper, aborting.\n");
577
578 pid = fork ();
579
580 if (pid < 0)
581 rxvt_fatal ("could not create pty/sessiondb helper process, aborting.\n");
582
583 if (pid)
472 } 584 {
585 // client, urxvt
586 sock_fd = sv[0];
587 close (sv[1]);
588 fcntl (sock_fd, F_SETFD, FD_CLOEXEC);
589 }
590 else
591 {
592 setgid (getegid ());
593 setuid (geteuid ());
594
595 // server, pty-helper
596 sock_fd = sv[1];
597
598 for (int fd = 0; fd < 1023; fd++)
599 if (fd != sock_fd && fd != 1)
600 close (fd);
601
602 serve ();
603 _exit (EXIT_SUCCESS);
604 }
605}
473#endif 606#endif
607
608// a "factory" *g*
609rxvt_ptytty *
610rxvt_new_ptytty ()
611{
612#if PTYTTY_HELPER
613 if (pid > 0)
614 // use helper process
615 return new rxvt_ptytty_proxy;
616 else
617#endif
618 return new rxvt_ptytty_unix;
474} 619}
475 620
476/*----------------------- end-of-file (C source) -----------------------*/ 621/*----------------------- end-of-file (C source) -----------------------*/
477 622

Diff Legend

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