netdev-dpdk: fix mbuf leaks

[cascardo/ovs.git] / lib / route-table.c

diff --git a/lib/route-table.c b/lib/route-table.c
index 7d1837c..9dc2038 100644 (file)
--- a/lib/route-table.c
+++ b/lib/route-table.c
@@ -30,6 +30,7 @@
 #include "netlink-socket.h"
 #include "ofpbuf.h"
 #include "ovs-router.h"
+#include "packets.h"
 #include "rtnetlink.h"
 #include "openvswitch/vlog.h"
 
@@ -40,8 +41,8 @@ struct route_data {
     unsigned char rtm_dst_len;
 
     /* Extracted from Netlink attributes. */
-    ovs_be32 rta_dst; /* 0 if missing. */
-    ovs_be32 rta_gw;
+    struct in6_addr rta_dst; /* 0 if missing. */
+    struct in6_addr rta_gw;
     char ifname[IFNAMSIZ]; /* Interface name. */
 };
 
@@ -61,8 +62,10 @@ static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20);
 static uint64_t rt_change_seq;
 
 static struct nln *nln = NULL;
+static struct nln *nln6 = NULL;
 static struct route_table_msg rtmsg;
 static struct nln_notifier *route_notifier = NULL;
+static struct nln_notifier *route6_notifier = NULL;
 static struct nln_notifier *name_notifier = NULL;
 
 static bool route_table_valid = false;
