From: David Gibson <david@gibson.dropbear.id.au>
To: passt-dev@passt.top, Stefano Brivio <sbrivio@redhat.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Subject: [PATCH 15/16] Clarify which addresses in ip[46]_ctx are meaningful where
Date: Wed, 14 Aug 2024 14:30:49 +1000 [thread overview]
Message-ID: <20240814043050.4177037-16-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20240814043050.4177037-1-david@gibson.dropbear.id.au>
Some are guest visible addresses and may not be valid on the host, others
are host visible addresses and may not be valid on the guest.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
passt.h | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/passt.h b/passt.h
index 5e7e6a04..06754bcc 100644
--- a/passt.h
+++ b/passt.h
@@ -104,15 +104,18 @@ enum passt_modes {
* @no_copy_addrs: Don't copy all addresses when configuring namespace
*/
struct ip4_ctx {
+ /* PIF_TAP addresses */
struct in_addr addr;
struct in_addr addr_seen;
int prefix_len;
struct in_addr gw;
struct in_addr dns[MAXNS + 1];
struct in_addr dns_match;
- struct in_addr dns_host;
+ /* PIF_HOST addresses */
+ struct in_addr dns_host;
struct in_addr addr_out;
+
char ifname_out[IFNAMSIZ];
bool no_copy_routes;
@@ -122,12 +125,12 @@ struct ip4_ctx {
/**
* struct ip6_ctx - IPv6 execution context
* @addr: IPv6 address assigned to guest
- * @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_ll_seen: Latest IPv6 link-local address seen as source from tap
* @gw: Default IPv6 gateway
* @dns: DNS addresses for DHCPv6 and NDP, zero-terminated
* @dns_match: Forward DNS query if sent to this address
+ * @our_tap_ll: Link-local IPv6 address for passt's use on tap
* @dns_host: Use this DNS on the host for forwarding
* @addr_out: Optional source address for outbound traffic
* @ifname_out: Optional interface name to bind outbound sockets to
@@ -135,16 +138,19 @@ struct ip4_ctx {
* @no_copy_addrs: Don't copy all addresses when configuring namespace
*/
struct ip6_ctx {
+ /* PIF_TAP addresses */
struct in6_addr addr;
- struct in6_addr our_tap_ll;
struct in6_addr addr_seen;
struct in6_addr addr_ll_seen;
struct in6_addr gw;
struct in6_addr dns[MAXNS + 1];
struct in6_addr dns_match;
- struct in6_addr dns_host;
+ /* PIF_HOST addresses */
+ struct in6_addr our_tap_ll;
+ struct in6_addr dns_host;
struct in6_addr addr_out;
+
char ifname_out[IFNAMSIZ];
bool no_copy_routes;
--
@@ -104,15 +104,18 @@ enum passt_modes {
* @no_copy_addrs: Don't copy all addresses when configuring namespace
*/
struct ip4_ctx {
+ /* PIF_TAP addresses */
struct in_addr addr;
struct in_addr addr_seen;
int prefix_len;
struct in_addr gw;
struct in_addr dns[MAXNS + 1];
struct in_addr dns_match;
- struct in_addr dns_host;
+ /* PIF_HOST addresses */
+ struct in_addr dns_host;
struct in_addr addr_out;
+
char ifname_out[IFNAMSIZ];
bool no_copy_routes;
@@ -122,12 +125,12 @@ struct ip4_ctx {
/**
* struct ip6_ctx - IPv6 execution context
* @addr: IPv6 address assigned to guest
- * @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_ll_seen: Latest IPv6 link-local address seen as source from tap
* @gw: Default IPv6 gateway
* @dns: DNS addresses for DHCPv6 and NDP, zero-terminated
* @dns_match: Forward DNS query if sent to this address
+ * @our_tap_ll: Link-local IPv6 address for passt's use on tap
* @dns_host: Use this DNS on the host for forwarding
* @addr_out: Optional source address for outbound traffic
* @ifname_out: Optional interface name to bind outbound sockets to
@@ -135,16 +138,19 @@ struct ip4_ctx {
* @no_copy_addrs: Don't copy all addresses when configuring namespace
*/
struct ip6_ctx {
+ /* PIF_TAP addresses */
struct in6_addr addr;
- struct in6_addr our_tap_ll;
struct in6_addr addr_seen;
struct in6_addr addr_ll_seen;
struct in6_addr gw;
struct in6_addr dns[MAXNS + 1];
struct in6_addr dns_match;
- struct in6_addr dns_host;
+ /* PIF_HOST addresses */
+ struct in6_addr our_tap_ll;
+ struct in6_addr dns_host;
struct in6_addr addr_out;
+
char ifname_out[IFNAMSIZ];
bool no_copy_routes;
--
2.46.0
next prev parent reply other threads:[~2024-08-14 4:31 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-14 4:30 [PATCH 00/16] Cleanups and fixes related to "our" addresses David Gibson
2024-08-14 4:30 ` [PATCH 01/16] conf: Don't ignore -t and -u options after -D David Gibson
2024-08-14 12:18 ` Stefano Brivio
2024-08-14 4:30 ` [PATCH 02/16] treewide: Use "our address" instead of "forwarding address" David Gibson
2024-08-14 4:30 ` [PATCH 03/16] util: Helper for formatting MAC addresses David Gibson
2024-08-14 4:30 ` [PATCH 04/16] treewide: Rename MAC address fields for clarity David Gibson
2024-08-14 4:30 ` [PATCH 05/16] treewide: Use struct assignment instead of memcpy() for IP addresses David Gibson
2024-08-14 4:30 ` [PATCH 06/16] conf: Use array indices rather than pointers for DNS array slots David Gibson
2024-08-14 4:30 ` [PATCH 07/16] conf: More accurately count entries added in get_dns() David Gibson
2024-08-14 4:30 ` [PATCH 08/16] conf: Move DNS array bounds checks into add_dns[46] David Gibson
2024-08-14 4:30 ` [PATCH 09/16] conf: Move adding of a nameserver from resolv.conf into subfunction David Gibson
2024-08-14 4:30 ` [PATCH 10/16] conf: Correct setting of dns_match address in add_dns6() David Gibson
2024-08-14 4:30 ` [PATCH 11/16] conf: Treat --dns addresses as guest visible addresses David Gibson
2024-08-14 4:30 ` [PATCH 12/16] conf: Remove incorrect initialisation of addr_ll_seen David Gibson
2024-08-14 4:30 ` [PATCH 13/16] util: Correct sock_l4() binding for link local addresses David Gibson
2024-08-14 4:30 ` [PATCH 14/16] treewide: Change misleading 'addr_ll' name David Gibson
2024-08-14 4:30 ` David Gibson [this message]
2024-08-14 4:30 ` [PATCH 16/16] Initialise our_tap_ll to ip6.gw when suitable David Gibson
2024-08-14 4:39 ` David Gibson
2024-08-14 5:03 ` [PATCH 00/16] Cleanups and fixes related to "our" addresses David Gibson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240814043050.4177037-16-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=passt-dev@passt.top \
--cc=sbrivio@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://passt.top/passt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).