projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
do_ssh2_authconn() now installs the standard handlers for CHANNEL_SUCCESS
[u/mdw/putty]
/
unix
/
uxproxy.c
diff --git
a/unix/uxproxy.c
b/unix/uxproxy.c
index
1191a61
..
def8a40
100644
(file)
--- a/
unix/uxproxy.c
+++ b/
unix/uxproxy.c
@@
-29,6
+29,7
@@
struct Socket_localproxy_tag {
bufchain pending_output_data;
bufchain pending_input_data;
bufchain pending_output_data;
bufchain pending_input_data;
+ enum { EOF_NO, EOF_PENDING, EOF_SENT } outgoingeof;
void *privptr;
};
void *privptr;
};
@@
-95,10
+96,14
@@
static void sk_localproxy_close (Socket s)
{
Local_Proxy_Socket ps = (Local_Proxy_Socket) s;
{
Local_Proxy_Socket ps = (Local_Proxy_Socket) s;
- del234(localproxy_by_fromfd, ps);
- del234(localproxy_by_tofd, ps);
+ if (ps->to_cmd >= 0) {
+ del234(localproxy_by_tofd, ps);
+ uxsel_del(ps->to_cmd);
+ close(ps->to_cmd);
+ }
- close(ps->to_cmd);
+ del234(localproxy_by_fromfd, ps);
+ uxsel_del(ps->from_cmd);
close(ps->from_cmd);
sfree(ps);
close(ps->from_cmd);
sfree(ps);
@@
-127,6
+132,14
@@
static int localproxy_try_send(Local_Proxy_Socket ps)
}
}
}
}
+ if (ps->outgoingeof == EOF_PENDING) {
+ del234(localproxy_by_tofd, ps);
+ close(ps->to_cmd);
+ uxsel_del(ps->to_cmd);
+ ps->to_cmd = -1;
+ ps->outgoingeof = EOF_SENT;
+ }
+
if (bufchain_size(&ps->pending_output_data) == 0)
uxsel_del(ps->to_cmd);
else
if (bufchain_size(&ps->pending_output_data) == 0)
uxsel_del(ps->to_cmd);
else
@@
-139,6
+152,8
@@
static int sk_localproxy_write (Socket s, const char *data, int len)
{
Local_Proxy_Socket ps = (Local_Proxy_Socket) s;
{
Local_Proxy_Socket ps = (Local_Proxy_Socket) s;
+ assert(ps->outgoingeof == EOF_NO);
+
bufchain_add(&ps->pending_output_data, data, len);
localproxy_try_send(ps);
bufchain_add(&ps->pending_output_data, data, len);
localproxy_try_send(ps);
@@
-155,6
+170,16
@@
static int sk_localproxy_write_oob (Socket s, const char *data, int len)
return sk_localproxy_write(s, data, len);
}
return sk_localproxy_write(s, data, len);
}
+static void sk_localproxy_write_eof (Socket s)
+{
+ Local_Proxy_Socket ps = (Local_Proxy_Socket) s;
+
+ assert(ps->outgoingeof == EOF_NO);
+ ps->outgoingeof = EOF_PENDING;
+
+ localproxy_try_send(ps);
+}
+
static void sk_localproxy_flush (Socket s)
{
/* Local_Proxy_Socket ps = (Local_Proxy_Socket) s; */
static void sk_localproxy_flush (Socket s)
{
/* Local_Proxy_Socket ps = (Local_Proxy_Socket) s; */
@@
-207,7
+232,7
@@
static int localproxy_select_result(int fd, int event)
} else if (ret == 0) {
return plug_closing(s->plug, NULL, 0, 0);
} else {
} else if (ret == 0) {
return plug_closing(s->plug, NULL, 0, 0);
} else {
- return plug_receive(s->plug,
1
, buf, ret);
+ return plug_receive(s->plug,
0
, buf, ret);
}
} else if (event == 2) {
assert(fd == s->to_cmd);
}
} else if (event == 2) {
assert(fd == s->to_cmd);
@@
-222,7
+247,7
@@
static int localproxy_select_result(int fd, int event)
Socket platform_new_connection(SockAddr addr, char *hostname,
int port, int privport,
int oobinline, int nodelay, int keepalive,
Socket platform_new_connection(SockAddr addr, char *hostname,
int port, int privport,
int oobinline, int nodelay, int keepalive,
- Plug plug,
const Config *cfg
)
+ Plug plug,
Conf *conf
)
{
char *cmd;
{
char *cmd;
@@
-231,6
+256,7
@@
Socket platform_new_connection(SockAddr addr, char *hostname,
sk_localproxy_close,
sk_localproxy_write,
sk_localproxy_write_oob,
sk_localproxy_close,
sk_localproxy_write,
sk_localproxy_write_oob,
+ sk_localproxy_write_eof,
sk_localproxy_flush,
sk_localproxy_set_private_ptr,
sk_localproxy_get_private_ptr,
sk_localproxy_flush,
sk_localproxy_set_private_ptr,
sk_localproxy_get_private_ptr,
@@
-241,15
+267,16
@@
Socket platform_new_connection(SockAddr addr, char *hostname,
Local_Proxy_Socket ret;
int to_cmd_pipe[2], from_cmd_pipe[2], pid;
Local_Proxy_Socket ret;
int to_cmd_pipe[2], from_cmd_pipe[2], pid;
- if (c
fg->proxy_type
!= PROXY_CMD)
+ if (c
onf_get_int(conf, CONF_proxy_type)
!= PROXY_CMD)
return NULL;
return NULL;
- cmd = format_telnet_command(addr, port, c
fg
);
+ cmd = format_telnet_command(addr, port, c
onf
);
ret = snew(struct Socket_localproxy_tag);
ret->fn = &socket_fn_table;
ret->plug = plug;
ret->error = NULL;
ret = snew(struct Socket_localproxy_tag);
ret->fn = &socket_fn_table;
ret->plug = plug;
ret->error = NULL;
+ ret->outgoingeof = EOF_NO;
bufchain_init(&ret->pending_input_data);
bufchain_init(&ret->pending_output_data);
bufchain_init(&ret->pending_input_data);
bufchain_init(&ret->pending_output_data);
@@
-263,6
+290,8
@@
Socket platform_new_connection(SockAddr addr, char *hostname,
ret->error = dupprintf("pipe: %s", strerror(errno));
return (Socket)ret;
}
ret->error = dupprintf("pipe: %s", strerror(errno));
return (Socket)ret;
}
+ cloexec(to_cmd_pipe[1]);
+ cloexec(from_cmd_pipe[0]);
pid = fork();
pid = fork();
@@
-270,19
+299,20
@@
Socket platform_new_connection(SockAddr addr, char *hostname,
ret->error = dupprintf("fork: %s", strerror(errno));
return (Socket)ret;
} else if (pid == 0) {
ret->error = dupprintf("fork: %s", strerror(errno));
return (Socket)ret;
} else if (pid == 0) {
- int i;
close(0);
close(1);
dup2(to_cmd_pipe[0], 0);
dup2(from_cmd_pipe[1], 1);
close(0);
close(1);
dup2(to_cmd_pipe[0], 0);
dup2(from_cmd_pipe[1], 1);
- for (i = 3; i < 127; i++)
-
close(i
);
+ close(to_cmd_pipe[0]);
+
close(from_cmd_pipe[1]
);
fcntl(0, F_SETFD, 0);
fcntl(1, F_SETFD, 0);
fcntl(0, F_SETFD, 0);
fcntl(1, F_SETFD, 0);
- execl("/bin/sh", "sh", "-c", cmd, NULL);
+ execl("/bin/sh", "sh", "-c", cmd,
(void *)
NULL);
_exit(255);
}
_exit(255);
}
+ sfree(cmd);
+
close(to_cmd_pipe[0]);
close(from_cmd_pipe[1]);
close(to_cmd_pipe[0]);
close(from_cmd_pipe[1]);