bughz/tinyproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix more whitespaces

Browse Source
This commit is contained in:
Markus Moeller 2020-01-12 21:10:42 +00:00
parent 917b68f28c
commit 7f6dd18565
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/conf.c
View File

@ -1096,14 +1096,14 @@ static HANDLE_FUNC (handle_reversepath)
static enum proxy_type pt_from_string(const char *s) static enum proxy_type pt_from_string(const char *s)
{ {
static const char pt_map[][7] = { static const char pt_map[][7] = {
[PT_NONE] = "none", [PT_NONE] = "none",
[PT_HTTP] = "http", [PT_HTTP] = "http",
[PT_SOCKS4] = "socks4", [PT_SOCKS4] = "socks4",
[PT_SOCKS5] = "socks5", [PT_SOCKS5] = "socks5",
}; };
unsigned i; unsigned i;
for (i = 0; i < sizeof (pt_map) / sizeof (pt_map[0]); i++) for (i = 0; i < sizeof(pt_map)/sizeof(pt_map[0]); i++)
if (!strcmp (pt_map[i], s)) if (!strcmp(pt_map[i], s))
return i; return i;
return PT_NONE; return PT_NONE;
} }

40
src/reqs.c
View File

@ -1314,8 +1314,8 @@ connect_to_upstream_proxy(struct conn_s *connptr, struct request_s *request)
buff[8] = 0; /* user */ buff[8] = 0; /* user */
if (9 != safe_write(connptr->server_fd, buff, 9)) if (9 != safe_write(connptr->server_fd, buff, 9))
return -1; return -1;
if (8 != safe_read(connptr->server_fd, buff, 8)) if (8 != safe_read(connptr->server_fd, buff, 8))
return -1; return -1;
if (buff[0]!=0 || buff[1]!=90) if (buff[0]!=0 || buff[1]!=90)
return -1; return -1;
@ -1326,8 +1326,8 @@ connect_to_upstream_proxy(struct conn_s *connptr, struct request_s *request)
buff[0] = 5; /* socks version */ buff[0] = 5; /* socks version */
buff[1] = n_methods; /* number of methods */ buff[1] = n_methods; /* number of methods */
buff[2] = 0; /* no auth method */ buff[2] = 0; /* no auth method */
if (ulen) buff[3] = 2; /* auth method -> username / password */ if (ulen) buff[3] = 2; /* auth method -> username / password */
if (2 + n_methods != safe_write(connptr->server_fd, buff, 2 + n_methods)) if (2+n_methods != safe_write(connptr->server_fd, buff, 2+n_methods))
return -1; return -1;
if (2 != safe_read(connptr->server_fd, buff, 2)) if (2 != safe_read(connptr->server_fd, buff, 2))
return -1; return -1;
@ -1340,7 +1340,7 @@ connect_to_upstream_proxy(struct conn_s *connptr, struct request_s *request)
char out[515]; char out[515];
char *cur = out; char *cur = out;
size_t c; size_t c;
*cur++ = 1; /* version */ *cur++ = 1; /* version */
c = ulen & 0xFF; c = ulen & 0xFF;
*cur++ = c; *cur++ = c;
memcpy(cur, cur_upstream->ua.user, c); memcpy(cur, cur_upstream->ua.user, c);
@ -1350,12 +1350,12 @@ connect_to_upstream_proxy(struct conn_s *connptr, struct request_s *request)
memcpy(cur, cur_upstream->pass, c); memcpy(cur, cur_upstream->pass, c);
cur += c; cur += c;
if ((cur - out) != safe_write(connptr->server_fd, out, cur - out)) if((cur - out) != safe_write(connptr->server_fd, out, cur - out))
return -1; return -1;
if (2 != safe_read(connptr->server_fd, in, 2)) if(2 != safe_read(connptr->server_fd, in, 2))
return -1; return -1;
if (in[1] != 0 || !(in[0] == 5 || in[0] == 1)) { if(in[1] != 0 || !(in[0] == 5 || in[0] == 1)) {
return -1; return -1;
} }
} }
@ -1364,22 +1364,22 @@ connect_to_upstream_proxy(struct conn_s *connptr, struct request_s *request)
buff[1] = 1; /* connect */ buff[1] = 1; /* connect */
buff[2] = 0; /* reserved */ buff[2] = 0; /* reserved */
buff[3] = 3; /* domainname */ buff[3] = 3; /* domainname */
len = strlen (request->host); len=strlen (request->host);
if (len > 255) if (len>255)
return -1; return -1;
buff[4] = len; /* length of domainname */ buff[4] = len; /* length of domainname */
memcpy(&buff[5], request->host, len); /* dest ip */ memcpy(&buff[5], request->host, len); /* dest ip */
port = htons (request->port); port = htons(request->port);
memcpy(&buff[5 + len], &port, 2); /* dest port */ memcpy(&buff[5+len], &port, 2); /* dest port */
if (7 + len != safe_write(connptr->server_fd, buff, 7 + len)) if (7+len != safe_write(connptr->server_fd, buff, 7+len))
return -1; return -1;
if (4 != safe_read(connptr->server_fd, buff, 4)) if (4 != safe_read(connptr->server_fd, buff, 4))
return -1; return -1;
if (buff[0] != 5 || buff[1] != 0) if (buff[0]!=5 || buff[1]!=0)
return -1; return -1;
switch (buff[3]) { switch(buff[3]) {
case 1: len = 4; break; /* ip v4 */ case 1: len=4; break; /* ip v4 */
case 4: len = 16; break; /* ip v6 */ case 4: len=16; break; /* ip v6 */
case 3: /* domainname */ case 3: /* domainname */
if (1 != safe_read(connptr->server_fd, buff, 1)) if (1 != safe_read(connptr->server_fd, buff, 1))
return -1; return -1;
@ -1387,7 +1387,7 @@ connect_to_upstream_proxy(struct conn_s *connptr, struct request_s *request)
break; break;
default: return -1; default: return -1;
} }
if (2 + len != safe_read(connptr->server_fd, buff, 2 + len)) if (2+len != safe_read(connptr->server_fd, buff, 2+len))
return -1; return -1;
} else { } else {
return -1; return -1;
@ -1396,7 +1396,7 @@ connect_to_upstream_proxy(struct conn_s *connptr, struct request_s *request)
if (connptr->connect_method) if (connptr->connect_method)
return 0; return 0;
return establish_http_connection (connptr, request); return establish_http_connection(connptr, request);
} }
@ -1473,7 +1473,7 @@ connect_to_upstream (struct conn_s *connptr, struct request_s *request)
} }
if (cur_upstream->type != PT_HTTP) if (cur_upstream->type != PT_HTTP)
return connect_to_upstream_proxy (connptr, request); return connect_to_upstream_proxy(connptr, request);
log_message (LOG_CONN, log_message (LOG_CONN,
"Established connection to upstream proxy \"%s\" " "Established connection to upstream proxy \"%s\" "