X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/b3ebaa287b8a57f3d35675889adc86f6384eb458..79bf227ba7ba02e32ac710621b672e2789f9ef50:/x11fwd.c

diff --git a/x11fwd.c b/x11fwd.c
index 135c0347..b0b82698 100644
--- a/x11fwd.c
+++ b/x11fwd.c
@@ -81,7 +81,7 @@ struct X11Private {
 void *x11_invent_auth(char *proto, int protomaxlen,
 		      char *data, int datamaxlen, int proto_id)
 {
-    struct X11Auth *auth = smalloc(sizeof(struct X11Auth));
+    struct X11Auth *auth = snew(struct X11Auth);
     char ourdata[64];
     int i;
 
@@ -112,6 +112,12 @@ void *x11_invent_auth(char *proto, int protomaxlen,
     return auth;
 }
 
+void x11_free_auth(void *auth)
+{
+
+    sfree(auth);
+}
+
 /*
  * Fetch the real auth data for a given display string, and store
  * it in an X11Auth structure. Returns NULL on success, or an error
@@ -168,7 +174,7 @@ static char *x11_verify(unsigned long peer_ip, int peer_port,
     return NULL;
 }
 
-static int x11_closing(Plug plug, char *error_msg, int error_code,
+static int x11_closing(Plug plug, const char *error_msg, int error_code,
 		       int calling_back)
 {
     struct X11Private *pr = (struct X11Private *) plug;
@@ -220,14 +226,26 @@ int x11_get_screen_number(char *display)
     return atoi(display + n + 1);
 }
 
+/* Find the right display, returns an allocated string */
+char *x11_display(const char *display) {
+    if(!display || !*display)
+	if(!(display = getenv("DISPLAY")))
+	    display = ":0";
+    if(display[0] == ':') {
+	/* no transport specified, use whatever we think is best */
+	return dupcat(platform_x11_best_transport, display, (char *)0);
+    } else
+	return dupstr(display);
+}
+
 /*
  * Called to set up the raw connection.
  * 
  * Returns an error message, or NULL on success.
  * also, fills the SocketsStructure
  */
-char *x11_init(Socket * s, char *display, void *c, void *auth,
-	       const char *peeraddr, int peerport)
+const char *x11_init(Socket * s, char *display, void *c, void *auth,
+		     const char *peeraddr, int peerport, const Config *cfg)
 {
     static const struct plug_function_table fn_table = {
 	x11_closing,
@@ -238,45 +256,51 @@ char *x11_init(Socket * s, char *display, void *c, void *auth,
 
     SockAddr addr;
     int port;
-    char *err, *dummy_realhost;
+    const char *err;
+    char *dummy_realhost;
     char host[128];
     int n, displaynum;
     struct X11Private *pr;
 
+    /* default display */
+    display = x11_display(display);
     /*
      * Split up display name into host and display-number parts.
      */
     n = strcspn(display, ":");
+    assert(n != 0);		/* x11_display() promises this */
     if (display[n])
 	displaynum = atoi(display + n + 1);
     else
 	displaynum = 0;		       /* sensible default */
     if (n > sizeof(host) - 1)
 	n = sizeof(host) - 1;
-    if (n > 0) {
-	strncpy(host, display, n);
-	host[n] = '\0';
+    strncpy(host, display, n);
+    host[n] = '\0';
+    sfree(display);
+    
+    if(!strcmp(host, "unix")) {
+	/* use AF_UNIX sockets (doesn't make sense on all platforms) */
+	addr = platform_get_x11_unix_address(displaynum,
+					     &dummy_realhost);
+	port = 0;		/* to show we are not confused */
     } else {
+	port = 6000 + displaynum;
+	
 	/*
-	 * Local display numbers, particularly on Unix, often omit
-	 * the display part completely.
+	 * Try to find host.
 	 */
-	strcpy(host, "localhost");
+	addr = name_lookup(host, port, &dummy_realhost, cfg);
+	if ((err = sk_addr_error(addr)) != NULL) {
+	    sk_addr_free(addr);
+	    return err;
+	}
     }
 
-    port = 6000 + displaynum;
-
-    /*
-     * Try to find host.
-     */
-    addr = name_lookup(host, port, &dummy_realhost);
-    if ((err = sk_addr_error(addr)) != NULL)
-	return err;
-
     /*
      * Open socket.
      */
-    pr = (struct X11Private *) smalloc(sizeof(struct X11Private));
+    pr = snew(struct X11Private);
     pr->fn = &fn_table;
     pr->auth_protocol = NULL;
     pr->auth = (struct X11Auth *)auth;
@@ -285,7 +309,8 @@ char *x11_init(Socket * s, char *display, void *c, void *auth,
     pr->throttled = pr->throttle_override = 0;
     pr->c = c;
 
-    pr->s = *s = new_connection(addr, dummy_realhost, port, 0, 1, 0, (Plug) pr);
+    pr->s = *s = new_connection(addr, dummy_realhost, port,
+				0, 1, 0, 0, (Plug) pr, cfg);
     if ((err = sk_socket_error(*s)) != NULL) {
 	sfree(pr);
 	return err;
@@ -307,7 +332,6 @@ char *x11_init(Socket * s, char *display, void *c, void *auth,
     }
 
     sk_set_private_ptr(*s, pr);
-    sk_addr_free(addr);
     return NULL;
 }
 
@@ -354,10 +378,10 @@ void x11_override_throttle(Socket s, int enable)
  */
 int x11_send(Socket s, char *data, int len)
 {
-    struct X11Private *pr = (struct X11Private *) sk_get_private_ptr(s);
-
-    if (s == NULL)
+    struct X11Private *pr;
+    if (!s)
 	return 0;
+    pr = (struct X11Private *) sk_get_private_ptr(s);
 
     /*
      * Read the first packet.
@@ -377,8 +401,8 @@ int x11_send(Socket s, char *data, int len)
 	pr->auth_psize = (pr->auth_plen + 3) & ~3;
 	pr->auth_dsize = (pr->auth_dlen + 3) & ~3;
 	/* Leave room for a terminating zero, to make our lives easier. */
-	pr->auth_protocol = (char *) smalloc(pr->auth_psize + 1);
-	pr->auth_data = (unsigned char *) smalloc(pr->auth_dsize);
+	pr->auth_protocol = snewn(pr->auth_psize + 1, char);
+	pr->auth_data = snewn(pr->auth_dsize, unsigned char);
     }
 
     /*
@@ -414,7 +438,7 @@ int x11_send(Socket s, char *data, int len)
 
 	    message = dupprintf("PuTTY X11 proxy: %s", err);
 	    msglen = strlen(message);
-	    reply = smalloc(8 + msglen+1 + 4);   /* include zero byte */
+	    reply = snewn(8 + msglen+1 + 4, unsigned char); /* include zero */
 	    msgsize = (msglen + 3) & ~3;
 	    reply[0] = 0;	       /* failure */
 	    reply[1] = msglen;	       /* length of reason string */