+ fix the bug reported by Milan Kocian (IPv6 route handling was broken by the RIB...

after

diff --git a/zebra/ChangeLog b/zebra/ChangeLog
index 0b5cefecff6544772d65d5a7ac353103911e55a1..e152729d3ce00d66134db60b3e29d78d638c78bf 100644 (file)
--- a/zebra/ChangeLog
+++ b/zebra/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-24 Denis Ovsienko
+
+       * kernel_socket.c: (rtm_read) we used to ignore own messages,
+         but the RIB debug commit broke it for IPv6 case (reported
+         by Milan Kocian). Fixed.
+
 2007-10-04 Denis Ovsienko
 
        * zebra_rib.c: (rib_process) escape from the nexthop

diff --git a/zebra/kernel_socket.c b/zebra/kernel_socket.c
index cb23bf9fbe1640bd4476ead20cbab5d22788b351..a91d76f593430ab36f42fc7b6c7e9c2511facaf5 100644 (file)
--- a/zebra/kernel_socket.c
+++ b/zebra/kernel_socket.c
@@ -884,6 +884,11 @@ rtm_read (struct rt_msghdr *rtm)
 #ifdef HAVE_IPV6
   if (dest.sa.sa_family == AF_INET6)
     {
+      /* One day we might have a debug section here like one in the
+       * IPv4 case above. Just ignore own messages at the moment.
+       */
+      if (rtm->rtm_type != RTM_GET && rtm->rtm_pid == pid)
+        return;
       struct prefix_ipv6 p;
       unsigned int ifindex = 0;