mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 06:25:31 +00:00
Code Issues Releases Wiki Activity

Don't die horribly when recieving a SIGINT [RT #488].

Browse Source
This commit is contained in:
Brian Wellington
2000-11-22 02:54:15 +00:00
parent de389382be
commit dbc41c8290
1 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
bin/nsupdate/nsupdate.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: nsupdate.c,v 1.62 2000/11/16 05:45:52 marka Exp $ */ /* $Id: nsupdate.c,v 1.63 2000/11/22 02:54:15 bwelling Exp $ */
#include <config.h> #include <config.h>
@@ -113,6 +113,7 @@ static isc_sockaddr_t *userserver = NULL;
static isc_sockaddr_t *localaddr = NULL; static isc_sockaddr_t *localaddr = NULL;
static char *keystr = NULL, *keyfile = NULL; static char *keystr = NULL, *keyfile = NULL;
static isc_entropy_t *entp = NULL; static isc_entropy_t *entp = NULL;
static isc_boolean_t shuttingdown = ISC_FALSE;
typedef struct nsu_requestinfo { typedef struct nsu_requestinfo {
dns_message_t *msg; dns_message_t *msg;
@@ -340,6 +341,17 @@ setup_key(void) {
isc_mem_free(mctx, secret); isc_mem_free(mctx, secret);
} }
static void
shutdown_program(isc_task_t *task, isc_event_t *event) {
REQUIRE(task == global_task);
UNUSED(task);
ddebug("shutdown_program()");
isc_event_free(&event);
isc_task_detach(&global_task);
shuttingdown = ISC_TRUE;
}
static void static void
setup_system(void) { setup_system(void) {
isc_result_t result; isc_result_t result;
@@ -408,6 +420,9 @@ setup_system(void) {
result = isc_task_create(taskmgr, 0, &global_task); result = isc_task_create(taskmgr, 0, &global_task);
check_result(result, "isc_task_create"); check_result(result, "isc_task_create");
result = isc_task_onshutdown(global_task, shutdown_program, NULL);
check_result(result, "isc_task_onshutdown");
result = isc_entropy_create(mctx, &entp); result = isc_entropy_create(mctx, &entp);
check_result(result, "isc_entropy_create"); check_result(result, "isc_entropy_create");
@@ -1131,6 +1146,7 @@ user_interaction(void) {
static void static void
done_update(void) { done_update(void) {
isc_event_t *event = global_event; isc_event_t *event = global_event;
ddebug("done_update()");
isc_task_send(global_task, &event); isc_task_send(global_task, &event);
} }
@@ -1142,7 +1158,7 @@ update_completed(isc_task_t *task, isc_event_t *event) {
UNUSED(task); UNUSED(task);
ddebug("updated_completed()"); ddebug("update_completed()");
REQUIRE(event->ev_type == DNS_EVENT_REQUESTDONE); REQUIRE(event->ev_type == DNS_EVENT_REQUESTDONE);
reqev = (dns_requestevent_t *)event; reqev = (dns_requestevent_t *)event;
if (reqev->result != ISC_R_SUCCESS) { if (reqev->result != ISC_R_SUCCESS) {
@@ -1505,16 +1521,12 @@ cleanup(void) {
ddebug("Shutting down dispatch manager"); ddebug("Shutting down dispatch manager");
dns_dispatchmgr_destroy(&dispatchmgr); dns_dispatchmgr_destroy(&dispatchmgr);
ddebug("Ending task");
isc_task_detach(&global_task);
ddebug("Destroying event task");
if (global_event != NULL)
isc_event_free(&global_event);
ddebug("Shutting down task manager"); ddebug("Shutting down task manager");
isc_taskmgr_destroy(&taskmgr); isc_taskmgr_destroy(&taskmgr);
ddebug("Destroying event");
isc_event_free(&global_event);
ddebug("Shutting down socket manager"); ddebug("Shutting down socket manager");
isc_socketmgr_destroy(&socketmgr); isc_socketmgr_destroy(&socketmgr);
@@ -1536,6 +1548,10 @@ getinput(isc_task_t *task, isc_event_t *event) {
if (global_event == NULL) if (global_event == NULL)
global_event = event; global_event = event;
if (shuttingdown) {
isc_app_shutdown();
return;
}
reset_system(); reset_system();
isc_app_block(); isc_app_block();
more = user_interaction(); more = user_interaction();