aboutgitcodebugslistschat
diff options
context:
space:
mode:
-rw-r--r--conf.c11
-rw-r--r--passt.h4
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