Changeset 4255

Timestamp:

08/18/08 13:07:26 (5 months ago)

Author:

martin

Message:

roam jobs for routing table changes not fired for virtual IP routes

Files:

• trunk/src/charon/kernel/kernel_interface.c (modified) (4 diffs)

trunk/src/charon/kernel/kernel_interface.c

@@ -654 +654 @@
-
-/**
+ * get the refcount of a virtual ip
+ */
+static int get_vip_refcount(private_kernel_interface_t *this, host_t* ip)
+{
+    iterator_t *ifaces, *addrs;
+    iface_entry_t *iface;
+    addr_entry_t *addr;
+    int refcount = 0;
+    
+    ifaces = this->ifaces->create_iterator(this->ifaces, TRUE);
+    while (ifaces->iterate(ifaces, (void**)&iface))
+    {
+        addrs = iface->addrs->create_iterator(iface->addrs, TRUE);
+        while (addrs->iterate(addrs, (void**)&addr))
+        {
+            if (addr->virtual && (iface->flags & IFF_UP) &&
+                ip->ip_equals(ip, addr->ip))
+            {
+                refcount = addr->refcount;
+                break;
+            }
+        }
+        addrs->destroy(addrs);
+        if (refcount)
+        {
+            break;
+        }
+    }
+    ifaces->destroy(ifaces);
+    
+    return refcount;
+}
+
+/**
- * process RTM_NEWLINK/RTM_DELLINK from kernel
- */
@@ -869 +903 @@
-
-/**
+ * process RTM_NEWROUTE from kernel
+ */
+static void process_route(private_kernel_interface_t *this, struct nlmsghdr *hdr)
+{
+    struct rtmsg* msg = (struct rtmsg*)(NLMSG_DATA(hdr));
+    struct rtattr *rta = RTM_RTA(msg);
+    size_t rtasize = RTM_PAYLOAD(hdr);
+    host_t *host = NULL;
+    
+    while(RTA_OK(rta, rtasize))
+    {
+        switch (rta->rta_type)
+        {
+            case RTA_PREFSRC:
+                host = host_create_from_chunk(msg->rtm_family,
+                            chunk_create(RTA_DATA(rta), RTA_PAYLOAD(rta)), 0);
+                break;
+        }
+        rta = RTA_NEXT(rta, rtasize);
+    }
+    if (host)
+    {
+        if (!get_vip_refcount(this, host))
+        {   /* ignore routes added for virtual IPs */
+            fire_roam_job(this, FALSE);
+        }
+        host->destroy(host);
+    }
+}
+
+/**
- * Receives events from kernel
- */
@@ -962 +1027 @@
-                case RTM_NEWROUTE:
-                case RTM_DELROUTE:
-
-
+
-                    break;
-                default:
@@ -1432 +1496 @@
-    }
-    return ifindex;
-}
-
-/**
- * get the refcount of a virtual ip
- */
-static int get_vip_refcount(private_kernel_interface_t *this, host_t* ip)
-{
-    iterator_t *ifaces, *addrs;
-    iface_entry_t *iface;
-    addr_entry_t *addr;
-    int refcount = 0;
-    
-    ifaces = this->ifaces->create_iterator(this->ifaces, TRUE);
-    while (ifaces->iterate(ifaces, (void**)&iface))
-    {
-        addrs = iface->addrs->create_iterator(iface->addrs, TRUE);
-        while (addrs->iterate(addrs, (void**)&addr))
-        {
-            if (addr->virtual && (iface->flags & IFF_UP) &&
-                ip->ip_equals(ip, addr->ip))
-            {
-                refcount = addr->refcount;
-                break;
-            }
-        }
-        addrs->destroy(addrs);
-        if (refcount)
-        {
-            break;
-        }
-    }
-    ifaces->destroy(ifaces);
-    
-    return refcount;
-}
-