netcfg/resolved: Refactor out resolved::ResolverRecord

The new resolved::IPAddress is feature-wise equivalent to
resolved::ResolverRecord.  After the change in ResolverRecord
to use IPAddress internally, the ResolverRecord class was just
useless wrapper class.  This can now be refactored out and
instead use IPAddress directly.

Signed-off-by: David Sommerseth <davids@openvpn.net>

Author: dsommers

src/netcfg/dns/proxy-systemd-resolved.cpp

@@ -33,28 +33,6 @@ namespace NetCfg {
 namespace DNS {
 namespace resolved {
 
-//
-//  NetCfg::DNS::resolved::ResolverRecord
-//
-ResolverRecord::ResolverRecord(const unsigned short f, const std::string &s)
-    : server(IPAddress(s, f))
-{
-}
-
-
-ResolverRecord::ResolverRecord(GVariant *entry)
-    : server(IPAddress(entry))
-{
-}
-
-
-GVariant *ResolverRecord::GetGVariant() const
-{
-    return server.GetGVariant();
-}
-
-
-
 //
 //  NetCfg::DNS::resolved::SearchDomain
 //
@@ -133,8 +111,8 @@ const std::vector<std::string> Link::GetDNSServers() const
     std::vector<std::string> dns_srvs;
     while ((rec = g_variant_iter_next_value(it)))
     {
-        struct ResolverRecord d(rec);
-        dns_srvs.push_back(d.server.str());
+        IPAddress d(rec);
+        dns_srvs.push_back(d.str());
         g_variant_unref(rec);
     }
     g_variant_iter_free(it);
@@ -144,14 +122,14 @@ const std::vector<std::string> Link::GetDNSServers() const
 }
 
 
-std::vector<std::string> Link::SetDNSServers(const ResolverRecord::List &servers) const
+std::vector<std::string> Link::SetDNSServers(const IPAddress::List &servers) const
 {
     GVariantBuilder *b = glib2::Builder::Create("a(iay)");
     std::vector<std::string> applied{};
     for (const auto &srv : servers)
     {
         glib2::Builder::Add(b, srv.GetGVariant());
-        applied.push_back(srv.server.str());
+        applied.push_back(srv.str());
     }
 
     GVariant *r = proxy->Call(tgt_link,
@@ -168,9 +146,9 @@ const std::string Link::GetCurrentDNSServer() const
     try
     {
         r = proxy->GetPropertyGVariant(tgt_link, "CurrentDNSServer");
-        struct ResolverRecord d(r);
+        IPAddress d(r);
         g_variant_unref(r);
-        return d.server.str();
+        return d.str();
     }
     catch (const Exception &)
     {

src/netcfg/dns/proxy-systemd-resolved.hpp

@@ -27,51 +27,6 @@ namespace NetCfg {
 namespace DNS {
 namespace resolved {
 
-
-/**
- *  Helper struct to manage a resolver record used by the systemd-resolved
- *  service.
- *
- *  This is capable of converting between the D-Bus data types the D-Bus
- *  service uses and C++ data types.
- */
-struct ResolverRecord
-{
-    /**
-     * Defines a ResolverRecord::List as an alias to std::vector<ResolverRecord>
-     */
-    using List = std::vector<ResolverRecord>;
-
-    /**
-     *  Registers a new resolver record
-     *
-     * @param family  IPv4/IPv6 IP address identifier
-     * @param server  std::string containing the DNS server IP address
-     */
-    ResolverRecord(const unsigned short family, const std::string &server);
-
-    /**
-     *  Registers a new resolver record, parsing a GVariant* D-Bus value
-     *  response from the systemd-resolved
-     *
-     * @param entry   GVariant object containing the D-Bus values to parse
-     */
-    ResolverRecord(GVariant *entry);
-
-    ~ResolverRecord() = default;
-
-    /**
-     *  Retrieve the data stored in this struct as a D-Bus value object
-     *  which can be passed directly to the systemd-resolved service
-     *
-     * @return GVariant*  D-Bus value object containing all the information
-     */
-    GVariant *GetGVariant() const;
-
-    IPAddress server;
-};
-
-
 /**
  *  Helper struct to manage search domain records used by the systemd-resolved
  *  service.
@@ -175,7 +130,7 @@ class Link
      * @param servers ResolverRecord::List with all servers to use
      * @return std::vector<std:string> of servers applied
      */
-    std::vector<std::string> SetDNSServers(const ResolverRecord::List &servers) const;
+    std::vector<std::string> SetDNSServers(const IPAddress::List &servers) const;
 
     /**
      *  Retrieve the DNS server currently being used for DNS queries

src/netcfg/dns/systemd-resolved.cpp

@@ -13,10 +13,6 @@
  */
 
 
-#include <algorithm>
-#include <cstdio>
-#include <fstream>
-#include <iostream>
 #include <sstream>
 #include <string>
 #include <vector>
@@ -25,7 +21,6 @@
 #include "build-config.h"
 #include <openvpn/addr/ip.hpp>
 
-#include "common/timestamp.hpp"
 #include "netcfg/dns/resolver-settings.hpp"
 #include "netcfg/dns/resolver-backend-interface.hpp"
 #include "netcfg/dns/proxy-systemd-resolved.hpp"
@@ -87,8 +82,8 @@ void SystemdResolved::Apply(const ResolverSettings::Ptr settings)
                 continue;
             }
             openvpn::IP::Addr addr(r);
-            upd->resolver.push_back(ResolverRecord((addr.is_ipv6() ? AF_INET6 : AF_INET),
-                                                   addr.to_string()));
+            upd->resolvers.push_back(resolved::IPAddress(addr.to_string(),
+                                                         addr.is_ipv6() ? AF_INET6 : AF_INET));
         }
 
         for (const auto &sd : settings->GetSearchDomains())
@@ -135,7 +130,7 @@ void SystemdResolved::Commit(NetCfgSignals::Ptr signal)
             {
                 signal->LogVerb2("systemd-resolved: [" + upd->link->GetPath()
                                  + "] Committing DNS servers");
-                auto applied_servers = upd->link->SetDNSServers(upd->resolver);
+                auto applied_servers = upd->link->SetDNSServers(upd->resolvers);
                 signal->LogVerb2("systemd-resolved: [" + upd->link->GetPath()
                                  + "] Committing DNS search domains");
                 auto applied_search = upd->link->SetDomains(upd->search);

src/netcfg/dns/systemd-resolved.hpp

@@ -59,7 +59,7 @@ class SystemdResolved : public ResolverBackendInterface
         bool disabled = false;                     ///< disabled internally by errors
         bool default_routing = false;              ///< set the default routing dns flag
         resolved::Link::Ptr link = nullptr;        ///< Pointer to the resolved::Link interface object
-        resolved::ResolverRecord::List resolver{}; ///< List of DNS resolver IP addresses for this link
+        resolved::IPAddress::List resolvers{};     ///< List of DNS resolver IP addresses for this link
         resolved::SearchDomain::List search{};     ///< List of DNS search domains to add for this link
 
 

src/tests/dbus/netcfg-systemd-resolved-basic.cpp

@@ -123,21 +123,21 @@ int program(ParsedArgs::Ptr args)
     if (!op.empty())
     {
         // Set a new DNS resolver server
-        resolved::ResolverRecord::List rslv;
+        resolved::IPAddress::List rslv;
 
         if (args->Present("add-resolver6"))
         {
             for (const auto &ip : args->GetAllValues("add-resolver6"))
             {
-                rslv.push_back(resolved::ResolverRecord(AF_INET6, ip));
+                rslv.push_back(resolved::IPAddress(ip, AF_INET6));
             }
         }
 
         if (args->Present("add-resolver4"))
         {
             for (const auto &ip : args->GetAllValues("add-resolver4"))
             {
-                rslv.push_back(resolved::ResolverRecord(AF_INET, ip));
+                rslv.push_back(resolved::IPAddress(ip, AF_INET));
             }
         }