mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

conf, passt.h: Rename "outbound" interface to "template" interface

Browse source 
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>
This commit is contained in:
Stefano Brivio 2023-03-07 19:23:18 +01:00
parent d361fe6e80
commit 70148ce5be
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
conf.c
View file

@ -903,10 +903,13 @@ static void conf_print(const struct ctx *c)
char buf4[INET_ADDRSTRLEN], ifn[IFNAMSIZ]; char buf4[INET_ADDRSTRLEN], ifn[IFNAMSIZ];
int i; int i;
if (c->ifi4) info("Template interface: %s%s%s%s%s",
info("Outbound interface (IPv4): %s", if_indextoname(c->ifi4, ifn)); c->ifi4 ? if_indextoname(c->ifi4, ifn) : "",
if (c->ifi6) c->ifi4 ? " (IPv4)" : "",
info("Outbound interface (IPv6): %s", if_indextoname(c->ifi6, ifn)); (c->ifi4 && c->ifi6) ? ", " : "",
c->ifi6 ? if_indextoname(c->ifi6, ifn) : "",
c->ifi6 ? " (IPv6)" : "");
if (c->mode == MODE_PASTA) if (c->mode == MODE_PASTA)
info("Namespace interface: %s", c->pasta_ifn); info("Namespace interface: %s", c->pasta_ifn);

4
passt.h
View file

@ -164,10 +164,10 @@ struct ip6_ctx {
* @fd_tap: AF_UNIX socket, tuntap device, or pre-opened socket * @fd_tap: AF_UNIX socket, tuntap device, or pre-opened socket
* @mac: Host MAC address * @mac: Host MAC address
* @mac_guest: MAC address of guest or namespace, seen or configured * @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 * @ip: IPv4 configuration
* @dns_search: DNS search list * @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 * @ip6: IPv6 configuration
* @pasta_ifn: Name of namespace interface for pasta * @pasta_ifn: Name of namespace interface for pasta
* @pasta_ifn: Index of namespace interface for pasta * @pasta_ifn: Index of namespace interface for pasta