Fix device name clash in src/veth.c

diff --git a/ChangeLog b/ChangeLog
index 78a8f213b7701954502eb0a6cd7c99520907b000..63c17d498b9fef0a63d7f6d94b1234ba497c9bb8 100644 (file)
--- 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 c37f638df69504ccb90771d69bc2f85beaab6bb7..bb29b7cd03e4c3e42277b3844aeb2b5cd60be4ac 100644 (file)
--- 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) {