@@ -90,15 +93,22 @@ route_table_init(void)
 {
     ovs_mutex_lock(&route_table_mutex);
     ovs_assert(!nln);
+    ovs_assert(!nln6);
     ovs_assert(!route_notifier);
+    ovs_assert(!route6_notifier);
 
     ovs_router_init();
     nln = nln_create(NETLINK_ROUTE, RTNLGRP_IPV4_ROUTE,
                      (nln_parse_func *) route_table_parse, &rtmsg);
+    nln6 = nln_create(NETLINK_ROUTE, RTNLGRP_IPV6_ROUTE,
+                      (nln_parse_func *) route_table_parse, &rtmsg);
 
     route_notifier =
         nln_notifier_create(nln, (nln_notify_func *) route_table_change,
                             NULL);
+    route6_notifier =
+        nln_notifier_create(nln6, (nln_notify_func *) route_table_change,
+                            NULL);
 
     route_table_reset();
     name_table_init();
@@ -112,9 +122,14 @@ route_table_run(void)
     OVS_EXCLUDED(route_table_mutex)
 {
     ovs_mutex_lock(&route_table_mutex);
-    if (nln) {
+    if (nln || nln6) {
         rtnetlink_run();
-        nln_run(nln);
+        if (nln) {
+            nln_run(nln);
+        }
+        if (nln6) {
+            nln_run(nln6);
+        }
 
         if (!route_table_valid) {
             route_table_reset();
@@ -129,9 +144,14 @@ route_table_wait(void)
     OVS_EXCLUDED(route_table_mutex)
 {
     ovs_mutex_lock(&route_table_mutex);
-    if (nln) {
+    if (nln || nln6) {
         rtnetlink_wait();
-        nln_wait(nln);
+        if (nln) {
+            nln_wait(nln);
+        }
+        if (nln6) {
+            nln_wait(nln6);
+        }
     }
     ovs_mutex_unlock(&route_table_mutex);
 }
@@ -153,7 +173,7 @@ route_table_reset(void)
     nl_msg_put_nlmsghdr(&request, sizeof *rtmsg, RTM_GETROUTE, NLM_F_REQUEST);
 
     rtmsg = ofpbuf_put_zeros(&request, sizeof *rtmsg);
-    rtmsg->rtgen_family = AF_INET;
+    rtmsg->rtgen_family = AF_UNSPEC;
 
     nl_dump_start(&dump, NETLINK_ROUTE, &request);
     ofpbuf_uninit(&request);
@@ -171,11 +191,10 @@ route_table_reset(void)
     return nl_dump_done(&dump);
 }
 
-
 static bool
 route_table_parse(struct ofpbuf *buf, struct route_table_msg *change)
 {
-    bool parsed;
+    bool parsed, ipv4 = false;
 
     static const struct nl_policy policy[] = {
         [RTA_DST] = { .type = NL_A_U32, .optional = true  },
@@ -183,23 +202,34 @@ route_table_parse(struct ofpbuf *buf, struct route_table_msg *change)
         [RTA_GATEWAY] = { .type = NL_A_U32, .optional = true },
     };
 
+    static const struct nl_policy policy6[] = {
+        [RTA_DST] = { .type = NL_A_IPV6, .optional = true },
+        [RTA_OIF] = { .type = NL_A_U32, .optional = true },
+        [RTA_GATEWAY] = { .type = NL_A_IPV6, .optional = true },
+    };
+
     struct nlattr *attrs[ARRAY_SIZE(policy)];
+    const struct rtmsg *rtm;
+
+    rtm = ofpbuf_at(buf, NLMSG_HDRLEN, sizeof *rtm);
 
-    parsed = nl_policy_parse(buf, NLMSG_HDRLEN + sizeof(struct rtmsg),
-                             policy, attrs, ARRAY_SIZE(policy));
+    if (rtm->rtm_family == AF_INET) {
+        parsed = nl_policy_parse(buf, NLMSG_HDRLEN + sizeof(struct rtmsg),
+                                 policy, attrs, ARRAY_SIZE(policy));
+        ipv4 = true;
+    } else if (rtm->rtm_family == AF_INET6) {
+        parsed = nl_policy_parse(buf, NLMSG_HDRLEN + sizeof(struct rtmsg),
+                                 policy6, attrs, ARRAY_SIZE(policy6));
+    } else {
+        VLOG_DBG_RL(&rl, "received non AF_INET rtnetlink route message");
+        return false;
+    }
 
     if (parsed) {
-        const struct rtmsg *rtm;
         const struct nlmsghdr *nlmsg;
         int rta_oif;      /* Output interface index. */
 
         nlmsg = buf->data;
-        rtm = ofpbuf_at(buf, NLMSG_HDRLEN, sizeof *rtm);
-
-        if (rtm->rtm_family != AF_INET) {
-            VLOG_DBG_RL(&rl, "received non AF_INET rtnetlink route message");
-            return false;
-        }
 
         memset(change, 0, sizeof *change);
         change->relevant = true;
@@ -213,22 +243,38 @@ route_table_parse(struct ofpbuf *buf, struct route_table_msg *change)
             change->relevant = false;
         }
         change->nlmsg_type     = nlmsg->nlmsg_type;
-        change->rd.rtm_dst_len = rtm->rtm_dst_len;
-        rta_oif = nl_attr_get_u32(attrs[RTA_OIF]);
+        change->rd.rtm_dst_len = rtm->rtm_dst_len + (ipv4 ? 96 : 0);
+        if (attrs[RTA_OIF]) {
+            rta_oif = nl_attr_get_u32(attrs[RTA_OIF]);
 
-        if (!if_indextoname(rta_oif, change->rd.ifname)) {
-            int error = errno;
+            if (!if_indextoname(rta_oif, change->rd.ifname)) {
+                int error = errno;
 
-            VLOG_DBG_RL(&rl, "Could not find interface name[%u]: %s",
-                        rta_oif, ovs_strerror(error));
-            return false;
+                VLOG_DBG_RL(&rl, "Could not find interface name[%u]: %s",
+                            rta_oif, ovs_strerror(error));
+                return false;
+            }
         }
 
         if (attrs[RTA_DST]) {
-            change->rd.rta_dst = nl_attr_get_be32(attrs[RTA_DST]);
+            if (ipv4) {
+                ovs_be32 dst;
+                dst = nl_attr_get_be32(attrs[RTA_DST]);
+                in6_addr_set_mapped_ipv4(&change->rd.rta_dst, dst);
+            } else {
+                change->rd.rta_dst = nl_attr_get_in6_addr(attrs[RTA_DST]);
+            }
+        } else if (ipv4) {
+            in6_addr_set_mapped_ipv4(&change->rd.rta_dst, 0);
         }
         if (attrs[RTA_GATEWAY]) {
-            change->rd.rta_gw = nl_attr_get_be32(attrs[RTA_GATEWAY]);
+            if (ipv4) {
+                ovs_be32 gw;
+                gw = nl_attr_get_be32(attrs[RTA_GATEWAY]);
+                in6_addr_set_mapped_ipv4(&change->rd.rta_gw, gw);
+            } else {
+                change->rd.rta_gw = nl_attr_get_in6_addr(attrs[RTA_GATEWAY]);
+            }
         }
 
 
@@ -252,8 +298,8 @@ route_table_handle_msg(const struct route_table_msg *change)
     if (change->relevant && change->nlmsg_type == RTM_NEWROUTE) {
         const struct route_data *rd = &change->rd;
 
-        ovs_router_insert(rd->rta_dst, rd->rtm_dst_len,
-                          rd->ifname, rd->rta_gw);
+        ovs_router_insert(&rd->rta_dst, rd->rtm_dst_len,
+                          rd->ifname, &rd->rta_gw);
     }
 }