projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a configuration option for TCP keepalives (SO_KEEPALIVE), default off.
[u/mdw/putty]
/
portfwd.c
diff --git
a/portfwd.c
b/portfwd.c
index
f740267
..
b95e5ac
100644
(file)
--- a/
portfwd.c
+++ b/
portfwd.c
@@
-255,7
+255,7
@@
static int pfd_receive(Plug plug, int urgent, char *data, int len)
if (pr->hostname[1] != 1 || pr->hostname[2] != 0) {
/* Not CONNECT or reserved field nonzero - error */
reply[1] = 1; /* generic failure */
if (pr->hostname[1] != 1 || pr->hostname[2] != 0) {
/* Not CONNECT or reserved field nonzero - error */
reply[1] = 1; /* generic failure */
- sk_write(pr->s, reply, lenof(reply));
+ sk_write(pr->s,
(char *)
reply, lenof(reply));
pfd_close(pr->s);
return 1;
}
pfd_close(pr->s);
return 1;
}
@@
-266,7
+266,7
@@
static int pfd_receive(Plug plug, int urgent, char *data, int len)
pr->port = GET_16BIT_MSB_FIRST(pr->hostname+4+alen);
if (atype == 1) {
/* REP=0 (success) already */
pr->port = GET_16BIT_MSB_FIRST(pr->hostname+4+alen);
if (atype == 1) {
/* REP=0 (success) already */
- sk_write(pr->s, reply, lenof(reply));
+ sk_write(pr->s,
(char *)
reply, lenof(reply));
sprintf(pr->hostname, "%d.%d.%d.%d",
(unsigned char)pr->hostname[4],
(unsigned char)pr->hostname[5],
sprintf(pr->hostname, "%d.%d.%d.%d",
(unsigned char)pr->hostname[4],
(unsigned char)pr->hostname[5],
@@
-275,7
+275,7
@@
static int pfd_receive(Plug plug, int urgent, char *data, int len)
goto connect;
} else if (atype == 3) {
/* REP=0 (success) already */
goto connect;
} else if (atype == 3) {
/* REP=0 (success) already */
- sk_write(pr->s, reply, lenof(reply));
+ sk_write(pr->s,
(char *)
reply, lenof(reply));
memmove(pr->hostname, pr->hostname + 5, alen-1);
pr->hostname[alen-1] = '\0';
goto connect;
memmove(pr->hostname, pr->hostname + 5, alen-1);
pr->hostname[alen-1] = '\0';
goto connect;
@@
-284,13
+284,13
@@
static int pfd_receive(Plug plug, int urgent, char *data, int len)
* Unknown address type. (FIXME: support IPv6!)
*/
reply[1] = 8; /* atype not supported */
* Unknown address type. (FIXME: support IPv6!)
*/
reply[1] = 8; /* atype not supported */
- sk_write(pr->s, reply, lenof(reply));
+ sk_write(pr->s,
(char *)
reply, lenof(reply));
pfd_close(pr->s);
pfd_close(pr->s);
- return 1;
+ return 1;
}
}
}
}
}
}
-
+
/*
* If we get here without either having done `continue'
* or `goto connect', it must be because there is no
/*
* If we get here without either having done `continue'
* or `goto connect', it must be because there is no
@@
-390,7
+390,7
@@
const char *pfd_newconnect(Socket *s, char *hostname, int port,
pr->dynamic = 0;
pr->s = *s = new_connection(addr, dummy_realhost, port,
pr->dynamic = 0;
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;
if ((err = sk_socket_error(*s)) != NULL) {
sfree(pr);
return err;