return lxc generated name for veth pair

Doing a get_config_item for lxc.network.0.veth.pair only returns the pair name if explicitly given, but it can be useful to know the name even if it is the one that lxc autogenerated. Signed-off-by: Dwight Engen <dwight.engen@oracle.com> Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

return lxc generated name for veth pair
11029c02 · Dwight Engen · Serge Hallyn · 40650ea6 · 11029c02
Commit 11029c02 authored May 17, 2013 by Dwight Engen Committed by Serge Hallyn May 20, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

confile.c src/lxc/confile.c +6 -2

No files found.
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -1705,8 +1705,12 @@ static int lxc_get_item_nic(struct lxc_conf *c, char *retv, int inlen,
 			strprint(retv, inlen, "%s", mode);
 		}
 	} else if (strcmp(p1, "veth.pair") == 0) {
-		if (netdev->type == LXC_NET_VETH && netdev->priv.veth_attr.pair)
-			strprint(retv, inlen, "%s", netdev->priv.veth_attr.pair);
+		if (netdev->type == LXC_NET_VETH) {
+			strprint(retv, inlen, "%s",
+				 netdev->priv.veth_attr.pair ?
+				  netdev->priv.veth_attr.pair :
+				  netdev->priv.veth_attr.veth1);
+		}
 	} else if (strcmp(p1, "vlan") == 0) {
 		if (netdev->type == LXC_NET_VLAN) {
 			strprint(retv, inlen, "%d", netdev->priv.vlan_attr.vid);