resolved: make TXT RR generation and parsing more in-line with RFC 6763, section 6.1

[elogind.git] / src / resolve / resolved-dns-scope.c

diff --git a/src/resolve/resolved-dns-scope.c b/src/resolve/resolved-dns-scope.c
index a31e7929b7f9599654de4a91f9ea258ba9cd463c..1ce2bb4366a98bb0c14c76d2bdd943b8a79c1901 100644 (file)
--- a/src/resolve/resolved-dns-scope.c
+++ b/src/resolve/resolved-dns-scope.c
@@ -539,7 +539,7 @@ void dns_scope_process_query(DnsScope *s, DnsStream *stream, DnsPacket *p) {
 
         r = dns_packet_extract(p);
         if (r < 0) {
-                log_debug_errno(-r, "Failed to extract resources from incoming packet: %m");
+                log_debug_errno(r, "Failed to extract resources from incoming packet: %m");
                 return;
         }
 
@@ -551,7 +551,7 @@ void dns_scope_process_query(DnsScope *s, DnsStream *stream, DnsPacket *p) {
 
         r = dns_zone_lookup(&s->zone, p->question, &answer, &soa, &tentative);
         if (r < 0) {
-                log_debug_errno(-r, "Failed to lookup key: %m");
+                log_debug_errno(r, "Failed to lookup key: %m");
                 return;
         }
         if (r == 0)
@@ -562,7 +562,7 @@ void dns_scope_process_query(DnsScope *s, DnsStream *stream, DnsPacket *p) {
 
         r = dns_scope_make_reply_packet(s, DNS_PACKET_ID(p), DNS_RCODE_SUCCESS, p->question, answer, soa, tentative, &reply);
         if (r < 0) {
-                log_debug_errno(-r, "Failed to build reply packet: %m");
+                log_debug_errno(r, "Failed to build reply packet: %m");
                 return;
         }
 
@@ -581,7 +581,7 @@ void dns_scope_process_query(DnsScope *s, DnsStream *stream, DnsPacket *p) {
                         return;
                 }
                 if (fd < 0) {
-                        log_debug_errno(-fd, "Failed to get reply socket: %m");
+                        log_debug_errno(fd, "Failed to get reply socket: %m");
                         return;
                 }
 
@@ -594,7 +594,7 @@ void dns_scope_process_query(DnsScope *s, DnsStream *stream, DnsPacket *p) {
         }
 
         if (r < 0) {
-                log_debug_errno(-r, "Failed to send reply packet: %m");
+                log_debug_errno(r, "Failed to send reply packet: %m");
                 return;
         }
 }
@@ -688,13 +688,13 @@ static int on_conflict_dispatch(sd_event_source *es, usec_t usec, void *userdata
 
                 r = dns_scope_make_conflict_packet(scope, rr, &p);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to make conflict packet: %m");
+                        log_error_errno(r, "Failed to make conflict packet: %m");
                         return 0;
                 }
 
                 r = dns_scope_emit(scope, p);
                 if (r < 0)
-                        log_debug_errno(-r, "Failed to send conflict packet: %m");
+                        log_debug_errno(r, "Failed to send conflict packet: %m");
         }
 
         return 0;
@@ -721,10 +721,8 @@ int dns_scope_notify_conflict(DnsScope *scope, DnsResourceRecord *rr) {
         r = ordered_hashmap_put(scope->conflict_queue, rr->key, rr);
         if (r == -EEXIST || r == 0)
                 return 0;
-        if (r < 0) {
-                log_debug_errno(-r, "Failed to queue conflicting RR: %m");
-                return r;
-        }
+        if (r < 0)
+                return log_debug_errno(r, "Failed to queue conflicting RR: %m");
 
         dns_resource_record_ref(rr);
 
@@ -740,10 +738,8 @@ int dns_scope_notify_conflict(DnsScope *scope, DnsResourceRecord *rr) {
                               now(clock_boottime_or_monotonic()) + jitter,
                               LLMNR_JITTER_INTERVAL_USEC,
                               on_conflict_dispatch, scope);
-        if (r < 0) {
-                log_debug_errno(-r, "Failed to add conflict dispatch event: %m");
-                return r;
-        }
+        if (r < 0)
+                return log_debug_errno(r, "Failed to add conflict dispatch event: %m");
 
         return 0;
 }
@@ -772,7 +768,7 @@ void dns_scope_check_conflicts(DnsScope *scope, DnsPacket *p) {
 
         r = dns_packet_extract(p);
         if (r < 0) {
-                log_debug_errno(-r, "Failed to extract packet: %m");
+                log_debug_errno(r, "Failed to extract packet: %m");
                 return;
         }