aboutgitcodebugslistschat
path: root/conf.c
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2024-08-21 14:20:09 +1000
committerStefano Brivio <sbrivio@redhat.com>2024-08-21 12:00:16 +0200
commita42fb9c000ac760617d7db722c355d094c298018 (patch)
tree6c1d6302c5085a0b603ce63a79a44b149d12d6c4 /conf.c
parentc9f0ec3227d4861afe7dd8aa4c2eb55ed095586c (diff)
downloadpasst-a42fb9c000ac760617d7db722c355d094c298018.tar
passt-a42fb9c000ac760617d7db722c355d094c298018.tar.gz
passt-a42fb9c000ac760617d7db722c355d094c298018.tar.bz2
passt-a42fb9c000ac760617d7db722c355d094c298018.tar.lz
passt-a42fb9c000ac760617d7db722c355d094c298018.tar.xz
passt-a42fb9c000ac760617d7db722c355d094c298018.tar.zst
passt-a42fb9c000ac760617d7db722c355d094c298018.zip
treewide: Change misleading 'addr_ll' name
c->ip6.addr_ll is not like c->ip6.addr. The latter is an address for the guest, but the former is an address for our use on the tap link. Rename it accordingly, to 'our_tap_ll'. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Diffstat (limited to 'conf.c')
-rw-r--r--conf.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/conf.c b/conf.c
index e5b5263..1130ce5 100644
--- a/conf.c
+++ b/conf.c
@@ -713,7 +713,7 @@ static unsigned int conf_ip6(unsigned int ifi,
rc = nl_addr_get(nl_sock, ifi, AF_INET6,
IN6_IS_ADDR_UNSPECIFIED(&ip6->addr) ? &ip6->addr : NULL,
- &prefix_len, &ip6->addr_ll);
+ &prefix_len, &ip6->our_tap_ll);
if (rc < 0) {
err("Couldn't discover IPv6 address: %s", strerror(-rc));
return 0;
@@ -735,7 +735,7 @@ static unsigned int conf_ip6(unsigned int ifi,
}
if (IN6_IS_ADDR_UNSPECIFIED(&ip6->addr) ||
- IN6_IS_ADDR_UNSPECIFIED(&ip6->addr_ll))
+ IN6_IS_ADDR_UNSPECIFIED(&ip6->our_tap_ll))
return 0;
return ifi;
@@ -1027,7 +1027,8 @@ static void conf_print(const struct ctx *c)
info(" router: %s",
inet_ntop(AF_INET6, &c->ip6.gw, buf6, sizeof(buf6)));
info(" our link-local: %s",
- inet_ntop(AF_INET6, &c->ip6.addr_ll, buf6, sizeof(buf6)));
+ inet_ntop(AF_INET6, &c->ip6.our_tap_ll,
+ buf6, sizeof(buf6)));
dns6:
for (i = 0; !IN6_IS_ADDR_UNSPECIFIED(&c->ip6.dns[i]); i++) {