commit dd60e4549cc8898f7f517283eacc58f67570bd1f
author Paul Stewart <pstew@chromium.org> Mon Aug 08 11:38:36 2011 -0700
committer Paul Stewart <pstew@chromium.org> Tue Aug 16 15:18:57 2011 -0700
tree 0bafbdd8a87f9adcc72b119d2ba5dbde0853f6da
parent 77cb681ab58c6623464a355e646138ab84d38573

shill: Add connection class

The connection class represents the snapshot of connectivity
state, including routing, address information and addressing.
It is able to apply itself as the "default" connection, by
setting routing table metrics and DNS resolver files.

BUG=chromium-os:19095
TEST=New unittest

Change-Id: I7021867ed8a8559db0e84f58a72692abaf105cad
Reviewed-on: http://gerrit.chromium.org/gerrit/5938
Reviewed-by: Chris Masone <cmasone@chromium.org>
Tested-by: Paul Stewart <pstew@chromium.org>

resolver.cc

diff --git a/resolver.cc b/resolver.cc
index 16f503c..bb7105b 100644
--- a/resolver.cc
+++ b/resolver.cc
@@ -30,24 +30,29 @@
   return g_resolver.Pointer();
 }
 
-bool Resolver::SetDNS(const IPConfigRefPtr &ipconfig) {
+bool Resolver::SetDNSFromIPConfig(const IPConfigRefPtr &ipconfig) {
   CHECK(!path_.empty());
 
   const IPConfig::Properties &props = ipconfig->properties();
 
-  if (!props.dns_servers.size() && !props.domain_search.size()) {
+  return SetDNSFromLists(props.dns_servers, props.domain_search);
+}
+
+bool Resolver::SetDNSFromLists(const std::vector<std::string> &dns_servers,
+                               const std::vector<std::string> &domain_search) {
+  if (dns_servers.empty() && domain_search.empty()) {
     return ClearDNS();
   }
 
   vector<string> lines;
   vector<string>::const_iterator iter;
-  for (iter = props.dns_servers.begin();
-       iter != props.dns_servers.end(); ++iter) {
+  for (iter = dns_servers.begin();
+       iter != dns_servers.end(); ++iter) {
     lines.push_back("nameserver " + *iter);
   }
 
-  if (props.domain_search.size()) {
-    lines.push_back("search " + JoinString(props.domain_search, ' '));
+  if (!domain_search.empty()) {
+    lines.push_back("search " + JoinString(domain_search, ' '));
   }
 
   // Newline at end of file