rtnetlink: Extend rtnetlink to support RTNLGRP_IPV4_IFADDR and

RTNLGRP_IPV6_IFADDR.

This commit renames the rtnetlink-link.{c,h} to rtnetlink.{c,h}
and extends the module to support RTNLGRP_IPV4_IFADDR and
RTNLGRP_IPV4_IFADDR multicast groups.  A later patch will start
using this module to react to interface address changes.

Signed-off-by: Alex Wang <[email protected]>
Acked-by: Ben Pfaff <[email protected]>

lib/automake.mk

@@ -347,8 +347,8 @@ lib_libopenvswitch_la_SOURCES += \
 	lib/netlink-socket.h \
 	lib/ovs-numa.c \
 	lib/ovs-numa.h \
-	lib/rtnetlink-link.c \
-	lib/rtnetlink-link.h \
+	lib/rtnetlink.c \
+	lib/rtnetlink.h \
 	lib/route-table.c \
 	lib/route-table.h
 endif

lib/netdev-linux.c

@@ -66,7 +66,7 @@
 #include "ovs-atomic.h"
 #include "packets.h"
 #include "poll-loop.h"
-#include "rtnetlink-link.h"
+#include "rtnetlink.h"
 #include "shash.h"
 #include "socket-util.h"
 #include "sset.h"
@@ -541,7 +541,7 @@ netdev_rxq_linux_cast(const struct netdev_rxq *rx)
 }
 
 static void netdev_linux_update(struct netdev_linux *netdev,
-                                const struct rtnetlink_link_change *)
+                                const struct rtnetlink_change *)
     OVS_REQUIRES(netdev->mutex);
 static void netdev_linux_changed(struct netdev_linux *netdev,
                                  unsigned int ifi_flags, unsigned int mask)
@@ -601,9 +601,9 @@ netdev_linux_run(void)
         ofpbuf_use_stub(&buf, buf_stub, sizeof buf_stub);
         error = nl_sock_recv(sock, &buf, false);
         if (!error) {
-            struct rtnetlink_link_change change;
+            struct rtnetlink_change change;
 
-            if (rtnetlink_link_parse(&buf, &change)) {
+            if (rtnetlink_parse(&buf, &change)) {
                 struct netdev *netdev_ = netdev_from_name(change.ifname);
                 if (netdev_ && is_netdev_linux_class(netdev_->netdev_class)) {
                     struct netdev_linux *netdev = netdev_linux_cast(netdev_);
@@ -674,7 +674,7 @@ netdev_linux_changed(struct netdev_linux *dev,
 
 static void
 netdev_linux_update(struct netdev_linux *dev,
-                    const struct rtnetlink_link_change *change)
+                    const struct rtnetlink_change *change)
     OVS_REQUIRES(dev->mutex)
 {
     if (change->nlmsg_type == RTM_NEWLINK) {
@@ -694,10 +694,9 @@ netdev_linux_update(struct netdev_linux *dev,
             dev->ether_addr_error = 0;
         }
 
-        dev->ifindex = change->ifi_index;
+        dev->ifindex = change->if_index;
         dev->cache_valid |= VALID_IFINDEX;
         dev->get_ifindex_error = 0;
-
     } else {
         netdev_linux_changed(dev, change->ifi_flags, 0);
     }

lib/route-table.c

@@ -30,7 +30,7 @@
 #include "netlink-socket.h"
 #include "ofpbuf.h"
 #include "ovs-router.h"
-#include "rtnetlink-link.h"
+#include "rtnetlink.h"
 #include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(route_table);
@@ -74,7 +74,7 @@ static void route_table_change(const struct route_table_msg *, void *);
 static void route_map_clear(void);
 
 static void name_table_init(void);
-static void name_table_change(const struct rtnetlink_link_change *, void *);
+static void name_table_change(const struct rtnetlink_change *, void *);
 
 uint64_t
 route_table_get_change_seq(void)
@@ -113,7 +113,7 @@ route_table_run(void)
 {
     ovs_mutex_lock(&route_table_mutex);
     if (nln) {
-        rtnetlink_link_run();
+        rtnetlink_run();
         nln_run(nln);
 
         if (!route_table_valid) {
@@ -130,7 +130,7 @@ route_table_wait(void)
 {
     ovs_mutex_lock(&route_table_mutex);
     if (nln) {
-        rtnetlink_link_wait();
+        rtnetlink_wait();
         nln_wait(nln);
     }
     ovs_mutex_unlock(&route_table_mutex);
@@ -278,12 +278,12 @@ route_table_fallback_lookup(ovs_be32 ip_dst OVS_UNUSED,
 static void
 name_table_init(void)
 {
-    name_notifier = rtnetlink_link_notifier_create(name_table_change, NULL);
+    name_notifier = rtnetlink_notifier_create(name_table_change, NULL);
 }
 
 
 static void
-name_table_change(const struct rtnetlink_link_change *change OVS_UNUSED,
+name_table_change(const struct rtnetlink_change *change OVS_UNUSED,
                   void *aux OVS_UNUSED)
 {
     /* Changes to interface status can cause routing table changes that some