diff options
| author | Dominik DL6ER <dl6er@dl6er.de> | 2021-09-01 21:19:47 +0100 |
|---|---|---|
| committer | Simon Kelley <simon@thekelleys.org.uk> | 2021-09-01 21:19:47 +0100 |
| commit | c83e33d6080fdd8441a59e73f0caaaa32882d817 (patch) | |
| tree | 33a2e30f88e6a98de099a623260c101bc8a756a2 | |
| parent | 7b80c75d9d3c19d8d328f749c06d06788ddb63fc (diff) | |
| download | dnsmasq-c83e33d6080fdd8441a59e73f0caaaa32882d817.tar.gz | |
Final logging tweaks.v2.86rc3
| -rw-r--r-- | src/cache.c | 2 | ||||
| -rw-r--r-- | src/rfc1035.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/cache.c b/src/cache.c index 24bd450..8add610 100644 --- a/src/cache.c +++ b/src/cache.c @@ -1853,7 +1853,7 @@ char *querystr(char *desc, unsigned short type) if (types) sprintf(buff, "<%s>", types); else - sprintf(buff, "type=%d", type); + sprintf(buff, "<type=%d>", type); } } diff --git a/src/rfc1035.c b/src/rfc1035.c index bf8c163..9b87541 100644 --- a/src/rfc1035.c +++ b/src/rfc1035.c @@ -503,7 +503,7 @@ static int find_soa(struct dns_header *header, size_t qlen, int *doctored) /* Print TXT reply to log */ static int print_txt(struct dns_header *header, const size_t qlen, char *name, - unsigned char *p, const int ardlen) + unsigned char *p, const int ardlen, int secflag) { unsigned char *p1 = p; if (!CHECK_LEN(header, p1, qlen, ardlen)) @@ -526,7 +526,7 @@ static int print_txt(struct dns_header *header, const size_t qlen, char *name, } *p3 = 0; - log_query(F_FORWARD | F_UPSTREAM, name, NULL, (char*)p1); + log_query(secflag | F_FORWARD | F_UPSTREAM, name, NULL, (char*)p1); /* restore */ memmove(p1 + 1, p1, i); *p1 = len; @@ -544,7 +544,7 @@ int extract_addresses(struct dns_header *header, size_t qlen, char *name, time_t int secure, int *doctored) { unsigned char *p, *p1, *endrr, *namep; - int i, j, qtype, qclass, aqtype, aqclass, ardlen, res, searched_soa = 0; + int j, qtype, qclass, aqtype, aqclass, ardlen, res, searched_soa = 0; unsigned long ttl = 0; union all_addr addr; #ifdef HAVE_IPSET @@ -574,8 +574,8 @@ int extract_addresses(struct dns_header *header, size_t qlen, char *name, time_t return 0; #ifdef HAVE_DNSSEC if (option_bool(OPT_DNSSEC_VALID)) - for (i = 0; i < ntohs(header->ancount); i++) - if (daemon->rr_status[i] != 0) + for (j = 0; j < ntohs(header->ancount); j++) + if (daemon->rr_status[j] != 0) return 0; #endif } @@ -865,7 +865,7 @@ int extract_addresses(struct dns_header *header, size_t qlen, char *name, time_t if (aqtype == T_TXT) { - if (!print_txt(header, qlen, name, p1, ardlen)) + if (!print_txt(header, qlen, name, p1, ardlen, secflag)) return 0; } else |