diff options
author | Matt Johnston <matt@ucc.asn.au> | 2004-08-10 17:09:52 +0000 |
---|---|---|
committer | Matt Johnston <matt@ucc.asn.au> | 2004-08-10 17:09:52 +0000 |
commit | 97858f3dcef78891ed7befc02d073c3dd4d9be18 (patch) | |
tree | 87dd64b7ca8331c29936a32aab69e9f09f63dccf /svr-x11fwd.c | |
parent | c918e516be1301f40e964742d67381fc7fa6cb58 (diff) | |
download | dropbear-97858f3dcef78891ed7befc02d073c3dd4d9be18.tar.gz |
just checkpointing
Diffstat (limited to 'svr-x11fwd.c')
-rw-r--r-- | svr-x11fwd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svr-x11fwd.c b/svr-x11fwd.c index aa0ba2d..0f4f71e 100644 --- a/svr-x11fwd.c +++ b/svr-x11fwd.c @@ -37,7 +37,7 @@ #define X11BASEPORT 6000 #define X11BINDBASE 6010 -static void x11accept(struct Listener* listener); +static void x11accept(struct Listener* listener, int sock); static int bindport(int fd); static int send_msg_channel_open_x11(int fd, struct sockaddr_in* addr); @@ -82,7 +82,7 @@ int x11req(struct ChanSess * chansess) { /* listener code will handle the socket now. * No cleanup handler needed, since listener_remove only happens * from our cleanup anyway */ - chansess->x11listener = new_listener( fd, 0, chansess, x11accept, NULL); + chansess->x11listener = new_listener( &fd, 1, 0, chansess, x11accept, NULL); if (chansess->x11listener == NULL) { goto fail; } @@ -100,7 +100,7 @@ fail: /* accepts a new X11 socket */ /* returns DROPBEAR_FAILURE or DROPBEAR_SUCCESS */ -static void x11accept(struct Listener* listener) { +static void x11accept(struct Listener* listener, int sock) { int fd; struct sockaddr_in addr; @@ -110,7 +110,7 @@ static void x11accept(struct Listener* listener) { len = sizeof(addr); - fd = accept(listener->sock, (struct sockaddr*)&addr, &len); + fd = accept(sock, (struct sockaddr*)&addr, &len); if (fd < 0) { return; } |