Archives/SSLproxy
2
0
Fork 0
mirror of https://github.com/sonertari/SSLproxy synced 2024-11-19 21:25:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Flush error queue prior to exiting

Browse Source 
Reorganize the cleanup code after detaching from the TTY in order to be
able to flush the error queue before calling exit().  Addresses issue #6
This commit is contained in:
Daniel Roethlisberger 2012-10-23 21:30:11 +02:00
parent 7713f82b62
commit bb15224d11
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
main.c
View File

@ -216,6 +216,7 @@ main(int argc, char *argv[])
opts_t *opts;
char *natengine;
int pidfd = -1;
int rv = EXIT_FAILURE;
argv0 = argv[0];
opts = opts_new();
@ -598,6 +599,10 @@ main(int argc, char *argv[])
exit(EXIT_FAILURE);
}
if (opts->detach) {
if (OPTS_DEBUG(opts)) {
log_dbg_printf("Detaching from TTY, see syslog for "
"errors after this point\n");
}
if (daemon(1, 0) == -1) {
fprintf(stderr, "%s: failed to detach from TTY: %s\n",
argv0, strerror(errno));
@ -609,21 +614,21 @@ main(int argc, char *argv[])
/* Post-privdrop/chroot/detach initialization, thread spawning */
if (log_init(opts) == -1) {
log_err_printf("Failed to init log facility.\n");
exit(EXIT_FAILURE);
fprintf(stderr, "%s: failed to init log facility.\n", argv0);
goto out_log_failed;
}
if (opts->pidfile && (sys_pidf_write(pidfd) == -1)) {
log_err_printf("Failed to write PID to PID file '%s': %s\n",
opts->pidfile, strerror(errno));
exit(EXIT_FAILURE);
goto out_pidwrite_failed;
}
if (cachemgr_init() == -1) {
log_err_printf("Failed to init cache manager.\n");
exit(EXIT_FAILURE);
goto out_cachemgr_failed;
}
if (nat_init() == -1) {
log_err_printf("Failed to init NAT state table lookup.\n");
exit(EXIT_FAILURE);
goto out_nat_failed;
}
if (opts->tgcrtdir) {
@ -633,20 +638,26 @@ main(int argc, char *argv[])
proxy_ctx_t *proxy = proxy_new(opts);
if (!proxy) {
log_err_printf("Failed to initialize proxy.\n");
exit(EXIT_FAILURE);
goto out_proxy_failed;
}
rv = EXIT_SUCCESS;
proxy_run(proxy);
proxy_free(proxy);
cachemgr_fini();
out_proxy_failed:
nat_fini();
log_fini();
out_nat_failed:
cachemgr_fini();
out_cachemgr_failed:
if (opts->pidfile) {
sys_pidf_close(pidfd, opts->pidfile);
}
out_pidwrite_failed:
log_fini();
out_log_failed:
opts_free(opts);
ssl_fini();
return EXIT_SUCCESS;
return rv;
}
/* vim: set noet ft=c: */

2
pxyconn.c
View File

@ -1128,6 +1128,8 @@ pxy_bev_readcb(struct bufferevent *bev, void *arg)
if (!ctx->connected) {
log_err_printf("readcb called when other end not connected - "
"aborting.\n");
/* XXX should signal main loop instead of calling exit() */
log_fini();
exit(EXIT_FAILURE);
}