X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=unix%2Fuxproxy.c;h=0399245d0c28bd8e7269390d991d835c66176bf5;hb=1bdeff715c9b8c79ec5dc021b5aca403f575f1ae;hp=aa1ff07ab2bdb72e405a102ac3ec41a8a35086e8;hpb=b4268722196a3d93183252584b86cbb719187a38;p=PuTTY.git

diff --git a/unix/uxproxy.c b/unix/uxproxy.c
index aa1ff07a..0399245d 100644
--- a/unix/uxproxy.c
+++ b/unix/uxproxy.c
@@ -30,8 +30,6 @@ struct Socket_localproxy_tag {
     bufchain pending_output_data;
     bufchain pending_input_data;
     enum { EOF_NO, EOF_PENDING, EOF_SENT } outgoingeof;
-
-    void *privptr;
 };
 
 static int localproxy_select_result(int fd, int event);
@@ -186,18 +184,6 @@ static void sk_localproxy_flush (Socket s)
     /* do nothing */
 }
 
-static void sk_localproxy_set_private_ptr (Socket s, void *ptr)
-{
-    Local_Proxy_Socket ps = (Local_Proxy_Socket) s;
-    ps->privptr = ptr;
-}
-
-static void * sk_localproxy_get_private_ptr (Socket s)
-{
-    Local_Proxy_Socket ps = (Local_Proxy_Socket) s;
-    return ps->privptr;
-}
-
 static void sk_localproxy_set_frozen (Socket s, int is_frozen)
 {
     Local_Proxy_Socket ps = (Local_Proxy_Socket) s;
@@ -244,7 +230,7 @@ static int localproxy_select_result(int fd, int event)
     return 1;
 }
 
-Socket platform_new_connection(SockAddr addr, char *hostname,
+Socket platform_new_connection(SockAddr addr, const char *hostname,
 			       int port, int privport,
 			       int oobinline, int nodelay, int keepalive,
 			       Plug plug, Conf *conf)
@@ -258,10 +244,9 @@ Socket platform_new_connection(SockAddr addr, char *hostname,
 	sk_localproxy_write_oob,
 	sk_localproxy_write_eof,
 	sk_localproxy_flush,
-	sk_localproxy_set_private_ptr,
-	sk_localproxy_get_private_ptr,
 	sk_localproxy_set_frozen,
-	sk_localproxy_socket_error
+	sk_localproxy_socket_error,
+        NULL, /* peer_info */
     };
 
     Local_Proxy_Socket ret;
@@ -288,6 +273,7 @@ Socket platform_new_connection(SockAddr addr, char *hostname,
     if (pipe(to_cmd_pipe) < 0 ||
 	pipe(from_cmd_pipe) < 0) {
 	ret->error = dupprintf("pipe: %s", strerror(errno));
+        sfree(cmd);
 	return (Socket)ret;
     }
     cloexec(to_cmd_pipe[1]);