implement generic config fallback for methods

[apt.git] / methods / connect.cc

diff --git a/methods/connect.cc b/methods/connect.cc
index 5612af6ec7f018ce61cde95824bf0c569c809598..f768169d1aceec08cb8d7a1458ccfcd80dc82ed2 100644 (file)
--- a/methods/connect.cc
+++ b/methods/connect.cc
@@ -45,7 +45,6 @@ static struct addrinfo *LastHostAddr = 0;
 static struct addrinfo *LastUsed = 0;
 
 static std::vector<SrvRec> SrvRecords;
 static struct addrinfo *LastUsed = 0;
 
 static std::vector<SrvRec> SrvRecords;

-static int LastSrvRecord = 0;

 
 // Set of IP/hostnames that we timed out before or couldn't resolve
 static std::set<std::string> bad_addr;
 
 // Set of IP/hostnames that we timed out before or couldn't resolve
 static std::set<std::string> bad_addr;


@@ -134,11 +133,10 @@ static bool DoConnect(struct addrinfo *Addr,std::string Host,
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-
-// Connect to a given Hostname 
-bool ConnectToHostname(std::string Host,int Port,const char *Service,
-                            int DefPort,int &Fd,
-                            unsigned long TimeOut,pkgAcqMethod *Owner)
+// Connect to a given Hostname                                         /*{{{*/
+static bool ConnectToHostname(std::string const &Host, int const Port,
+      const char * const Service, int DefPort, int &Fd,
+      unsigned long const TimeOut, pkgAcqMethod * const Owner)

 {
    // Convert the port name/number
    char ServStr[300];
 {
    // Convert the port name/number
    char ServStr[300];


@@ -166,7 +164,14 @@ bool ConnectToHostname(std::string Host,int Port,const char *Service,
       struct addrinfo Hints;
       memset(&Hints,0,sizeof(Hints));
       Hints.ai_socktype = SOCK_STREAM;
       struct addrinfo Hints;
       memset(&Hints,0,sizeof(Hints));
       Hints.ai_socktype = SOCK_STREAM;

-      Hints.ai_flags = AI_ADDRCONFIG;
+      Hints.ai_flags = 0;
+      if (_config->FindB("Acquire::Connect::IDN", true) == true)
+        Hints.ai_flags |= AI_IDN;
+      // see getaddrinfo(3): only return address if system has such a address configured
+      // useful if system is ipv4 only, to not get ipv6, but that fails if the system has
+      // no address configured: e.g. offline and trying to connect to localhost.
+      if (_config->FindB("Acquire::Connect::AddrConfig", true) == true)
+        Hints.ai_flags |= AI_ADDRCONFIG;

       Hints.ai_protocol = 0;
       
       if(_config->FindB("Acquire::ForceIPv4", false) == true)
       Hints.ai_protocol = 0;
       
       if(_config->FindB("Acquire::ForceIPv4", false) == true)


@@ -272,24 +277,38 @@ bool Connect(std::string Host,int Port,const char *Service,
    if(LastHost != Host || LastPort != Port)
    {
       SrvRecords.clear();
    if(LastHost != Host || LastPort != Port)
    {
       SrvRecords.clear();

-      if (_config->FindB("Acquire::EnableSrvRecods", true) == true)
+      if (_config->FindB("Acquire::EnableSrvRecords", true) == true)

          GetSrvRecords(Host, DefPort, SrvRecords);
    }
          GetSrvRecords(Host, DefPort, SrvRecords);
    }

-   // we have no SrvRecords for this host, connect right away
-   if(SrvRecords.size() == 0)
-      return ConnectToHostname(Host, Port, Service, DefPort, Fd, 
-                                    TimeOut, Owner);

 
 

+   size_t stackSize = 0;

    // try to connect in the priority order of the srv records
    // try to connect in the priority order of the srv records

-   while(SrvRecords.size() > 0)
+   std::string initialHost{std::move(Host)};
+   while(SrvRecords.empty() == false)

    {
    {

+      _error->PushToStack();
+      ++stackSize;
+      // PopFromSrvRecs will also remove the server

       Host = PopFromSrvRecs(SrvRecords).target;
       Host = PopFromSrvRecs(SrvRecords).target;

-      if(ConnectToHostname(Host, Port, Service, DefPort, Fd, TimeOut, Owner))
+      auto const ret = ConnectToHostname(Host, Port, Service, DefPort, Fd, TimeOut, Owner);
+      if (ret)
+      {
+        while(stackSize--)
+           _error->RevertToStack();

          return true;
          return true;

-
-      // we couldn't connect to this one, use the next
-      SrvRecords.erase(SrvRecords.begin());
+      }

    }
    }

+   Host = std::move(initialHost);

 
 

-   return false;
+   // we have no (good) SrvRecords for this host, connect right away
+   _error->PushToStack();
+   ++stackSize;
+   auto const ret = ConnectToHostname(Host, Port, Service, DefPort, Fd,
+        TimeOut, Owner);
+   while(stackSize--)
+      if (ret)
+        _error->RevertToStack();
+      else
+        _error->MergeWithStack();
+   return ret;

 }
 }