From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by passt.top (Postfix, from userid 1000) id C465A5A026E; Wed, 8 Mar 2023 08:34:49 +0100 (CET) From: Stefano Brivio To: passt-dev@passt.top Subject: [PATCH 1/2] conf, passt.h: Rename "outbound" interface to "template" interface Date: Wed, 8 Mar 2023 08:34:48 +0100 Message-Id: <20230308073449.2189570-2-sbrivio@redhat.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230308073449.2189570-1-sbrivio@redhat.com> References: <20230308073449.2189570-1-sbrivio@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: ZZNZ4IJRIB5UAMWQQTFVNCC4BZ55Z7EK X-Message-ID-Hash: ZZNZ4IJRIB5UAMWQQTFVNCC4BZ55Z7EK X-MailFrom: sbrivio@passt.top X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: 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 --- 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 -- 2.39.2