util: new files virnetdevip.[ch] for IP-related netdev functions

This patch splits virnetdev.[ch] into multiple files, with the new
virnetdevip.[ch] containing all the functions related to setting and
retrieving IP-related info for a device (both addresses and routes).

po/POTFILES.in

@@ -213,6 +213,7 @@ src/util/virlog.c
 src/util/virnetdev.c
 src/util/virnetdevbandwidth.c
 src/util/virnetdevbridge.c
+src/util/virnetdevip.c
 src/util/virnetdevmacvlan.c
 src/util/virnetdevmidonet.c
 src/util/virnetdevopenvswitch.c

src/Makefile.am

@@ -138,6 +138,7 @@ UTIL_SOURCES =							\
 		util/virnetdev.h util/virnetdev.c		\
 		util/virnetdevbandwidth.h util/virnetdevbandwidth.c \
 		util/virnetdevbridge.h util/virnetdevbridge.c	\
+		util/virnetdevip.h util/virnetdevip.c		\
 		util/virnetdevmacvlan.c util/virnetdevmacvlan.h	\
 		util/virnetdevmidonet.h util/virnetdevmidonet.c \
 		util/virnetdevopenvswitch.h util/virnetdevopenvswitch.c \

src/libvirt_private.syms

@@ -1856,15 +1856,12 @@ virMacAddrSetRaw;
 
 # util/virnetdev.h
 virNetDevAddMulti;
-virNetDevAddRoute;
-virNetDevClearIPAddress;
 virNetDevDelMulti;
 virNetDevExists;
 virNetDevFeatureTypeFromString;
 virNetDevFeatureTypeToString;
 virNetDevGetFeatures;
 virNetDevGetIndex;
-virNetDevGetIPAddress;
 virNetDevGetLinkInfo;
 virNetDevGetMAC;
 virNetDevGetMTU;
@@ -1890,7 +1887,6 @@ virNetDevRxFilterFree;
 virNetDevRxFilterModeTypeFromString;
 virNetDevRxFilterModeTypeToString;
 virNetDevRxFilterNew;
-virNetDevSetIPAddress;
 virNetDevSetMAC;
 virNetDevSetMTU;
 virNetDevSetMTUFromDevice;
@@ -1903,7 +1899,6 @@ virNetDevSetRcvMulti;
 virNetDevSetupControl;
 virNetDevSysfsFile;
 virNetDevValidateConfig;
-virNetDevWaitDadFinish;
 
 
 # util/virnetdevbandwidth.h
@@ -1937,6 +1932,14 @@ virNetDevBridgeSetSTPDelay;
 virNetDevBridgeSetVlanFiltering;
 
 
+# util/virnetdevip.h
+virNetDevIPAddrAdd;
+virNetDevIPAddrDel;
+virNetDevIPAddrGet;
+virNetDevIPRouteAdd;
+virNetDevIPWaitDadFinish;
+
+
 # util/virnetdevmacvlan.h
 virNetDevMacVLanCreate;
 virNetDevMacVLanCreateWithVPortProfile;

src/lxc/lxc_container.c

@@ -66,7 +66,7 @@
 #include "virfile.h"
 #include "virusb.h"
 #include "vircommand.h"
-#include "virnetdev.h"
+#include "virnetdevip.h"
 #include "virprocess.h"
 #include "virstring.h"
 
@@ -528,7 +528,7 @@ static int lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef,
 
             VIR_DEBUG("Adding IP address '%s/%d' to '%s'",
                       ipStr, prefix, newname);
