External/passt
1
0
Fork 0
mirror of https://passt.top/passt synced 2024-12-22 13:45:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

treewide: Change misleading 'addr_ll' name

Browse Source 
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>
This commit is contained in:
David Gibson 2024-08-21 14:20:09 +10:00 committed by Stefano Brivio
parent c9f0ec3227
commit a42fb9c000
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
conf.c
View File

@ -713,7 +713,7 @@ static unsigned int conf_ip6(unsigned int ifi,
rc = nl_addr_get(nl_sock, ifi, AF_INET6, rc = nl_addr_get(nl_sock, ifi, AF_INET6,
IN6_IS_ADDR_UNSPECIFIED(&ip6->addr) ? &ip6->addr : NULL, IN6_IS_ADDR_UNSPECIFIED(&ip6->addr) ? &ip6->addr : NULL,
&prefix_len, &ip6->addr_ll); &prefix_len, &ip6->our_tap_ll);
if (rc < 0) { if (rc < 0) {
err("Couldn't discover IPv6 address: %s", strerror(-rc)); err("Couldn't discover IPv6 address: %s", strerror(-rc));
return 0; return 0;
@ -735,7 +735,7 @@ static unsigned int conf_ip6(unsigned int ifi,
} }
if (IN6_IS_ADDR_UNSPECIFIED(&ip6->addr) || 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 0;
return ifi; return ifi;
@ -1027,7 +1027,8 @@ static void conf_print(const struct ctx *c)
info(" router: %s", info(" router: %s",
inet_ntop(AF_INET6, &c->ip6.gw, buf6, sizeof(buf6))); inet_ntop(AF_INET6, &c->ip6.gw, buf6, sizeof(buf6)));
info(" our link-local: %s", 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: dns6:
for (i = 0; !IN6_IS_ADDR_UNSPECIFIED(&c->ip6.dns[i]); i++) { for (i = 0; !IN6_IS_ADDR_UNSPECIFIED(&c->ip6.dns[i]); i++) {

2
dhcpv6.c
View File

@ -456,7 +456,7 @@ int dhcpv6(struct ctx *c, const struct pool *p,
if (IN6_IS_ADDR_LINKLOCAL(&c->ip6.gw)) if (IN6_IS_ADDR_LINKLOCAL(&c->ip6.gw))
src = &c->ip6.gw; src = &c->ip6.gw;
else else
src = &c->ip6.addr_ll; src = &c->ip6.our_tap_ll;
mh = packet_get(p, 0, sizeof(*uh), sizeof(*mh), NULL); mh = packet_get(p, 0, sizeof(*uh), sizeof(*mh), NULL);
if (!mh) if (!mh)

2
fwd.c
View File

@ -320,7 +320,7 @@ uint8_t fwd_nat_from_host(const struct ctx *c, uint8_t proto,
if (IN6_IS_ADDR_LINKLOCAL(&c->ip6.gw)) if (IN6_IS_ADDR_LINKLOCAL(&c->ip6.gw))
tgt->oaddr.a6 = c->ip6.gw; tgt->oaddr.a6 = c->ip6.gw;
else else
tgt->oaddr.a6 = c->ip6.addr_ll; tgt->oaddr.a6 = c->ip6.our_tap_ll;
} }
if (inany_v4(&tgt->oaddr)) { if (inany_v4(&tgt->oaddr)) {

2
ndp.c
View File

@ -344,7 +344,7 @@ dns_done:
if (IN6_IS_ADDR_LINKLOCAL(&c->ip6.gw)) if (IN6_IS_ADDR_LINKLOCAL(&c->ip6.gw))
rsaddr = &c->ip6.gw; rsaddr = &c->ip6.gw;
else else
rsaddr = &c->ip6.addr_ll; rsaddr = &c->ip6.our_tap_ll;
if (ih->icmp6_type == NS) { if (ih->icmp6_type == NS) {
dlen = sizeof(struct ndp_na); dlen = sizeof(struct ndp_na);

4
passt.h
View File

@ -122,7 +122,7 @@ struct ip4_ctx {
/** /**
* struct ip6_ctx - IPv6 execution context * struct ip6_ctx - IPv6 execution context
* @addr: IPv6 address assigned to guest * @addr: IPv6 address assigned to guest
* @addr_ll: Link-local IPv6 address on external, routable interface * @our_tap_ll: Link-local IPv6 address for passt's use on tap
* @addr_seen: Latest IPv6 global/site address seen as source from tap * @addr_seen: Latest IPv6 global/site address seen as source from tap
* @addr_ll_seen: Latest IPv6 link-local address seen as source from tap * @addr_ll_seen: Latest IPv6 link-local address seen as source from tap
* @gw: Default IPv6 gateway * @gw: Default IPv6 gateway
@ -136,7 +136,7 @@ struct ip4_ctx {
*/ */
struct ip6_ctx { struct ip6_ctx {
struct in6_addr addr; struct in6_addr addr;
struct in6_addr addr_ll; struct in6_addr our_tap_ll;
struct in6_addr addr_seen; struct in6_addr addr_seen;
struct in6_addr addr_ll_seen; struct in6_addr addr_ll_seen;
struct in6_addr gw; struct in6_addr gw;