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.39 by root, Tue Jan 17 12:22:59 2006 UTC vs.
Revision 1.41 by root, Tue Jan 17 15:41:33 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 */
… …
54#endif 50#endif
55 51
56#include <cstdio> 52#include <cstdio>
57#include <grp.h> 53#include <grp.h>
58 54
55#include "rxvtutil.h"
56#include "fdpass.h"
59#include "ptytty.h" 57#include "ptytty.h"
60 58
61///////////////////////////////////////////////////////////////////////////// 59/////////////////////////////////////////////////////////////////////////////
62 60
63/* ------------------------------------------------------------------------- * 61/* ------------------------------------------------------------------------- *
… …
74 int pfd; 72 int pfd;
75 73
76#ifdef PTYS_ARE_OPENPTY 74#ifdef PTYS_ARE_OPENPTY
77 char tty_name[sizeof "/dev/pts/????\0"]; 75 char tty_name[sizeof "/dev/pts/????\0"];
78 76
79 rxvt_privileges(RESTORE);
80 int res = openpty (&pfd, fd_tty, tty_name, NULL, NULL); 77 int res = openpty (&pfd, fd_tty, tty_name, NULL, NULL);
81 rxvt_privileges(IGNORE);
82 78
83 if (res != -1) 79 if (res != -1)
84 { 80 {
85 *ttydev = strdup (tty_name); 81 *ttydev = strdup (tty_name);
86 return pfd; 82 return pfd;
… …
346rxvt_ptytty_unix::privileges (rxvt_privaction action) 342rxvt_ptytty_unix::privileges (rxvt_privaction action)
347{ 343{
348 if (!name || !*name) 344 if (!name || !*name)
349 return; 345 return;
350 346
351 rxvt_privileges (RESTORE);
352
353 if (action == SAVE) 347 if (action == SAVE)
354 { 348 {
355# ifndef RESET_TTY_TO_COMMON_DEFAULTS 349# ifndef RESET_TTY_TO_COMMON_DEFAULTS
356 /* 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 */
357 if (lstat (name, &savestat) < 0) /* you lose out */ 351 if (lstat (name, &savestat) < 0) /* you lose out */
… …
379 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));
380 chown (name, 0, 0); 374 chown (name, 0, 0);
381# endif 375# endif
382 376
383 } 377 }
384
385 rxvt_privileges (IGNORE);
386} 378}
387#endif 379#endif
388 380
389rxvt_ptytty_unix::rxvt_ptytty_unix () 381rxvt_ptytty_unix::rxvt_ptytty_unix ()
390{ 382{
… …
443 } 435 }
444 436
445 return true; 437 return true;
446} 438}
447 439
440#if PTYTTY_HELPER
441
442static int sock_fd;
443static int pid;
444
445struct command
446{
447 enum { get, login, destroy } type;
448
449 rxvt_ptytty *id;
450
451 bool login_shell;
452 int cmd_pid;
453 char hostname[512]; // arbitrary, but should be plenty
454};
455
456struct rxvt_ptytty_proxy : zero_initialized, rxvt_ptytty
457{
458 rxvt_ptytty *id;
459
460 ~rxvt_ptytty_proxy ();
461
462 bool get ();
463 void login (int cmd_pid, bool login_shell, const char *hostname);
464};
465
466bool
467rxvt_ptytty_proxy::get ()
468{
469 command cmd;
470
471 cmd.type = command::get;
472
473 write (sock_fd, &cmd, sizeof (cmd));
474
475 if (read (sock_fd, &id, sizeof (id)) != sizeof (id))
476 rxvt_fatal ("protocol error while creating pty using helper process, aborting.\n");
477
478 if (!id)
479 return false;
480
481 if ((pty = rxvt_recv_fd (sock_fd)) < 0
482 || (tty = rxvt_recv_fd (sock_fd)) < 0)
483 rxvt_fatal ("protocol error while reading pty/tty fds from helper process, aborting.\n");
484
485 return true;
486}
487
488void
489rxvt_ptytty_proxy::login (int cmd_pid, bool login_shell, const char *hostname)
490{
491 command cmd;
492
493 cmd.type = command::login;
494 cmd.id = id;
495 cmd.cmd_pid = cmd_pid;
496 cmd.login_shell = login_shell;
497 strncpy (cmd.hostname, hostname, sizeof (cmd.hostname));
498
499 write (sock_fd, &cmd, sizeof (cmd));
500}
501
502rxvt_ptytty_proxy::~rxvt_ptytty_proxy ()
503{
504 command cmd;
505
506 cmd.type = command::destroy;
507 cmd.id = id;
508
509 write (sock_fd, &cmd, sizeof (cmd));
510}
511
512static
513void serve ()
514{
515 command cmd;
516 vector<rxvt_ptytty *> ptys;
517
518 while (read (sock_fd, &cmd, sizeof (command)) == sizeof (command))
519 {
520 if (cmd.type == command::get)
521 {
522 // -> id ptyfd ttyfd
523 cmd.id = new rxvt_ptytty_unix;
524
525 if (cmd.id->get ())
526 {
527 write (sock_fd, &cmd.id, sizeof (cmd.id));
528 ptys.push_back (cmd.id);
529
530 rxvt_send_fd (sock_fd, cmd.id->pty);
531 rxvt_send_fd (sock_fd, cmd.id->tty);
532 }
533 else
534 {
535 delete cmd.id;
536 cmd.id = 0;
537 write (sock_fd, &cmd.id, sizeof (cmd.id));
538 }
539 }
540 else if (cmd.type == command::login)
541 {
542 if (find (ptys.begin (), ptys.end (), cmd.id))
543 {
544 cmd.hostname[sizeof (cmd.hostname) - 1] = 0;
545 cmd.id->login (cmd.cmd_pid, cmd.login_shell, cmd.hostname);
546 }
547 }
548 else if (cmd.type == command::destroy)
549 {
550 rxvt_ptytty **pty = find (ptys.begin (), ptys.end (), cmd.id);
551
552 if (*pty)
553 {
554 ptys.erase (pty);
555 delete *pty;
556 }
557 }
558 else
559 break;
560 }
561
562 // destroy all ptys
563 for (rxvt_ptytty **i = ptys.end (); i-- > ptys.begin (); )
564 delete *i;
565}
566
567void rxvt_ptytty_server ()
568{
569 int sv[2];
570
571 if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv))
572 rxvt_fatal ("could not create socket to communicate with pty/sessiondb helper, aborting.\n");
573
574 pid = fork ();
575
576 if (pid < 0)
577 rxvt_fatal ("could not create pty/sessiondb helper process, aborting.\n");
578
579 if (pid)
580 {
581 // client, urxvt
582 sock_fd = sv[0];
583 close (sv[1]);
584 fcntl (sock_fd, F_SETFD, FD_CLOEXEC);
585 }
586 else
587 {
588 setgid (getegid ());
589 setuid (geteuid ());
590
591 // server, pty-helper
592 sock_fd = sv[1];
593
594 for (int fd = 0; fd < 1023; fd++)
595 if (fd != sock_fd)
596 close (fd);
597
598 serve ();
599 _exit (EXIT_SUCCESS);
600 }
601}
602#endif
603
448// a "factory" *g* 604// a "factory" *g*
449rxvt_ptytty *rxvt_new_ptytty () 605rxvt_ptytty *
606rxvt_new_ptytty ()
450{ 607{
608#if PTYTTY_HELPER
609 if (pid > 0)
610 // use helper process
611 return new rxvt_ptytty_proxy;
612 else
613#endif
451 return new rxvt_ptytty_unix; 614 return new rxvt_ptytty_unix;
452} 615}
453 616
454/*----------------------- end-of-file (C source) -----------------------*/ 617/*----------------------- end-of-file (C source) -----------------------*/
455 618

Diff Legend

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