-            if (virNetDevSetIPAddress(newname, &ip->address, NULL, prefix) < 0) {
+            if (virNetDevIPAddrAdd(newname, &ip->address, NULL, prefix) < 0) {
                 virReportError(VIR_ERR_SYSTEM_ERROR,
                                _("Failed to set IP address '%s' on %s"),
                                ipStr, newname);
@@ -549,11 +549,11 @@ static int lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef,
             for (j = 0; j < netDef->nroutes; j++) {
                 virNetworkRouteDefPtr route = netDef->routes[j];
 
-                if (virNetDevAddRoute(newname,
-                                      virNetworkRouteDefGetAddress(route),
-                                      virNetworkRouteDefGetPrefix(route),
-                                      virNetworkRouteDefGetGateway(route),
-                                      virNetworkRouteDefGetMetric(route)) < 0) {
+                if (virNetDevIPRouteAdd(newname,
+                                        virNetworkRouteDefGetAddress(route),
+                                        virNetworkRouteDefGetPrefix(route),
+                                        virNetworkRouteDefGetGateway(route),
+                                        virNetworkRouteDefGetMetric(route)) < 0) {
                     goto error_out;
                 }
                 VIR_FREE(toStr);

src/network/bridge_driver.c

@@ -62,10 +62,11 @@
 #include "virdnsmasq.h"
 #include "configmake.h"
 #include "virnetdev.h"
-#include "virpci.h"
+#include "virnetdevip.h"
 #include "virnetdevbridge.h"
 #include "virnetdevtap.h"
 #include "virnetdevvportprofile.h"
+#include "virpci.h"
 #include "virdbus.h"
 #include "virfile.h"
 #include "virstring.h"
@@ -1977,8 +1978,8 @@ networkAddAddrToBridge(virNetworkObjPtr network,
         return -1;
     }
 
-    if (virNetDevSetIPAddress(network->def->bridge,
-                              &ipdef->address, NULL, prefix) < 0)
+    if (virNetDevIPAddrAdd(network->def->bridge,
+                           &ipdef->address, NULL, prefix) < 0)
         return -1;
 
     return 0;
@@ -2025,8 +2026,8 @@ networkAddRouteToBridge(virNetworkObjPtr network,
         return -1;
     }
 
-    if (virNetDevAddRoute(network->def->bridge, addr,
-                          prefix, gateway, metric) < 0) {
+    if (virNetDevIPRouteAdd(network->def->bridge, addr,
+                            prefix, gateway, metric) < 0) {
         return -1;
     }
     return 0;
@@ -2049,7 +2050,7 @@ networkWaitDadFinish(virNetworkObjPtr network)
             goto cleanup;
     }
 
-    ret = (naddrs == 0) ? 0 : virNetDevWaitDadFinish(addrs, naddrs);
+    ret = (naddrs == 0) ? 0 : virNetDevIPWaitDadFinish(addrs, naddrs);
 
  cleanup:
     VIR_FREE(addrs);
@@ -4760,7 +4761,7 @@ networkGetNetworkAddress(const char *netname, char **netaddr)
     }
 
     if (dev_name) {
-        if (virNetDevGetIPAddress(dev_name, &addr) < 0)
+        if (virNetDevIPAddrGet(dev_name, &addr) < 0)
             goto cleanup;
         addrptr = &addr;
     }

src/util/virnetdevip.h

+/*
+ * Copyright (C) 2007-2016 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Mark McLoughlin <markmc@redhat.com>
+ *     Daniel P. Berrange <berrange@redhat.com>
+ */
+
+#ifndef __VIR_NETDEVIP_H__
+# define __VIR_NETDEVIP_H__
+
+# include "virsocketaddr.h"
+
+/* manipulating/querying the netdev */
+int virNetDevIPAddrAdd(const char *ifname,
+                       virSocketAddr *addr,
+                       virSocketAddr *peer,
+                       unsigned int prefix)
+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK;
+int virNetDevIPRouteAdd(const char *ifname,
+                        virSocketAddrPtr addr,
+                        unsigned int prefix,
+                        virSocketAddrPtr gateway,
+                        unsigned int metric)
+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4)
+    ATTRIBUTE_RETURN_CHECK;
+int virNetDevIPAddrDel(const char *ifname,
+                       virSocketAddr *addr,
+                       unsigned int prefix)
+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK;
+int virNetDevIPAddrGet(const char *ifname, virSocketAddrPtr addr)
+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK;
+int virNetDevIPWaitDadFinish(virSocketAddrPtr *addrs, size_t count)
+    ATTRIBUTE_NONNULL(1);
+
+#endif /* __VIR_NETDEVIP_H__ */