projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing trivial warnings spotted by Mingw-2.0.0/gcc-3.2:
[u/mdw/putty]
/
proxy.c
diff --git
a/proxy.c
b/proxy.c
index
a896080
..
475dc4a
100644
(file)
--- a/
proxy.c
+++ b/
proxy.c
@@
-5,8
+5,6
@@
* code and the higher level backend.
*/
* code and the higher level backend.
*/
-#include <windows.h>
-
#include <assert.h>
#include <ctype.h>
#include <string.h>
#include <assert.h>
#include <ctype.h>
#include <string.h>
@@
-155,7
+153,7
@@
static void sk_proxy_set_frozen (Socket s, int is_frozen)
* so we have to check each time.
*/
while (!ps->freeze && bufchain_size(&ps->pending_input_data) > 0) {
* so we have to check each time.
*/
while (!ps->freeze && bufchain_size(&ps->pending_input_data) > 0) {
-
char *
data;
+
void *
data;
int len;
bufchain_prefix(&ps->pending_input_data, &data, &len);
plug_receive(ps->plug, 0, data, len);
int len;
bufchain_prefix(&ps->pending_input_data, &data, &len);
plug_receive(ps->plug, 0, data, len);
@@
-461,13
+459,14
@@
int proxy_http_negotiate (Proxy_Socket p, int change)
* for this proxy method, it's just a simple HTTP
* request
*/
* for this proxy method, it's just a simple HTTP
* request
*/
- char
buf[256]
, dest[64];
+ char
*buf
, dest[64];
sk_getaddr(p->remote_addr, dest, 64);
sk_getaddr(p->remote_addr, dest, 64);
-
sprintf(buf,
"CONNECT %s:%i HTTP/1.1\r\nHost: %s:%i\r\n",
- dest, p->remote_port, dest, p->remote_port);
+
buf = dupprintf(
"CONNECT %s:%i HTTP/1.1\r\nHost: %s:%i\r\n",
+
dest, p->remote_port, dest, p->remote_port);
sk_write(p->sub_socket, buf, strlen(buf));
sk_write(p->sub_socket, buf, strlen(buf));
+ sfree(buf);
if (cfg.proxy_username[0] || cfg.proxy_password[0]) {
char buf[sizeof(cfg.proxy_username)+sizeof(cfg.proxy_password)];
if (cfg.proxy_username[0] || cfg.proxy_password[0]) {
char buf[sizeof(cfg.proxy_username)+sizeof(cfg.proxy_password)];
@@
-482,8
+481,7
@@
int proxy_http_negotiate (Proxy_Socket p, int change)
sk_write(p->sub_socket, buf2, strlen(buf2));
}
sk_write(p->sub_socket, buf2, strlen(buf2));
}
- sprintf(buf, "\r\n");
- sk_write(p->sub_socket, buf, strlen(buf));
+ sk_write(p->sub_socket, "\r\n", 2);
p->state = 1;
return 0;
p->state = 1;
return 0;
@@
-558,14
+556,14
@@
int proxy_http_negotiate (Proxy_Socket p, int change)
bufchain_consume(&p->pending_input_data, eol);
if (data[status] != '2') {
/* error */
bufchain_consume(&p->pending_input_data, eol);
if (data[status] != '2') {
/* error */
- char
buf[1024]
;
+ char
*buf
;
data[eol] = '\0';
while (eol > status &&
(data[eol-1] == '\r' || data[eol-1] == '\n'))
data[--eol] = '\0';
data[eol] = '\0';
while (eol > status &&
(data[eol-1] == '\r' || data[eol-1] == '\n'))
data[--eol] = '\0';
- sprintf(buf, "Proxy error: %.900s",
- data+status);
+ buf = dupprintf("Proxy error: %s", data+status);
plug_closing(p->plug, buf, PROXY_ERROR_GENERAL, 0);
plug_closing(p->plug, buf, PROXY_ERROR_GENERAL, 0);
+ sfree(buf);
sfree(data);
return 1;
}
sfree(data);
return 1;
}
@@
-596,6
+594,7
@@
int proxy_http_negotiate (Proxy_Socket p, int change)
{
bufchain_consume(&p->pending_input_data, eol);
datap += eol;
{
bufchain_consume(&p->pending_input_data, eol);
datap += eol;
+ len -= eol;
eol = get_line_end(datap, len);
}
eol = get_line_end(datap, len);
}
@@
-641,7
+640,7
@@
int proxy_socks4_negotiate (Proxy_Socket p, int change)
int length;
char * command;
int length;
char * command;
- if (sk_addrtype(p->remote_addr) != A
F_INET
) {
+ if (sk_addrtype(p->remote_addr) != A
DDRTYPE_IPV4
) {
plug_closing(p->plug, "Proxy error: SOCKS version 4 does"
" not support IPv6", PROXY_ERROR_GENERAL, 0);
return 1;
plug_closing(p->plug, "Proxy error: SOCKS version 4 does"
" not support IPv6", PROXY_ERROR_GENERAL, 0);
return 1;
@@
-931,7
+930,7
@@
int proxy_socks5_negotiate (Proxy_Socket p, int change)
char command[22];
int len;
char command[22];
int len;
- if (sk_addrtype(p->remote_addr) == A
F_INET
) {
+ if (sk_addrtype(p->remote_addr) == A
DDRTYPE_IPV4
) {
len = 10;
command[3] = 1; /* IPv4 */
} else {
len = 10;
command[3] = 1; /* IPv4 */
} else {