Improve handling of oobinline sockets; Plink in telnet mode now

[u/mdw/putty] / unix / pty.c

diff --git a/unix/pty.c b/unix/pty.c
index cede076..fd7a93c 100644 (file)
--- a/unix/pty.c
+++ b/unix/pty.c
@@ -1,3 +1,16 @@
+/*
+ * Pseudo-tty backend for pterm.
+ * 
+ * Unlike the other backends, data for this one is not neatly
+ * encapsulated into a data structure, because it wouldn't make
+ * sense to do so - the utmp stuff has to be done before a backend
+ * is initialised, and starting a second pterm from the same
+ * process would therefore be infeasible because privileges would
+ * already have been dropped. Hence, I haven't bothered to keep the
+ * data dynamically allocated: instead, the backend handle is just
+ * a null pointer and ignored everywhere.
+ */
+
 #define _XOPEN_SOURCE
 #define _XOPEN_SOURCE_EXTENDED
 #include <features.h>
@@ -55,6 +68,7 @@
 #endif
 
 int pty_master_fd;
+static void *pty_frontend;
 static char pty_name[FILENAME_MAX];
 static int pty_stamped_utmp = 0;
 static int pty_child_pid;
@@ -369,12 +383,15 @@ void pty_pre_init(void)
  * Also places the canonical host name into `realhost'. It must be
  * freed by the caller.
  */
-static char *pty_init(void *frontend,
+static char *pty_init(void *frontend, void **backend_handle,
                      char *host, int port, char **realhost, int nodelay)
 {
     int slavefd;
     pid_t pid, pgrp;
 
+    pty_frontend = frontend;
+    *backend_handle = NULL;           /* we can't sensibly use this, sadly */
+
     pty_term_width = cfg.width;
     pty_term_height = cfg.height;
 
@@ -399,7 +416,7 @@ static char *pty_init(void *frontend,
     if (!cfg.stamp_utmp)
        close(pty_utmp_helper_pipe);   /* just let the child process die */
     else {
-       char *location = get_x_display();
+       char *location = get_x_display(pty_frontend);
        int len = strlen(location)+1, pos = 0;   /* +1 to include NUL */
        while (pos < len) {
            int ret = write(pty_utmp_helper_pipe, location+pos, len - pos);
@@ -493,7 +510,7 @@ static char *pty_init(void *frontend,
 /*
  * Called to send data down the pty.
  */
-static int pty_send(char *buf, int len)
+static int pty_send(void *handle, char *buf, int len)
 {
     if (pty_master_fd < 0)
        return 0;                      /* ignore all writes if fd closed */
@@ -522,7 +539,7 @@ void pty_close(void)
 /*
  * Called to query the current socket sendability status.
  */
-static int pty_sendbuffer(void)
+static int pty_sendbuffer(void *handle)
 {
     return 0;
 }
@@ -530,7 +547,7 @@ static int pty_sendbuffer(void)
 /*
  * Called to set the size of the window
  */
-static void pty_size(int width, int height)
+static void pty_size(void *handle, int width, int height)
 {
     struct winsize size;
 
@@ -539,8 +556,10 @@ static void pty_size(int width, int height)
 
     size.ws_row = (unsigned short)pty_term_height;
     size.ws_col = (unsigned short)pty_term_width;
-    size.ws_xpixel = (unsigned short) pty_term_width * font_dimension(0);
-    size.ws_ypixel = (unsigned short) pty_term_height * font_dimension(1);
+    size.ws_xpixel = (unsigned short) pty_term_width *
+       font_dimension(pty_frontend, 0);
+    size.ws_ypixel = (unsigned short) pty_term_height *
+       font_dimension(pty_frontend, 1);
     ioctl(pty_master_fd, TIOCSWINSZ, (void *)&size);
     return;
 }
@@ -548,33 +567,43 @@ static void pty_size(int width, int height)
 /*
  * Send special codes.
  */
-static void pty_special(Telnet_Special code)
+static void pty_special(void *handle, Telnet_Special code)
 {
     /* Do nothing! */
     return;
 }
 
-static Socket pty_socket(void)
+static Socket pty_socket(void *handle)
 {
     return NULL;                      /* shouldn't ever be needed */
 }
 
-static int pty_sendok(void)
+static int pty_sendok(void *handle)
 {
     return 1;
 }
 
-static void pty_unthrottle(int backlog)
+static void pty_unthrottle(void *handle, int backlog)
 {
     /* do nothing */
 }
 
-static int pty_ldisc(int option)
+static int pty_ldisc(void *handle, int option)
 {
     return 0;                         /* neither editing nor echoing */
 }
 
-static int pty_exitcode(void)
+static void pty_provide_ldisc(void *handle, void *ldisc)
+{
+    /* This is a stub. */
+}
+
+static void pty_provide_logctx(void *handle, void *logctx)
+{
+    /* This is a stub. */
+}
+
+static int pty_exitcode(void *handle)
 {
     if (!pty_child_dead)
        return -1;                     /* not dead yet */
@@ -592,6 +621,8 @@ Backend pty_backend = {
     pty_exitcode,
     pty_sendok,
     pty_ldisc,
+    pty_provide_ldisc,
+    pty_provide_logctx,
     pty_unthrottle,
     1
 };