From: Dan Smith <danms@us.ibm.com>
Date: Thu, 7 Aug 2008 13:34:17 +0000 (+0000)
Subject: Fix device name clash in src/veth.c
X-Git-Tag: LIBVIRT_0_4_6~106
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e94c12451b41c211be04ff57e8db8850f786a4a0;p=thirdparty%2Flibvirt.git

Fix device name clash in src/veth.c
---

diff --git a/ChangeLog b/ChangeLog
index 78a8f213b7..63c17d498b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Aug  7 06:32:05 PDT 2008 Dan Smith <danms@us.ibm.com>
+
+	* src/veth.c: Fix assigned device name clash
+
 Wed Aug  7 15:02:06 CEST 2008 Jim Meyering <meyering@redhat.com>
 
 	add the mkstemp module from gnulib
diff --git a/src/veth.c b/src/veth.c
index c37f638df6..bb29b7cd03 100644
--- a/src/veth.c
+++ b/src/veth.c
@@ -92,17 +92,18 @@ int vethCreate(char* veth1, int veth1MaxLen,
 
     DEBUG("veth1: %s veth2: %s", veth1, veth2);
 
-    if (1 > strlen(veth1)) {
+    while ((1 > strlen(veth1)) || STREQ(veth1, veth2)) {
         vethDev = getFreeVethName(veth1, veth1MaxLen, 0);
         ++vethDev;
         DEBUG("assigned veth1: %s", veth1);
     }
 
-    if (1 > strlen(veth2)) {
+    while ((1 > strlen(veth2)) || STREQ(veth1, veth2)) {
         vethDev = getFreeVethName(veth2, veth2MaxLen, vethDev);
         DEBUG("assigned veth2: %s", veth2);
     }
 
+    DEBUG("veth1: %s veth2: %s", veth1, veth2);
     rc = virRun(NULL, (char**)argv, &cmdResult);
 
     if (0 == rc) {