Fix more whitespaces

This commit is contained in:
Markus Moeller 2020-01-12 20:59:19 +00:00
parent 585882edd2
commit 917b68f28c
7 changed files with 127 additions and 122 deletions

View File

@ -26,3 +26,4 @@
void base64enc(char *dst, const void* src, size_t count); void base64enc(char *dst, const void* src, size_t count);
#endif #endif

View File

@ -1298,6 +1298,7 @@ connect_to_upstream_proxy(struct conn_s *connptr, struct request_s *request)
ulen = cur_upstream->ua.user ? strlen(cur_upstream->ua.user) : 0; ulen = cur_upstream->ua.user ? strlen(cur_upstream->ua.user) : 0;
passlen = cur_upstream->pass ? strlen(cur_upstream->pass) : 0; passlen = cur_upstream->pass ? strlen(cur_upstream->pass) : 0;
log_message(LOG_CONN, log_message(LOG_CONN,
"Established connection to %s proxy \"%s\" using file descriptor %d.", "Established connection to %s proxy \"%s\" using file descriptor %d.",
proxy_type_name (cur_upstream->type), cur_upstream->host, connptr->server_fd); proxy_type_name (cur_upstream->type), cur_upstream->host, connptr->server_fd);
@ -1313,10 +1314,13 @@ 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))
return -1;
if (buff[0]!=0 || buff[1]!=90) if (buff[0]!=0 || buff[1]!=90)
return -1; return -1;
} else if (cur_upstream->type == PT_SOCKS5) { } else if (cur_upstream->type == PT_SOCKS5) {
/* init */ /* init */
int n_methods = ulen ? 2 : 1; int n_methods = ulen ? 2 : 1;
buff[0] = 5; /* socks version */ buff[0] = 5; /* socks version */