Re: [PATCH 1/2] conf, passt.h: Rename "outbound" interface to "template" interface

[David Gibson <david@gibson.dropbear.id.au>]

[-- Attachment #1: Type: text/plain, Size: 2505 bytes --]

On Wed, Mar 08, 2023 at 08:34:48AM +0100, Stefano Brivio wrote:
> In preparation for the next patch, make it clear that the first
> routable interface fetched via netlink, or the one configured via
> -i/--interface, is simply used as template to copy addresses and
> routes, not an interface we actually use to derive the source address
> (which will be _bound to_) for outgoing packets.
> 
> The man page and usage message appear to be already clear enough.
> 
> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>

> ---
>  conf.c  | 11 +++++++----
>  passt.h |  4 ++--
>  2 files changed, 9 insertions(+), 6 deletions(-)
> 
> diff --git a/conf.c b/conf.c
> index 0e512f4..3aa3314 100644
> --- a/conf.c
> +++ b/conf.c
> @@ -903,10 +903,13 @@ static void conf_print(const struct ctx *c)
>  	char buf4[INET_ADDRSTRLEN], ifn[IFNAMSIZ];
>  	int i;
>  
> -	if (c->ifi4)
> -		info("Outbound interface (IPv4): %s", if_indextoname(c->ifi4, ifn));
> -	if (c->ifi6)
> -		info("Outbound interface (IPv6): %s", if_indextoname(c->ifi6, ifn));
> +	info("Template interface: %s%s%s%s%s",
> +	     c->ifi4 ? if_indextoname(c->ifi4, ifn) : "",
> +	     c->ifi4 ? " (IPv4)" : "",
> +	     (c->ifi4 && c->ifi6) ? ", " : "",
> +	     c->ifi6 ? if_indextoname(c->ifi6, ifn) : "",
> +	     c->ifi6 ? " (IPv6)" : "");
> +
>  	if (c->mode == MODE_PASTA)
>  		info("Namespace interface: %s", c->pasta_ifn);
>  
> diff --git a/passt.h b/passt.h
> index e0383eb..cc60c84 100644
> --- a/passt.h
> +++ b/passt.h
> @@ -164,10 +164,10 @@ struct ip6_ctx {
>   * @fd_tap:		AF_UNIX socket, tuntap device, or pre-opened socket
>   * @mac:		Host MAC address
>   * @mac_guest:		MAC address of guest or namespace, seen or configured
> - * @ifi4:		Index of routable interface for IPv4, 0 if IPv4 disabled
> + * @ifi4:		Index of template interface for IPv4, 0 if IPv4 disabled
>   * @ip:			IPv4 configuration
>   * @dns_search:		DNS search list
> - * @ifi6:		Index of routable interface for IPv6, 0 if IPv6 disabled
> + * @ifi6:		Index of template interface for IPv6, 0 if IPv6 disabled
>   * @ip6:		IPv6 configuration
>   * @pasta_ifn:		Name of namespace interface for pasta
>   * @pasta_ifn:		Index of namespace interface for pasta

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]