babeld: fix eui64 features.

We are interested by eui64 with at least 6 octets.

diff --git a/babeld/babel_main.c b/babeld/babel_main.c
index 4d6f60eb756c78532aee0fb596845b6569aa587f..c039c880e3f527dfac97caf9e3852c639a9e4fe0 100644 (file)
--- a/babeld/babel_main.c
+++ b/babeld/babel_main.c
@@ -423,7 +423,9 @@ babel_load_state_file(void)
                     if(memcmp(sid, myid, 8) == 0)
                         myseqno = seqno_plus(s, 1);
                     else
-                        zlog_err("ID mismatch in babel-state.");
+                        zlog_err("ID mismatch in babel-state. id=%s; old=%s",
+                                 format_eui64(myid),
+                                 format_eui64(sid));
                     /* Convert realtime into monotonic time. */
                     if(t >= 1176800000L && t <= realnow.tv_sec)
                         reboot_time = babel_now.tv_sec - (realnow.tv_sec - t);

diff --git a/babeld/kernel_zebra.c b/babeld/kernel_zebra.c
index d556a605dde3c8ca1748b68c90bedb91f9b55870..97b7c5846840e318547c9decd093aca6f25eded5 100644 (file)
--- a/babeld/kernel_zebra.c
+++ b/babeld/kernel_zebra.c
@@ -371,11 +371,6 @@ if_eui64(char *ifname, int ifindex, unsigned char *eui)
         eui[3] = 0xFF;
         eui[4] = 0xFE;
         memcpy(eui+5, tmp+3, 3);
-    } else if (len > 8) {
-        memcpy(eui, tmp, 8);
-    } else if (len > 0){
-        memset(eui, 0, 8 - len);
-        memcpy(eui + 8 - len, tmp, len);
     } else {
         return -1;
     }