Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
commit 9904483d23a651550ca71714c88fdb0f274daac2 2 parents 1b34e25 + 95e84dd
@bpineau authored
Showing with 7 additions and 7 deletions.
  1. +7 −7 stud.c
View
14 stud.c
@@ -193,7 +193,7 @@ static int init_dh(SSL_CTX *ctx, const char *cert) {
dh = PEM_read_bio_DHparams(bio, NULL, NULL, NULL);
BIO_free(bio);
if (!dh) {
- LOG("{core} Note: no DH parameters found in %s\n", cert);
+ ERR("{core} Note: no DH parameters found in %s\n", cert);
return -1;
}
@@ -586,14 +586,14 @@ static void client_handshake(struct ev_loop *loop, ev_io *w, int revents) {
/* Handle a socket error condition passed to us from OpenSSL */
static void handle_fatal_ssl_error(proxystate *ps, int err) {
if (err == SSL_ERROR_ZERO_RETURN)
- LOG("{client} Connection closed (in data)\n");
+ ERR("{client} Connection closed (in data)\n");
else if (err == SSL_ERROR_SYSCALL)
if (errno == 0)
- LOG("{client} Connection closed (in data)\n");
+ ERR("{client} Connection closed (in data)\n");
else
perror("{client} [errno] ");
else
- LOG("{client} Unexpected SSL_read error: %d\n", err);
+ ERR("{client} Unexpected SSL_read error: %d\n", err);
shutdown_proxy(ps, SHUTDOWN_UP);
}
@@ -730,7 +730,7 @@ static void check_ppid(struct ev_loop *loop, ev_timer *w, int revents) {
(void) revents;
pid_t ppid = getppid();
if (ppid != master_pid) {
- LOG("{core} Process %d detected parent death, closing listener socket.\n", child_num);
+ ERR("{core} Process %d detected parent death, closing listener socket.\n", child_num);
ev_timer_stop(loop, w);
ev_io_stop(loop, &listener);
close(listener_socket);
@@ -753,7 +753,7 @@ static void handle_connections(SSL_CTX *ctx) {
if (!res)
LOG("{core} Successfully attached to CPU #%d\n", child_num);
else
- LOG("{core-warning} Unable to attach to CPU #%d; do you have that many cores?\n", child_num);
+ ERR("{core-warning} Unable to attach to CPU #%d; do you have that many cores?\n", child_num);
#endif
loop = ev_default_loop(EVFLAG_AUTO);
@@ -865,7 +865,7 @@ static void parse_cli(int argc, char **argv) {
while (1) {
int option_index = 0;
- c = getopt_long(argc, argv, "hf:b:n:c:u:r:B:C:",
+ c = getopt_long(argc, argv, "hf:b:n:c:u:r:B:C:q",
long_options, &option_index);
if (c == -1)
Please sign in to comment.
Something went wrong with that request. Please try again.