wrap every unlink call to check for != /dev/null

[apt.git] / methods / connect.cc

diff --git a/methods/connect.cc b/methods/connect.cc
index 9e0f01ee3478926426f969df1e44df54d74bfc62..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 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];


@@ -272,7 +270,8 @@ bool Connect(std::string Host,int Port,const char *Service,
    if(LastHost != Host || LastPort != Port)
    {
       SrvRecords.clear();
    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)
    }
    // we have no SrvRecords for this host, connect right away
    if(SrvRecords.size() == 0)


@@ -282,7 +281,7 @@ bool Connect(std::string Host,int Port,const char *Service,
    // try to connect in the priority order of the srv records
    while(SrvRecords.size() > 0)
    {
    // try to connect in the priority order of the srv records
    while(SrvRecords.size() > 0)
    {

-      Host = SrvRecords[0].target;
+      Host = PopFromSrvRecs(SrvRecords).target;

       if(ConnectToHostname(Host, Port, Service, DefPort, Fd, TimeOut, Owner))
          return true;
 
       if(ConnectToHostname(Host, Port, Service, DefPort, Fd, TimeOut, Owner))
          return true;