+/*
+ * Platform-independent bits of X11 forwarding.
+ */
+
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
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;
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;
return atoi(display + n + 1);
}
+/* Find the right display, returns an allocated string */
+char *x11_display(const char *display) {
+ char *ret;
+ if(!display || !*display) {
+ /* try to find platform-specific local display */
+ if(!(ret = platform_get_x_display()))
+ /* plausible default for all platforms */
+ ret = dupstr(":0");
+ } else
+ ret = dupstr(display);
+ if(ret[0] == ':') {
+ /* no transport specified, use whatever we think is best */
+ char *s = dupcat(platform_x11_best_transport, ret, (char *)0);
+ sfree(ret);
+ return s;
+ } else
+ return ret;
+}
+
/*
* 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 Config *cfg)
+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,
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, cfg);
- 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;
pr->c = c;
pr->s = *s = new_connection(addr, dummy_realhost, port,
- 0, 1, 0, (Plug) pr, cfg);
+ 0, 1, 0, 0, (Plug) pr, cfg);
if ((err = sk_socket_error(*s)) != NULL) {
sfree(pr);
return err;
}
sk_set_private_ptr(*s, pr);
- sk_addr_free(addr);
return NULL;
}
*/
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.
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);
}
/*
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 */