resolved: rename manager_our_packet() → manager_packet_from_local_address()

poettering · poettering · commit 94378145e6a1 · 2021-02-14T23:12:22.000+01:00
Let's be more precise in naming this function, after all this doesn#t
actually check if the packet is really ours, but just that the source IP
address is a local one. Hence name it that way.

(This is preparation to add a helper that checks if packet belongs to
local transaction later on)
diff --git a/src/resolve/resolved-dns-scope.c b/src/resolve/resolved-dns-scope.c
@@ -1126,7 +1126,7 @@ void dns_scope_check_conflicts(DnsScope *scope, DnsPacket *p) {
                         return;
         }
 
-        if (manager_our_packet(scope->manager, p))
+        if (manager_packet_from_local_address(scope->manager, p))
                 return;
 
         r = dns_packet_extract(p);
diff --git a/src/resolve/resolved-dns-transaction.c b/src/resolve/resolved-dns-transaction.c
@@ -317,8 +317,9 @@ static void dns_transaction_tentative(DnsTransaction *t, DnsPacket *p) {
 
         assert(t);
         assert(p);
+        assert(t->scope->protocol == DNS_PROTOCOL_LLMNR);
 
-        if (manager_our_packet(t->scope->manager, p) != 0)
+        if (manager_packet_from_local_address(t->scope->manager, p) != 0)
                 return;
 
         (void) in_addr_to_string(p->family, &p->sender, &pretty);
diff --git a/src/resolve/resolved-llmnr.c b/src/resolve/resolved-llmnr.c
@@ -83,7 +83,7 @@ static int on_llmnr_packet(sd_event_source *s, int fd, uint32_t revents, void *u
         if (r <= 0)
                 return r;
 
-        if (manager_our_packet(m, p))
+        if (manager_packet_from_local_address(m, p))
                 return 0;
 
         scope = manager_find_scope(m, p);
diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
@@ -1255,10 +1255,12 @@ LinkAddress* manager_find_link_address(Manager *m, int family, const union in_ad
         return NULL;
 }
 
-bool manager_our_packet(Manager *m, DnsPacket *p) {
+bool manager_packet_from_local_address(Manager *m, DnsPacket *p) {
         assert(m);
         assert(p);
 
+        /* Let's see if this packet comes from an IP address we have on any local interface */
+
         return !!manager_find_link_address(m, p->family, &p->sender);
 }
 
diff --git a/src/resolve/resolved-manager.h b/src/resolve/resolved-manager.h
@@ -165,7 +165,7 @@ LinkAddress* manager_find_link_address(Manager *m, int family, const union in_ad
 void manager_refresh_rrs(Manager *m);
 int manager_next_hostname(Manager *m);
 
-bool manager_our_packet(Manager *m, DnsPacket *p);
+bool manager_packet_from_local_address(Manager *m, DnsPacket *p);
 DnsScope* manager_find_scope(Manager *m, DnsPacket *p);
 
 void manager_verify_all(Manager *m);
diff --git a/src/resolve/resolved-mdns.c b/src/resolve/resolved-mdns.c
@@ -254,7 +254,7 @@ static int on_mdns_packet(sd_event_source *s, int fd, uint32_t revents, void *us
         if (r <= 0)
                 return r;
 
-        if (manager_our_packet(m, p))
+        if (manager_packet_from_local_address(m, p))
                 return 0;
 
         scope = manager_find_scope(m, p);

Original file line number	Diff line number	Diff line change
`@@ -1126,7 +1126,7 @@ void dns_scope_check_conflicts(DnsScope scope, DnsPacket p) {`
`1126`	`1126`	`return;`
`1127`	`1127`	`}`
`1128`	`1128`
`1129`		`- if (manager_our_packet(scope->manager, p))`
	`1129`	`+ if (manager_packet_from_local_address(scope->manager, p))`
`1130`	`1130`	`return;`
`1131`	`1131`
`1132`	`1132`	`r = dns_packet_extract(p);`
Original file line number	Diff line number	Diff line change
`@@ -1255,10 +1255,12 @@ LinkAddress* manager_find_link_address(Manager *m, int family, const union in_ad`
`1255`	`1255`	`return NULL;`
`1256`	`1256`	`}`
`1257`	`1257`
`1258`		`-bool manager_our_packet(Manager m, DnsPacket p) {`
	`1258`	`+bool manager_packet_from_local_address(Manager m, DnsPacket p) {`
`1259`	`1259`	`assert(m);`
`1260`	`1260`	`assert(p);`
`1261`	`1261`
	`1262`	`+ /* Let's see if this packet comes from an IP address we have on any local interface */`
	`1263`	`+`
`1262`	`1264`	`return !!manager_find_link_address(m, p->family, &p->sender);`
`1263`	`1265`	`}`
`1264`	`1266`