4df4a8e731
Replace dns_fixedname_init() calls followed by dns_fixedname_name()
calls with calls to dns_fixedname_initname() where it is possible
without affecting current behavior and/or performance.
This patch was mostly prepared using Coccinelle and the following
semantic patch:
@@
expression fixedname, name;
@@
- dns_fixedname_init(&fixedname);
...
- name = dns_fixedname_name(&fixedname);
+ name = dns_fixedname_initname(&fixedname);
The resulting set of changes was then manually reviewed to exclude false
positives and apply minor tweaks.
It is likely that more occurrences of this pattern can be refactored in
an identical way. This commit only takes care of the low-hanging fruit.
159 lines
3.7 KiB
C
159 lines
3.7 KiB
C
/*
|
|
* Driver instance object.
|
|
*
|
|
* One instance is equivalent to dynamic-db section in named.conf.
|
|
* This module parses arguments and provide high-level operations
|
|
* instance init/zone load/instance destroy.
|
|
*
|
|
* Copyright (C) 2008-2015 Red Hat ; see COPYRIGHT for license
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#include <isc/task.h>
|
|
#include <isc/util.h>
|
|
|
|
#include <dns/db.h>
|
|
#include <dns/dyndb.h>
|
|
#include <dns/fixedname.h>
|
|
#include <dns/name.h>
|
|
#include <dns/view.h>
|
|
#include <dns/zone.h>
|
|
|
|
#include "db.h"
|
|
#include "util.h"
|
|
#include "instance.h"
|
|
#include "log.h"
|
|
#include "zone.h"
|
|
|
|
/*
|
|
* Parse parameters and convert them to zone names. Caller has to deallocate
|
|
* resulting DNS names.
|
|
*
|
|
* @param[in] argv NULL-terminated string array of length 2 (excluding NULL)
|
|
* Each string has to be a valid DNS name.
|
|
* @param[out] z1 Zone name from argv[0]
|
|
* @param[out] z2 Zone name from argv[1]
|
|
*/
|
|
static isc_result_t
|
|
parse_params(isc_mem_t *mctx, int argc, char **argv,
|
|
dns_name_t *z1, dns_name_t *z2)
|
|
{
|
|
isc_result_t result;
|
|
int i;
|
|
|
|
REQUIRE(argv != NULL);
|
|
REQUIRE(z1 != NULL);
|
|
REQUIRE(z2 != NULL);
|
|
|
|
for (i = 0; i < argc; i++) {
|
|
log_info("param: '%s'", argv[i]);
|
|
}
|
|
log_info("number of params: %d", i);
|
|
|
|
if (argc != 2) {
|
|
log_error("exactly two parameters "
|
|
"(absolute zone names) are required");
|
|
result = ISC_R_FAILURE;
|
|
goto cleanup;
|
|
}
|
|
CHECK(dns_name_fromstring2(z1, argv[0], dns_rootname, 0, mctx));
|
|
CHECK(dns_name_fromstring2(z2, argv[1], dns_rootname, 0, mctx));
|
|
|
|
result = ISC_R_SUCCESS;
|
|
|
|
cleanup:
|
|
return (result);
|
|
}
|
|
|
|
/*
|
|
* Initialize new driver instance. It will not create zones until
|
|
* load_sample_instance_zones() is called.
|
|
*/
|
|
isc_result_t
|
|
new_sample_instance(isc_mem_t *mctx, const char *db_name,
|
|
int argc, char **argv, const dns_dyndbctx_t *dctx,
|
|
sample_instance_t **sample_instp)
|
|
{
|
|
isc_result_t result;
|
|
sample_instance_t *inst = NULL;
|
|
|
|
REQUIRE(sample_instp != NULL && *sample_instp == NULL);
|
|
|
|
CHECKED_MEM_GET_PTR(mctx, inst);
|
|
ZERO_PTR(inst);
|
|
isc_mem_attach(mctx, &inst->mctx);
|
|
|
|
inst->db_name = isc_mem_strdup(mctx, db_name);
|
|
if (inst->db_name == NULL) {
|
|
result = ISC_R_NOMEMORY;
|
|
goto cleanup;
|
|
}
|
|
|
|
inst->zone1_name = dns_fixedname_initname(&inst->zone1_fn);
|
|
inst->zone2_name = dns_fixedname_initname(&inst->zone2_fn);
|
|
|
|
CHECK(parse_params(mctx, argc, argv,
|
|
inst->zone1_name, inst->zone2_name));
|
|
|
|
dns_view_attach(dctx->view, &inst->view);
|
|
dns_zonemgr_attach(dctx->zmgr, &inst->zmgr);
|
|
isc_task_attach(dctx->task, &inst->task);
|
|
|
|
/* Register new DNS DB implementation. */
|
|
CHECK(dns_db_register(db_name, create_db, inst, mctx, &inst->db_imp));
|
|
|
|
*sample_instp = inst;
|
|
result = ISC_R_SUCCESS;
|
|
|
|
cleanup:
|
|
if (result != ISC_R_SUCCESS)
|
|
destroy_sample_instance(&inst);
|
|
return (result);
|
|
}
|
|
|
|
/*
|
|
* Create empty zones, add fake SOA, NS, and A records, load fake zones
|
|
* and add them to inst->view.
|
|
*/
|
|
isc_result_t
|
|
load_sample_instance_zones(sample_instance_t *inst) {
|
|
isc_result_t result;
|
|
|
|
CHECK(create_zone(inst, inst->zone1_name, &inst->zone1));
|
|
CHECK(activate_zone(inst, inst->zone1));
|
|
|
|
CHECK(create_zone(inst, inst->zone2_name, &inst->zone2));
|
|
CHECK(activate_zone(inst, inst->zone2));
|
|
|
|
cleanup:
|
|
return (result);
|
|
}
|
|
|
|
void
|
|
destroy_sample_instance(sample_instance_t **instp) {
|
|
sample_instance_t *inst;
|
|
REQUIRE(instp != NULL);
|
|
|
|
inst = *instp;
|
|
if (inst == NULL)
|
|
return;
|
|
|
|
if (inst->db_name != NULL)
|
|
isc_mem_free(inst->mctx, inst->db_name);
|
|
if (inst->zone1 != NULL)
|
|
dns_zone_detach(&inst->zone1);
|
|
if (inst->zone2 != NULL)
|
|
dns_zone_detach(&inst->zone2);
|
|
if (inst->db_imp != NULL)
|
|
dns_db_unregister(&inst->db_imp);
|
|
|
|
dns_view_detach(&inst->view);
|
|
dns_zonemgr_detach(&inst->zmgr);
|
|
isc_task_detach(&inst->task);
|
|
|
|
MEM_PUT_AND_DETACH(inst);
|
|
|
|
*instp = NULL;
|
|
}
|