validation_failed = 0;
client_fd = fdopen(client_socket, "a+");
- if (NULL == client_fd) {
+ if (client_fd == NULL) {
LOG_PERROR(LOG_WARNING, "fdopen(): client failed");
goto out;
}
/* Read request line (CONNECT ..) and headers (they are discarded). */
result = read_http_request(client_fd, buffer, sizeof(buffer));
- if (-1 == result) {
+ if (result == -1) {
/* Read error. */
LOG(LOG_WARNING, "read_http_request(): client read error");
goto out;
- } else if (-2 == result) {
+ } else if (result == -2) {
/* EOF */
LOG(LOG_WARNING, "read_http_request(): client EOF");
send_bad_request(client_fd);
goto out;
}
- if (0 != parse_request(buffer, host, port, &version_minor)) {
+ if (parse_request(buffer, host, port, &version_minor) != 0) {
LOG(LOG_WARNING, "bad request: %s", buffer);
send_bad_request(client_fd);
goto out;
LOG(LOG_DEBUG, "target: %s:%s (HTTP 1.%d)", host, port, version_minor);
/* Connect to proxy server or directly to server. */
- if (NULL != global_proxy_host && NULL != global_proxy_port) {
+ if (global_proxy_host != NULL && global_proxy_port != NULL) {
LOG(LOG_DEBUG, "connecting to %s:%s", global_proxy_host,
global_proxy_port);
server_socket = connect_to_host(global_proxy_host, global_proxy_port);
server_socket = connect_to_host(host, port);
}
- if (-1 == server_socket) {
+ if (server_socket == -1) {
LOG(LOG_WARNING, "failed to connect to server");
send_forwarding_failure(client_fd);
goto out;
}
server_fd = fdopen(server_socket, "a+");
- if (NULL == server_fd) {
+ if (server_fd == NULL) {
LOG_PERROR(LOG_WARNING, "fdopen(): server failed");
send_forwarding_failure(client_fd);
goto out;
}
/* Connect to proxy if requested (command line option). */
- if (NULL != global_proxy_host && NULL != global_proxy_port) {
+ if (global_proxy_host != NULL && global_proxy_port != NULL) {
fprintf(server_fd, "CONNECT %s:%s HTTP/1.0\r\n", host, port);
fprintf(server_fd, "\r\n");
/* Read response line from proxy server. */
result = read_http_request(server_fd, buffer, sizeof(buffer));
- if (-1 == result) {
+ if (result == -1) {
/* Read error. */
LOG(LOG_WARNING, "read_http_request(): proxy read error");
send_forwarding_failure(client_fd);
goto out;
- } else if (-2 == result) {
+ } else if (result == -2) {
/* EOF */
LOG(LOG_WARNING, "read_http_request(): proxy EOF");
send_forwarding_failure(client_fd);
}
/* Check response of proxy server. */
- if (0 != strncmp(buffer, "HTTP/1.0 200", 12)) {
+ if (strncmp(buffer, "HTTP/1.0 200", 12) != 0) {
LOG(LOG_WARNING, "bad proxy response: %s", buffer);
send_forwarding_failure(client_fd);
goto out;
char path[TLSPROXY_MAX_PATH_LENGTH];
FILE *file = NULL;
- if (-2 == server_certificate_file(&file, host, path, sizeof(path))) {
+ if (server_certificate_file(&file, host, path, sizeof(path)) == -2) {
/* We've established a connection, tell the client. */
fprintf(client_fd, "HTTP/1.0 200 Connection established\r\n");
fprintf(client_fd, "\r\n");
goto out;
}
/* server_certificate_file() may have opened the file, close it. */
- if (NULL != file) {
+ if (file != NULL) {
fclose(file);
}
}
/* Initialize TLS client credentials to talk to the server. */
result = initialize_tls_session_server(server_socket, &server_session,
&server_x509_cred);
- if (0 != result) {
+ if (result != 0) {
LOG(LOG_WARNING, "initialize_tls_session_server() failed");
send_forwarding_failure(client_fd);
goto out;
/* Try to establish TLS handshake between us and server. */
result = gnutls_handshake(server_session);
- if (GNUTLS_E_SUCCESS != result) {
+ if (result != GNUTLS_E_SUCCESS) {
LOG(LOG_WARNING, "server TLS handshake failed: %s",
gnutls_strerror(result));
send_forwarding_failure(client_fd);
LOG(LOG_DEBUG, "server TLS handshake finished");
/* Make sure the server certificate is valid and known. */
- if (0 != verify_tls_connection(server_session, host)) {
+ if (verify_tls_connection(server_session, host) != 0) {
LOG(LOG_ERROR, "server certificate validation failed!");
/* We send the error message over our TLS connection to the client,
* but with an invalid certificate. No data is transfered from/to the
: host,
&client_session,
&client_x509_cred);
- if (0 != result) {
+ if (result != 0) {
LOG(LOG_WARNING, "initialize_tls_session_client() failed");
send_forwarding_failure(client_fd);
goto out;
/* Try to establish TLS handshake between client and us. */
result = gnutls_handshake(client_session);
- if (GNUTLS_E_SUCCESS != result) {
+ if (result != GNUTLS_E_SUCCESS) {
LOG(LOG_WARNING, "client TLS handshake failed: %s",
gnutls_strerror(result));
send_forwarding_failure(client_fd);
out:
/* Close TLS sessions if necessary. Use GNUTLS_SHUT_RDWR so the data is
* reliable transmitted. */
- if (0 != server_session_started) {
+ if (server_session_started != 0) {
gnutls_bye(server_session, GNUTLS_SHUT_RDWR);
}
- if (0 != client_session_started) {
+ if (client_session_started != 0) {
gnutls_bye(client_session, GNUTLS_SHUT_RDWR);
}
- if (0 != server_session_init) {
+ if (server_session_init != 0) {
gnutls_deinit(server_session);
gnutls_certificate_free_credentials(server_x509_cred);
}
- if (0 != client_session_init) {
+ if (client_session_init != 0) {
gnutls_deinit(client_session);
gnutls_certificate_free_cas(client_x509_cred);
gnutls_certificate_free_keys(client_x509_cred);
}
/* Close connection to server/proxy. */
- if (NULL != server_fd) {
+ if (server_fd != NULL) {
fclose(server_fd);
- } else if (-1 != server_socket) {
+ } else if (server_socket != -1) {
close(server_socket);
}
LOG(LOG_DEBUG, "connection to server closed");
/* Close connection to client. */
- if (NULL != client_fd) {
+ if (client_fd != NULL) {
fclose(client_fd);
} else {
close(client_socket);
/* The "invalid" hostname is special. If it's used we send an invalid
* certificate to let the client know something is wrong. */
- use_invalid_cert = (0 == strcmp(hostname, "invalid"));
+ use_invalid_cert = (strcmp(hostname, "invalid") == 0);
- if (0 != proxy_certificate_path(hostname, path, sizeof(path))) {
+ if (proxy_certificate_path(hostname, path, sizeof(path)) != 0) {
LOG(LOG_ERROR,
"initialize_tls_session_client(): \
failed to get proxy certificate path");
}
result = gnutls_certificate_allocate_credentials(x509_cred);
- if (GNUTLS_E_SUCCESS != result) {
+ if (result != GNUTLS_E_SUCCESS) {
LOG(LOG_ERROR,
"initialize_tls_session_client(): \
gnutls_certificate_allocate_credentials(): %s",
result = gnutls_certificate_set_x509_trust_file(*x509_cred,
PROXY_CA_FILE,
GNUTLS_X509_FMT_PEM);
- if (0 >= result) {
+ if (result <= 0) {
LOG(LOG_ERROR,
"initialize_tls_session_client(): can't read CA file: '%s'",
PROXY_CA_FILE);
PROXY_KEY_FILE,
GNUTLS_X509_FMT_PEM);
}
- if (GNUTLS_E_SUCCESS != result) {
+ if (result != GNUTLS_E_SUCCESS) {
LOG(LOG_ERROR,
"initialize_tls_session_client(): \
can't read server certificate ('%s') or key file ('%s'): %s",
gnutls_certificate_set_dh_params(*x509_cred, global_tls_dh_params);
result = gnutls_init(session, GNUTLS_SERVER);
- if (GNUTLS_E_SUCCESS != result) {
+ if (result != GNUTLS_E_SUCCESS) {
LOG(LOG_ERROR,
"initialize_tls_session_client(): gnutls_init(): %s",
gnutls_strerror(result));
return -1;
}
result = gnutls_priority_set(*session, global_tls_priority_cache);
- if (GNUTLS_E_SUCCESS != result) {
+ if (result != GNUTLS_E_SUCCESS) {
LOG(LOG_ERROR,
"initialize_tls_session_client(): gnutls_priority_set(): %s",
gnutls_strerror(result));
}
result = gnutls_credentials_set(*session,
GNUTLS_CRD_CERTIFICATE, *x509_cred);
- if (GNUTLS_E_SUCCESS != result) {
+ if (result != GNUTLS_E_SUCCESS) {
LOG(LOG_ERROR,
"initialize_tls_session_client(): gnutls_credentials_set(): %s",
gnutls_strerror(result));
int result;
result = gnutls_certificate_allocate_credentials(x509_cred);
- if (GNUTLS_E_SUCCESS != result) {
+ if (result != GNUTLS_E_SUCCESS) {
LOG(LOG_ERROR,
"initialize_tls_session_server(): \
gnutls_certificate_allocate_credentials(): %s",
}
result = gnutls_init(session, GNUTLS_CLIENT);
- if (GNUTLS_E_SUCCESS != result) {
+ if (result != GNUTLS_E_SUCCESS) {
LOG(LOG_ERROR,
"initialize_tls_session_server(): gnutls_init(): %s",
gnutls_strerror(result));
return -1;
}
result = gnutls_priority_set(*session, global_tls_priority_cache);
- if (GNUTLS_E_SUCCESS != result) {
+ if (result != GNUTLS_E_SUCCESS) {
LOG(LOG_ERROR,
"initialize_tls_session_server(): gnutls_priority_set(): %s",
gnutls_strerror(result));
}
result = gnutls_credentials_set(*session,
GNUTLS_CRD_CERTIFICATE, *x509_cred);
- if (GNUTLS_E_SUCCESS != result) {
+ if (result != GNUTLS_E_SUCCESS) {
LOG(LOG_ERROR,
"initialize_tls_session_server(): gnutls_credentials_set(): %s",
gnutls_strerror(result));
static int read_http_request(FILE *client_fd, char *request, size_t length) {
char buffer[MAX_REQUEST_LINE];
- if (NULL == fgets(request, (int)length, client_fd)) {
+ if (fgets(request, (int)length, client_fd) == NULL) {
if (ferror(client_fd)) {
LOG_PERROR(LOG_WARNING, "read_http_request(): fgets()");
return -1;
return -2;
}
- while (NULL != fgets(buffer, sizeof(buffer), client_fd)) {
+ while (fgets(buffer, sizeof(buffer), client_fd) != NULL) {
/* End of header. */
- if (0 == strcmp(buffer, "\n") || 0 == strcmp(buffer, "\r\n")) {
+ if (strcmp(buffer, "\n") == 0 || strcmp(buffer, "\r\n") == 0) {
break;
}
}
/* Data available from client. */
if (fds[0].revents & POLLIN || fds[0].revents & POLLPRI) {
- if (0 != read_from_write_to(client, server)) {
+ if (read_from_write_to(client, server) != 0) {
/* EOF (or other error) */
break;
}
}
/* Data available from server. */
if (fds[1].revents & POLLIN || fds[1].revents & POLLPRI) {
- if (0 != read_from_write_to(server, client)) {
+ if (read_from_write_to(server, client) != 0) {
/* EOF (or other error) */
break;
}
LOG(LOG_DEBUG, "read_from_write_to(): %d -> %d", from, to);
size_read = read(from, buffer, sizeof(buffer));
- if (0 > size_read) {
+ if (size_read < 0) {
LOG_PERROR(LOG_WARNING, "read_from_write_to(): read()");
return -1;
}
/* EOF */
- if (0 == size_read) {
+ if (size_read == 0) {
return -1;
}
size_written = write(to, buffer, (size_t)size_read);
- if (0 > size_written) {
+ if (size_written < 0) {
LOG_PERROR(LOG_WARNING, "read_from_write_to(): write()");
return -1;
}
/* Get maximum possible buffer size. */
buffer_size = gnutls_record_get_max_size(client_session);
- if (buffer_size > gnutls_record_get_max_size(server_session)) {
+ if (gnutls_record_get_max_size(server_session) < buffer_size) {
buffer_size = gnutls_record_get_max_size(server_session);
}
LOG(LOG_DEBUG, "transfer_data_tls(): suggested buffer size: %ld",
/* Data available from client. */
if (fds[0].revents & POLLIN || fds[0].revents & POLLPRI) {
- if (0 != read_from_write_to_tls(client_session, server_session,
- buffer_size)) {
+ if (read_from_write_to_tls(client_session, server_session,
+ buffer_size) != 0) {
/* EOF (or other error) */
break;
}
}
/* Data available from server. */
if (fds[1].revents & POLLIN || fds[1].revents & POLLPRI) {
- if (0 != read_from_write_to_tls(server_session, client_session,
- buffer_size)) {
+ if (read_from_write_to_tls(server_session, client_session,
+ buffer_size) != 0) {
/* EOF (or other error) */
break;
}
(long int)buffer_size);
size_read = gnutls_record_recv(from, buffer, buffer_size);
- if (0 > size_read) {
+ if (size_read < 0) {
LOG(LOG_WARNING, "read_from_write_to_tls(): gnutls_record_recv(): %s",
gnutls_strerror((int)size_read));
return -1;
}
/* EOF */
- if (0 == size_read) {
+ if (size_read == 0) {
return -1;
}
size_written = gnutls_record_send(to, buffer, (size_t)size_read);
- if (0 > size_written) {
+ if (size_written < 0) {
LOG(LOG_WARNING, "read_from_write_to_tls(): gnutls_record_send(): %s",
gnutls_strerror((int)size_written));
return -1;
int server_socket;
struct addrinfo *server;
- if (NULL == hostname || NULL == port) {
+ if (hostname == NULL || port == NULL) {
return -1;
}
| AI_ADDRCONFIG /* supported by this computer */
| AI_V4MAPPED; /* support IPv4 through IPv6 */
gai_return = getaddrinfo(hostname, port, &gai_hints, &gai_result);
- if (0 != gai_return) {
+ if (gai_return != 0) {
LOG_PERROR(LOG_WARNING, "connect_to_host(): getaddrinfo()");
return -1;
}
/* Now try to connect to each server returned by getaddrinfo(), use the
* first successful connect. */
- for (server = gai_result; NULL != server; server = server->ai_next) {
+ for (server = gai_result; server != NULL; server = server->ai_next) {
server_socket = socket(server->ai_family,
server->ai_socktype,
server->ai_protocol);
- if (-1 == server_socket) {
+ if (server_socket == -1) {
LOG_PERROR(LOG_DEBUG, "connect_to_host(): socket(), trying next");
continue;
}
- if (-1 != connect(server_socket, server->ai_addr,
- server->ai_addrlen)) {
+ if (connect(server_socket, server->ai_addr, server->ai_addrlen) != -1) {
break;
}
LOG_PERROR(LOG_DEBUG, "connect_to_host(): connect(), trying next");
/* Make sure we free the result from getaddrinfo(). */
freeaddrinfo(gai_result);
- if (NULL == server) {
+ if (server == NULL) {
LOG_PERROR(LOG_WARNING, "connect_to_host(): no server found, abort");
return -1;
}
char *position;
/* scanf() doesn't check spaces. */
- if (0 != strncmp(request, "CONNECT ", 8)) {
+ if (strncmp(request, "CONNECT ", 8) != 0) {
return -1;
}
/* Check request and extract data, "host:port" is not yet separated. */
- if (2 != sscanf(request, "CONNECT %s HTTP/1.%d",
- host, version_minor)) {
+ if (sscanf(request, "CONNECT %s HTTP/1.%d", host, version_minor) != 2) {
return -1;
}
/* Make sure ":port" is there. */
- if (NULL == (position = strchr(host, ':'))) {
+ if ((position = strchr(host, ':')) == NULL) {
return -1;
}
/* Make sure port is numeric. */
- if (1 != sscanf(position + 1, "%d", &port_unused)) {
+ if (sscanf(position + 1, "%d", &port_unused) != 1) {
return -1;
}
/* Store it in *port. */
ruderich.org/simon / tlsproxy / tlsproxy.git / blobdiff