tests: ensure sponge-files are cleaned up properly

[apt.git] / methods / connect.cc

diff --git a/methods/connect.cc b/methods/connect.cc
index 8de4ad74799d29715bee12d8e97ad670d20b7e2b..171622fa570d31a2813dd2f5be4d4ee259e45f2e 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 int LastSrvRecord = 0;
 
 // 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;
 }
                                                                        /*}}}*/
-
-// Connect to a given Hostname 
-bool ConnectAfterSrvRecords(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];
@@ -261,36 +259,35 @@ bool ConnectAfterSrvRecords(std::string Host,int Port,const char *Service,
                                                                        /*}}}*/
 // Connect - Connect to a server                                       /*{{{*/
 // ---------------------------------------------------------------------
-/* Performs a connection to the server */
+/* Performs a connection to the server (including SRV record lookup) */
 bool Connect(std::string Host,int Port,const char *Service,
                             int DefPort,int &Fd,
                             unsigned long TimeOut,pkgAcqMethod *Owner)
 {
-#if 0
    if (_error->PendingError() == true)
       return false;
-#endif
 
    if(LastHost != Host || LastPort != Port)
    {
       SrvRecords.clear();
-      bool res = GetSrvRecords(Host, DefPort, SrvRecords);
+      if (_config->FindB("Acquire::EnableSrvRecords", true) == true)
+         GetSrvRecords(Host, DefPort, SrvRecords);
    }
+   // we have no SrvRecords for this host, connect right away
    if(SrvRecords.size() == 0)
-      return ConnectAfterSrvRecords(Host, Port, Service, DefPort, Fd, 
+      return ConnectToHostname(Host, Port, Service, DefPort, Fd, 
                                     TimeOut, Owner);
 
-   bool connected = false;
+   // try to connect in the priority order of the srv records
    while(SrvRecords.size() > 0)
    {
-      Host = SrvRecords[0].target;
-      connected = ConnectAfterSrvRecords(Host, Port, Service, DefPort, Fd, 
-                                         TimeOut, Owner);
-      if(connected == true)
+      Host = PopFromSrvRecs(SrvRecords).target;
+      if(ConnectToHostname(Host, Port, Service, DefPort, Fd, TimeOut, Owner))
          return true;
 
       // we couldn't connect to this one, use the next
       SrvRecords.erase(SrvRecords.begin());
-   } 
+   }
+
    return false;
 }