lorenz.stechauner/sesimos
1
1
Fork 0
Code Issues Pull Requests Projects Releases Activity

Remove dns_server directive

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-01-29 11:55:32 +01:00
parent 40310faa4b
commit ab7e5cc722
4 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -27,7 +27,6 @@ See [doc/example.conf](doc/example.conf) for more details.
### Global directives
* `geoip_dir` (optional) - path to a directory containing GeoIP databases
* `dns_server` (optional) - address of a DNS server
### Configuration

3
src/lib/config.c
View File

@ -61,9 +61,6 @@ static int config_parse_line(char *line, char *section, int *i, int *j) {
if (len > 10 && strncmp(ptr, "geoip_dir", 9) == 0 && (ptr[9] == ' ' || ptr[9] == '\t')) {
source = ptr + 9;
target = config.geoip_dir;
} else if (len > 11 && strncmp(ptr, "dns_server", 10) == 0 && (ptr[10] == ' ' || ptr[10] == '\t')) {
source = ptr + 10;
target = config.dns_server;
} else {
return -1;
}

1
src/lib/config.h
View File

@ -53,7 +53,6 @@ typedef struct {
host_config_t hosts[CONFIG_MAX_HOST_CONFIG];
cert_config_t certs[CONFIG_MAX_CERT_CONFIG];
char geoip_dir[256];
char dns_server[256];
} config_t;
extern config_t config;

5
src/worker/tcp_acceptor.c
View File

@ -33,7 +33,7 @@ static int dig(const char *addr, char *host, size_t host_size) {
FILE *out;
int ret;
sprintf(buf, "dig @%s +short +time=1 -x %s", config.dns_server, addr);
sprintf(buf, "dig +short +time=1 -x %s", addr);
if ((out = popen(buf, "r")) == NULL) {
error("Unable to start dig: %s");
return -1;
@ -85,8 +85,7 @@ static int tcp_acceptor(client_ctx_t *ctx) {
ctx->cnx_s = clock_micros();
ctx->host[0] = 0;
if (config.dns_server[0] != 0)
dig(ctx->socket.addr, ctx->host, sizeof(ctx->host));
dig(ctx->socket.addr, ctx->host, sizeof(ctx->host));
ctx->cc[0] = 0;
geoip_lookup_country(&client->_addr.sock, ctx->cc);