resolved: drop timestamp parameter to dns_cache_put() we don't ever pass

poettering · poettering · commit 43475909cef2 · 2021-02-09T18:02:14.000+01:00
diff --git a/src/resolve/resolved-dns-cache.c b/src/resolve/resolved-dns-cache.c
@@ -672,7 +672,6 @@ int dns_cache_put(
                 bool authenticated,
                 DnssecResult dnssec_result,
                 uint32_t nsec_ttl,
-                usec_t timestamp,
                 int owner_family,
                 const union in_addr_union *owner_address) {
 
@@ -681,6 +680,7 @@ int dns_cache_put(
         DnsAnswerItem *item;
         DnsAnswerFlags flags;
         unsigned cache_keys;
+        usec_t timestamp;
         int r;
 
         assert(c);
@@ -721,8 +721,7 @@ int dns_cache_put(
         /* Make some space for our new entries */
         dns_cache_make_space(c, cache_keys);
 
-        if (timestamp <= 0)
-                timestamp = now(clock_boottime_or_monotonic());
+        timestamp = now(clock_boottime_or_monotonic());
 
         /* Second, add in positive entries for all contained RRs */
         DNS_ANSWER_FOREACH_ITEM(item, answer) {
diff --git a/src/resolve/resolved-dns-cache.h b/src/resolve/resolved-dns-cache.h
@@ -33,7 +33,6 @@ int dns_cache_put(
                 bool authenticated,
                 DnssecResult dnssec_result,
                 uint32_t nsec_ttl,
-                usec_t timestamp,
                 int owner_family,
                 const union in_addr_union *owner_address);
 
diff --git a/src/resolve/resolved-dns-transaction.c b/src/resolve/resolved-dns-transaction.c
@@ -771,7 +771,6 @@ static void dns_transaction_cache_answer(DnsTransaction *t) {
                       t->answer_authenticated,
                       t->answer_dnssec_result,
                       t->answer_nsec_ttl,
-                      0,
                       t->received->family,
                       &t->received->sender);
 }
diff --git a/src/resolve/resolved-mdns.c b/src/resolve/resolved-mdns.c
@@ -319,7 +319,7 @@ static int on_mdns_packet(sd_event_source *s, int fd, uint32_t revents, void *us
                                 dns_transaction_process_reply(t, p);
                 }
 
-                dns_cache_put(&scope->cache, scope->manager->enable_cache, NULL, DNS_PACKET_RCODE(p), p->answer, NULL, 0, _DNSSEC_RESULT_INVALID, (uint32_t) -1, 0, p->family, &p->sender);
+                dns_cache_put(&scope->cache, scope->manager->enable_cache, NULL, DNS_PACKET_RCODE(p), p->answer, NULL, false, _DNSSEC_RESULT_INVALID, (uint32_t) -1, p->family, &p->sender);
 
         } else if (dns_packet_validate_query(p) > 0)  {
                 log_debug("Got mDNS query packet for id %u", DNS_PACKET_ID(p));

Original file line number	Diff line number	Diff line change
`@@ -771,7 +771,6 @@ static void dns_transaction_cache_answer(DnsTransaction *t) {`
`771`	`771`	`t->answer_authenticated,`
`772`	`772`	`t->answer_dnssec_result,`
`773`	`773`	`t->answer_nsec_ttl,`
`774`		`- 0,`
`775`	`774`	`t->received->family,`
`776`	`775`	`&t->received->sender);`
`777`	`776`	`}`
Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ static int on_mdns_packet(sd_event_source s, int fd, uint32_t revents, void us`
`319`	`319`	`dns_transaction_process_reply(t, p);`
`320`	`320`	`}`
`321`	`321`
`322`		`- dns_cache_put(&scope->cache, scope->manager->enable_cache, NULL, DNS_PACKET_RCODE(p), p->answer, NULL, 0, _DNSSEC_RESULT_INVALID, (uint32_t) -1, 0, p->family, &p->sender);`
	`322`	`+ dns_cache_put(&scope->cache, scope->manager->enable_cache, NULL, DNS_PACKET_RCODE(p), p->answer, NULL, false, _DNSSEC_RESULT_INVALID, (uint32_t) -1, p->family, &p->sender);`
`323`	`323`
`324`	`324`	`} else if (dns_packet_validate_query(p) > 0) {`
`325`	`325`	`log_debug("Got mDNS query packet for id %u", DNS_PACKET_ID(p));`