upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-24 00:29:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

config file param.

Browse source 
git-svn-id: file:///svn/unbound/trunk@133 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2007-02-20 16:19:00 +00:00
parent a87e39c8e6
commit 2534d6b120
2 changed files with 41 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
daemon/unbound.c
View file

@ -43,6 +43,7 @@
#include "config.h" #include "config.h"
#include "util/log.h" #include "util/log.h"
#include "daemon/worker.h" #include "daemon/worker.h"
#include "util/config_file.h"
/** buffer size for network connections */ /** buffer size for network connections */
#define BUFSZ 65552 #define BUFSZ 65552
@ -53,6 +54,7 @@ static void usage()
printf("usage: unbound [options]\n"); printf("usage: unbound [options]\n");
printf(" start unbound daemon DNS resolver.\n"); printf(" start unbound daemon DNS resolver.\n");
printf("-h this help\n"); printf("-h this help\n");
printf("-c file config file to read, unbound.conf(5).\n");
printf("-p port the port to listen on\n"); printf("-p port the port to listen on\n");
printf("-v verbose (multiple times increase verbosity)\n"); printf("-v verbose (multiple times increase verbosity)\n");
printf("-f ip set forwarder address\n"); printf("-f ip set forwarder address\n");
@ -84,12 +86,16 @@ main(int argc, char* argv[])
int c; int c;
const char* fwd = "127.0.0.1"; const char* fwd = "127.0.0.1";
const char* fwdport = UNBOUND_DNS_PORT; const char* fwdport = UNBOUND_DNS_PORT;
const char* cfgfile = NULL;
struct config_file *cfg = NULL;
log_init(); log_init();
log_info("Start of %s.", PACKAGE_STRING);
/* parse the options */ /* parse the options */
while( (c=getopt(argc, argv, "f:hvp:z:")) != -1) { while( (c=getopt(argc, argv, "c:f:hvp:z:")) != -1) {
switch(c) { switch(c) {
case 'c':
cfgfile = optarg;
break;
case 'f': case 'f':
fwd = optarg; fwd = optarg;
break; break;
@ -121,6 +127,18 @@ main(int argc, char* argv[])
return 1; return 1;
} }
if(!(cfg = config_create())) {
fprintf(stderr, "Could not init config defaults.");
return 1;
}
if(cfgfile) {
if(!config_read(cfg, cfgfile)) {
config_delete(cfg);
return 1;
}
}
log_info("Start of %s.", PACKAGE_STRING);
/* setup */ /* setup */
worker = worker_init(port, do_ip4, do_ip6, do_udp, do_tcp, BUFSZ, worker = worker_init(port, do_ip4, do_ip6, do_udp, do_tcp, BUFSZ,
numports, baseport); numports, baseport);

21
util/config_file.c
View file

@ -73,6 +73,18 @@ config_create()
return cfg; return cfg;
} }
/** initialize the global cfg_parser object. */
static void
create_cfg_parser(struct config_file* cfg, char* filename)
{
static struct config_parser_state st;
cfg_parser = &st;
cfg_parser->filename = filename;
cfg_parser->line = 1;
cfg_parser->errors = 0;
cfg_parser->cfg = cfg;
}
int int
config_read(struct config_file* cfg, const char* filename) config_read(struct config_file* cfg, const char* filename)
{ {
@ -81,7 +93,16 @@ config_read(struct config_file* cfg, const char* filename)
log_err("Could not open %s: %s", filename, strerror(errno)); log_err("Could not open %s: %s", filename, strerror(errno));
return 0; return 0;
} }
create_cfg_parser(cfg, (char*)filename);
ub_c_in = in;
ub_c_parse();
fclose(in); fclose(in);
if(cfg_parser->errors != 0) {
fprintf(stderr, "read %s failed: %d errors in configuration file\n",
cfg_parser->filename, cfg_parser->errors);
return 0;
}
return 1; return 1;
} }