nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-06-30 19:12:48 -05:00
Code Issues Projects Releases Wiki Activity

More preparatory work: remove the <windows.h> include from lots of

Browse Source 
source files in which it's no longer required (it was previously
required in anything that included <putty.h>, but not any more).
Also moved a couple of stray bits of exposed WinSock back into
winnet.c (getservbyname from ssh.c and AF_INET from proxy.c).

[originally from svn r2160]
This commit is contained in:
Simon Tatham
2002-10-30 17:57:31 +00:00
parent 78c69239f1
commit 52bdffbfe0
14 changed files with 51 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
proxy.c
View File

@ -5,8 +5,6 @@
* code and the higher level backend.
*/
#include <windows.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) {
char * data;
void *data;
int len;
bufchain_prefix(&ps->pending_input_data, &data, &len);
plug_receive(ps->plug, 0, data, len);
@ -641,7 +639,7 @@ int proxy_socks4_negotiate (Proxy_Socket p, int change)
int length;
char * command;
if (sk_addrtype(p->remote_addr) != AF_INET) {
if (sk_addrtype(p->remote_addr) != ADDRTYPE_IPV4) {
plug_closing(p->plug, "Proxy error: SOCKS version 4 does"
" not support IPv6", PROXY_ERROR_GENERAL, 0);
return 1;
@ -931,7 +929,7 @@ int proxy_socks5_negotiate (Proxy_Socket p, int change)
char command[22];
int len;
if (sk_addrtype(p->remote_addr) == AF_INET) {
if (sk_addrtype(p->remote_addr) == ADDRTYPE_IPV6) {
len = 10;
command[3] = 1; /* IPv4 */
} else {