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.26 by root, Mon Jan 2 15:10:18 2006 UTC vs.
Revision 1.40 by root, Tue Jan 17 15:17:39 2006 UTC

… …
2 * File: ptytty.C 2 * File: ptytty.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com> 6 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com>
7 * Copyright (c) 2004 Marc Lehmann <pcg@goof.com> 7 * Copyright (c) 2004-2006 Marc Lehmann <pcg@goof.com>
8 * 8 *
9 * This program is free software; you can redistribute it and/or modify 9 * 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 10 * 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 11 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version. 12 * (at your option) any later version.
… …
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#ifdef HAVE_STDLIB_H
28# include <cstdlib> 27#include <cstdlib>
29#endif 28#include <cstring>
30#ifdef HAVE_SYS_TYPES_H 29
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#if defined(HAVE_STRING_H)
37# include <cstring>
38#endif
39#ifdef HAVE_FCNTL_H
40# include <fcntl.h> 33#include <fcntl.h>
41#endif 34
42#ifdef HAVE_SYS_IOCTL_H 35#ifdef HAVE_SYS_IOCTL_H
43# include <sys/ioctl.h> 36# include <sys/ioctl.h>
44#endif 37#endif
45#if defined(PTYS_ARE_PTMX) && defined(HAVE_SYS_STROPTS_H) 38#if defined(PTYS_ARE_PTMX) && defined(HAVE_SYS_STROPTS_H)
46# include <sys/stropts.h> /* for I_PUSH */ 39# include <sys/stropts.h> /* for I_PUSH */
47#endif 40#endif
48#ifdef HAVE_ISASTREAM 41#ifdef HAVE_ISASTREAM
49# include <stropts.h> 42# include <stropts.h>
50#endif 43#endif
51#ifdef HAVE_PTY_H 44#if defined(HAVE_PTY_H)
52# include <pty.h> 45# include <pty.h>
53#endif 46#elif defined(HAVE_LIBUTIL_H)
54
55// better do this via configure, but....
56#if defined(__FreeBSD__)
57# include <libutil.h> 47# include <libutil.h>
58#elif defined(__DARWIN__) || (defined (__MACH__) && defined (__APPLE__)) 48#elif defined(HAVE_UTIL_H)
59# include <util.h> 49# include <util.h>
60#endif 50#endif
61 51
62#include <cstdio> 52#include <cstdio>
63#include <grp.h> 53#include <grp.h>
54
55#include "rxvtutil.h"
56#include "fdpass.h"
57#include "ptytty.h"
58
59/////////////////////////////////////////////////////////////////////////////
64 60
65/* ------------------------------------------------------------------------- * 61/* ------------------------------------------------------------------------- *
66 * GET PSEUDO TELETYPE - MASTER AND SLAVE * 62 * GET PSEUDO TELETYPE - MASTER AND SLAVE *
67 * ------------------------------------------------------------------------- */ 63 * ------------------------------------------------------------------------- */
68/* 64/*
… …
76 int pfd; 72 int pfd;
77 73
78#ifdef PTYS_ARE_OPENPTY 74#ifdef PTYS_ARE_OPENPTY
79 char tty_name[sizeof "/dev/pts/????\0"]; 75 char tty_name[sizeof "/dev/pts/????\0"];
80 76
77 rxvt_privileges(RESTORE);
81 if (openpty (&pfd, fd_tty, tty_name, NULL, NULL) != -1) 78 int res = openpty (&pfd, fd_tty, tty_name, NULL, NULL);
79 rxvt_privileges(IGNORE);
80
81 if (res != -1)
82 { 82 {
83 *ttydev = strdup (tty_name); 83 *ttydev = strdup (tty_name);
84 return pfd; 84 return pfd;
85 } 85 }
86#endif 86#endif
… …
89 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0); 89 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0);
90 if (*ttydev != NULL) 90 if (*ttydev != NULL)
91 return pfd; 91 return pfd;
92#endif 92#endif
93 93
94#ifdef PTYS_ARE_GETPTY
95 char *ptydev;
96
97 while ((ptydev = getpty ()) != NULL)
98 if ((pfd = open (ptydev, O_RDWR | O_NOCTTY, 0)) >= 0)
99 {
100 *ttydev = ptydev;
101 return pfd;
102 }
103#endif
104
105#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT) 94#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
106# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX) 95# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_POSIX) || defined(PTYS_ARE_PTMX)
107 96
108 { 97 {
109# ifdef PTYS_ARE_GETPT 98# ifdef PTYS_ARE_GETPT
110 pfd = getpt (); 99 pfd = getpt();
100# else
101# ifdef PTYS_ARE_POSIX
102 pfd = posix_openpt (O_RDWR);
111# else 103# else
112 pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0); 104 pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0);
105# endif
113# endif 106# endif
114 107
115 if (pfd >= 0) 108 if (pfd >= 0)
116 { 109 {
117 if (grantpt (pfd) == 0 /* change slave permissions */ 110 if (grantpt (pfd) == 0 /* change slave permissions */
… …
227/*----------------------------------------------------------------------*/ 220/*----------------------------------------------------------------------*/
228/* 221/*
229 * Make our tty a controlling tty so that /dev/tty points to us 222 * Make our tty a controlling tty so that /dev/tty points to us
230 */ 223 */
231static int 224static int
232control_tty (int fd_tty, const char *ttydev) 225control_tty (int fd_tty)
233{ 226{
234#ifndef __QNX__
235 int fd; 227 int fd;
236 228
237 /* ---------------------------------------- */ 229 /* ---------------------------------------- */
238# ifdef HAVE_SETSID
239 setsid (); 230 setsid ();
240# endif
241# if defined(HAVE_SETPGID)
242 setpgid (0, 0);
243# elif defined(HAVE_SETPGRP)
244 setpgrp (0, 0);
245# endif
246 231
247 /* ---------------------------------------- */ 232 /* ---------------------------------------- */
248# ifdef TIOCNOTTY
249 fd = open ("/dev/tty", O_RDWR | O_NOCTTY);
250 if (fd >= 0)
251 {
252 ioctl (fd, TIOCNOTTY, NULL); /* void tty associations */
253 close (fd);
254 }
255# endif
256
257 /* ---------------------------------------- */
258 fd = open ("/dev/tty", O_RDWR | O_NOCTTY);
259 if (fd >= 0)
260 close (fd); /* ouch: still have controlling tty */
261
262 /* ---------------------------------------- */
263#if defined(PTYS_ARE_PTMX) && defined(I_PUSH) 233# if defined(PTYS_ARE_PTMX) && defined(I_PUSH)
264 /* 234 /*
265 * Push STREAMS modules: 235 * Push STREAMS modules:
266 * ptem: pseudo-terminal hardware emulation module. 236 * ptem: pseudo-terminal hardware emulation module.
267 * ldterm: standard terminal line discipline. 237 * ldterm: standard terminal line discipline.
268 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module. 238 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module.
… …
276 * documentation is really unclear about whether it is any close () on 246 * documentation is really unclear about whether it is any close () on
277 * the master side or the last close () - i.e. a proper STREAMS dismantling 247 * the master side or the last close () - i.e. a proper STREAMS dismantling
278 * close () - on the master side which causes a hang up to be sent 248 * close () - on the master side which causes a hang up to be sent
279 * through - Geoff Wing 249 * through - Geoff Wing
280 */ 250 */
281# ifdef HAVE_ISASTREAM 251# ifdef HAVE_ISASTREAM
282 if (isastream (fd_tty) == 1) 252 if (isastream (fd_tty) == 1)
283# endif 253# endif
284 { 254 {
285 ioctl (fd_tty, I_PUSH, "ptem"); 255 ioctl (fd_tty, I_PUSH, "ptem");
286 ioctl (fd_tty, I_PUSH, "ldterm"); 256 ioctl (fd_tty, I_PUSH, "ldterm");
287 ioctl (fd_tty, I_PUSH, "ttcompat"); 257 ioctl (fd_tty, I_PUSH, "ttcompat");
288 } 258 }
289#endif 259# endif
290 /* ---------------------------------------- */ 260 /* ---------------------------------------- */
291# if defined(TIOCSCTTY)
292 fd = ioctl (fd_tty, TIOCSCTTY, NULL); 261 fd = ioctl (fd_tty, TIOCSCTTY, NULL);
293# elif defined(TIOCSETCTTY)
294 fd = ioctl (fd_tty, TIOCSETCTTY, NULL);
295# else
296 fd = open (ttydev, O_RDWR);
297 if (fd >= 0)
298 close (fd);
299# endif
300 /* ---------------------------------------- */ 262 /* ---------------------------------------- */
301 fd = open ("/dev/tty", O_WRONLY); 263 fd = open ("/dev/tty", O_WRONLY);
302 if (fd < 0) 264 if (fd < 0)
303 return -1; /* fatal */ 265 return -1; /* fatal */
304 close (fd); 266 close (fd);
305 /* ---------------------------------------- */ 267 /* ---------------------------------------- */
306#endif /* ! __QNX__ */
307 268
308 return 0; 269 return 0;
309} 270}
271
272void
273rxvt_ptytty::close_tty ()
274{
275 if (tty < 0)
276 return;
277
278 close (tty);
279 tty = -1;
280}
281
282bool
283rxvt_ptytty::make_controlling_tty ()
284{
285 return control_tty (tty) >= 0;
286}
287
288void
289rxvt_ptytty::set_utf8_mode (bool on)
290{
291#ifdef IUTF8
292 if (pty < 0)
293 return;
294
295 struct termios tio;
296
297 if (tcgetattr (pty, &tio) != -1)
298 {
299 tcflag_t new_cflag = tio.c_iflag;
300
301 if (on)
302 new_cflag |= IUTF8;
303 else
304 new_cflag &= ~IUTF8;
305
306 if (new_cflag != tio.c_iflag)
307 {
308 tio.c_iflag = new_cflag;
309 tcsetattr (pty, TCSANOW, &tio);
310 }
311 }
312#endif
313}
314
315/////////////////////////////////////////////////////////////////////////////
310 316
311#ifndef NO_SETOWNER_TTYDEV 317#ifndef NO_SETOWNER_TTYDEV
312static struct ttyconf { 318static struct ttyconf {
313 gid_t gid; 319 gid_t gid;
314 mode_t mode; 320 mode_t mode;
… …
330 gid = getgid (); 336 gid = getgid ();
331 } 337 }
332 } 338 }
333} ttyconf; 339} ttyconf;
334 340
341/////////////////////////////////////////////////////////////////////////////
342
335void 343void
336rxvt_ptytty::privileges (rxvt_privaction action) 344rxvt_ptytty_unix::privileges (rxvt_privaction action)
337{ 345{
338 if (!name || !*name) 346 if (!name || !*name)
339 return; 347 return;
340 348
341 rxvt_privileges (RESTORE); 349 rxvt_privileges (RESTORE);
… …
374 382
375 rxvt_privileges (IGNORE); 383 rxvt_privileges (IGNORE);
376} 384}
377#endif 385#endif
378 386
379rxvt_ptytty::rxvt_ptytty () 387rxvt_ptytty_unix::rxvt_ptytty_unix ()
380{ 388{
381 pty = tty = -1; 389 pty = tty = -1;
382 name = 0; 390 name = 0;
383#ifndef NO_SETOWNER_TTYDEV 391#ifndef NO_SETOWNER_TTYDEV
384 saved = false; 392 saved = false;
385#endif 393#endif
394#if UTMP_SUPPORT
395 cmd_pid = 0;
396#endif
386} 397}
387 398
388rxvt_ptytty::~rxvt_ptytty () 399rxvt_ptytty_unix::~rxvt_ptytty_unix ()
389{ 400{
401 logout ();
390 put (); 402 put ();
391} 403}
392 404
393void 405void
394
395rxvt_ptytty::close_tty ()
396{
397 if (tty >= 0) close (tty);
398 tty = -1;
399}
400
401void
402rxvt_ptytty::put () 406rxvt_ptytty_unix::put ()
403{ 407{
404#ifndef NO_SETOWNER_TTYDEV 408#ifndef NO_SETOWNER_TTYDEV
405 if (tty >= 0)
406 privileges (RESTORE); 409 privileges (RESTORE);
407#endif 410#endif
408 411
409 if (pty >= 0) close (pty); 412 if (pty >= 0) close (pty);
410 close_tty (); 413 close_tty ();
411 free (name); 414 free (name);
… …
413 pty = tty = -1; 416 pty = tty = -1;
414 name = 0; 417 name = 0;
415} 418}
416 419
417bool 420bool
418rxvt_ptytty::make_controlling_tty ()
419{
420 return control_tty (tty, name) >= 0;
421}
422
423bool
424rxvt_ptytty::get () 421rxvt_ptytty_unix::get ()
425{ 422{
426 /* get master (pty) */ 423 /* get master (pty) */
427 if ((pty = get_pty (&tty, &name)) < 0) 424 if ((pty = get_pty (&tty, &name)) < 0)
428 return false; 425 return false;
429 426
… …
444 } 441 }
445 442
446 return true; 443 return true;
447} 444}
448 445
446#if PTYTTY_HELPER
447
448static int sock_fd;
449static int pid;
450
451struct command
452{
453 enum { get, login, destroy } type;
454
455 rxvt_ptytty *id;
456
457 bool login_shell;
458 int cmd_pid;
459 char hostname[512]; // arbitrary, but should be plenty
460};
461
462struct rxvt_ptytty_proxy : zero_initialized, rxvt_ptytty
463{
464 rxvt_ptytty *id;
465
466 rxvt_ptytty_proxy ();
467 ~rxvt_ptytty_proxy ();
468
469 bool get ();
470 void login (int cmd_pid, bool login_shell, const char *hostname);
471};
472
473bool
474rxvt_ptytty_proxy::get ()
475{
476 command cmd;
477
478 cmd.type = command::get;
479
480 write (sock_fd, &cmd, sizeof (cmd));
481
482 if (read (sock_fd, &id, sizeof (id)) != sizeof (id))
483 rxvt_fatal ("protocol error while creating pty using helper process, aborting.\n");
484
485 if (!id)
486 return false;
487
488 if ((pty = rxvt_recv_fd (sock_fd)) < 0
489 || (tty = rxvt_recv_fd (sock_fd)) < 0)
490 rxvt_fatal ("protocol error while reading pty/tty fds from helper process, aborting.\n");
491
492 return true;
493}
494
449void 495void
450rxvt_ptytty::set_utf8_mode (bool on) 496rxvt_ptytty_proxy::login (int cmd_pid, bool login_shell, const char *hostname)
451{ 497{
452#ifdef IUTF8 498 command cmd;
453 if (pty != -1)
454 {
455 struct termios tio;
456 499
457 if (tcgetattr (pty, &tio) != -1) 500 cmd.type = command::login;
501 cmd.id = id;
502 cmd.cmd_pid = cmd_pid;
503 cmd.login_shell = login_shell;
504 strncpy (cmd.hostname, hostname, sizeof (cmd.hostname));
505
506 write (sock_fd, &cmd, sizeof (cmd));
507}
508
509rxvt_ptytty_proxy::~rxvt_ptytty_proxy ()
510{
511 command cmd;
512
513 cmd.type = command::destroy;
514 cmd.id = id;
515
516 write (sock_fd, &cmd, sizeof (cmd));
517}
518
519static
520void serve ()
521{
522 command cmd;
523 vector<rxvt_ptytty *> ptys;
524
525 while (read (sock_fd, &cmd, sizeof (command)) == sizeof (command))
526 {
527 if (cmd.type == command::get)
528 {
529 // -> id ptyfd ttyfd
530 cmd.id = new rxvt_ptytty_unix;
531
532 if (cmd.id->get ())
458 { 533 {
459 tcflag_t new_cflag = tio.c_iflag; 534 write (sock_fd, &cmd.id, sizeof (cmd.id));
535 ptys.push_back (cmd.id);
460 536
461 if (on) 537 rxvt_send_fd (sock_fd, cmd.id->pty);
462 new_cflag |= IUTF8; 538 rxvt_send_fd (sock_fd, cmd.id->tty);
539 }
463 else 540 else
464 new_cflag &= ~IUTF8;
465
466 if (new_cflag != tio.c_iflag)
467 { 541 {
468 tio.c_iflag = new_cflag; 542 delete cmd.id;
469 tcsetattr (pty, TCSANOW, &tio); 543 cmd.id = 0;
544 write (sock_fd, &cmd.id, sizeof (cmd.id));
470 } 545 }
471 } 546 }
547 else if (cmd.type == command::login)
548 {
549 if (find (ptys.begin (), ptys.end (), cmd.id))
550 {
551 cmd.hostname[sizeof (cmd.hostname) - 1] = 0;
552 cmd.id->login (cmd.cmd_pid, cmd.login_shell, cmd.hostname);
553 }
554 else printf ("xxx hiya login no match %p\n", cmd.id);
555 }
556 else if (cmd.type == command::destroy)
557 {
558 rxvt_ptytty **pty = find (ptys.begin (), ptys.end (), cmd.id);
559
560 if (*pty)
561 {
562 ptys.erase (pty);
563 delete *pty;
564 }
565 else printf ("xxx hiya destroy no match %p\n", cmd.id);
566 }
567 else
568 break;
569 }
570
571 // destroy all ptys
572 for (rxvt_ptytty **i = ptys.end (); i-- > ptys.begin (); )
573 delete *i;
574}
575
576void rxvt_ptytty_server ()
577{
578 int sv[2];
579
580 if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv))
581 rxvt_fatal ("could not create socket to communicate with pty/sessiondb helper, aborting.\n");
582
583 pid = fork ();
584
585 if (pid < 0)
586 rxvt_fatal ("could not create pty/sessiondb helper process, aborting.\n");
587
588 if (pid)
472 } 589 {
590 // client, urxvt
591 sock_fd = sv[0];
592 close (sv[1]);
593 fcntl (sock_fd, F_SETFD, FD_CLOEXEC);
594 }
595 else
596 {
597 // server, pty-helper
598 sock_fd = sv[1];
599
600 close (sv[0]);//D
601// for (int fd = 0; fd < 1023; fd++)
602// if (fd != sock_fd)
603// close (fd);
604
605 serve ();
606 _exit (EXIT_SUCCESS);
607 }
608}
473#endif 609#endif
610
611// a "factory" *g*
612rxvt_ptytty *
613rxvt_new_ptytty ()
614{
615#if PTYTTY_HELPER
616 if (pid > 0)
617 {
618 // use helper process
619 return new rxvt_ptytty_proxy;
620 }
621 else
622#endif
623 return new rxvt_ptytty_unix;
474} 624}
475 625
476/*----------------------- end-of-file (C source) -----------------------*/ 626/*----------------------- end-of-file (C source) -----------------------*/
477 627

Diff Legend

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