diff options
Diffstat (limited to 'bin/rndc/rndc.c')
| -rw-r--r-- | bin/rndc/rndc.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c index edb3a31109047..87e966937e3de 100644 --- a/bin/rndc/rndc.c +++ b/bin/rndc/rndc.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2014 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2015 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -78,7 +78,7 @@ static isccc_ccmsg_t ccmsg; static isccc_region_t secret; static isc_boolean_t failed = ISC_FALSE; static isc_boolean_t c_flag = ISC_FALSE; -static isc_mem_t *mctx; +static isc_mem_t *rndc_mctx; static int sends, recvs, connects; static char *command; static char *args; @@ -405,7 +405,7 @@ rndc_connected(isc_task_t *task, isc_event_t *event) { r.length = len; r.base = databuf; - isccc_ccmsg_init(mctx, sock, &ccmsg); + isccc_ccmsg_init(rndc_mctx, sock, &ccmsg); isccc_ccmsg_setmaxsize(&ccmsg, 1024 * 1024); DO("schedule recv", isccc_ccmsg_readmessage(&ccmsg, task, @@ -812,12 +812,12 @@ main(int argc, char **argv) { isc_random_get(&serial); - DO("create memory context", isc_mem_create(0, 0, &mctx)); - DO("create socket manager", isc_socketmgr_create(mctx, &socketmgr)); - DO("create task manager", isc_taskmgr_create(mctx, 1, 0, &taskmgr)); + DO("create memory context", isc_mem_create(0, 0, &rndc_mctx)); + DO("create socket manager", isc_socketmgr_create(rndc_mctx, &socketmgr)); + DO("create task manager", isc_taskmgr_create(rndc_mctx, 1, 0, &taskmgr)); DO("create task", isc_task_create(taskmgr, 0, &task)); - DO("create logging context", isc_log_create(mctx, &log, &logconfig)); + DO("create logging context", isc_log_create(rndc_mctx, &log, &logconfig)); isc_log_setcontext(log); DO("setting log tag", isc_log_settag(logconfig, progname)); logdest.file.stream = stderr; @@ -831,7 +831,7 @@ main(int argc, char **argv) { DO("enabling log channel", isc_log_usechannel(logconfig, "stderr", NULL, NULL)); - parse_config(mctx, log, keyname, &pctx, &config); + parse_config(rndc_mctx, log, keyname, &pctx, &config); isccc_result_register(); @@ -846,7 +846,7 @@ main(int argc, char **argv) { for (i = 0; i < argc; i++) argslen += strlen(argv[i]) + 1; - args = isc_mem_get(mctx, argslen); + args = isc_mem_get(rndc_mctx, argslen); if (args == NULL) DO("isc_mem_get", ISC_R_NOMEMORY); @@ -870,7 +870,7 @@ main(int argc, char **argv) { if (nserveraddrs == 0) get_addresses(servername, (in_port_t) remoteport); - DO("post event", isc_app_onrun(mctx, task, rndc_start, NULL)); + DO("post event", isc_app_onrun(rndc_mctx, task, rndc_start, NULL)); result = isc_app_run(); if (result != ISC_R_SUCCESS) @@ -888,15 +888,15 @@ main(int argc, char **argv) { cfg_obj_destroy(pctx, &config); cfg_parser_destroy(&pctx); - isc_mem_put(mctx, args, argslen); + isc_mem_put(rndc_mctx, args, argslen); isccc_ccmsg_invalidate(&ccmsg); dns_name_destroy(); if (show_final_mem) - isc_mem_stats(mctx, stderr); + isc_mem_stats(rndc_mctx, stderr); - isc_mem_destroy(&mctx); + isc_mem_destroy(&rndc_mctx); if (failed) return (1); |