merge from the debian-sid branch

[apt.git] / methods / connect.cc

diff --git a/methods/connect.cc b/methods/connect.cc
index 981ac1371cc1d902eabf011fb398f5126db94466..b5f48907ec97460a251bb4a035c8e7001e9e74a5 100644 (file)
--- a/methods/connect.cc
+++ b/methods/connect.cc
@@ -19,6 +19,9 @@
 #include <errno.h>
 #include <unistd.h>
 
+#include<set>
+#include<string>
+
 // Internet stuff
 #include <netinet/in.h>
 #include <sys/socket.h>
@@ -34,6 +37,9 @@ static int LastPort = 0;
 static struct addrinfo *LastHostAddr = 0;
 static struct addrinfo *LastUsed = 0;
 
+// Set of IP/hostnames that we timed out before or couldn't resolve
+static std::set<string> bad_addr;
+
 // RotateDNS - Select a new server from a DNS rotation                 /*{{{*/
 // ---------------------------------------------------------------------
 /* This is called during certain errors in order to recover by selecting a 
@@ -63,6 +69,10 @@ static bool DoConnect(struct addrinfo *Addr,string Host,
               NI_NUMERICHOST|NI_NUMERICSERV);
    Owner->Status(_("Connecting to %s (%s)"),Host.c_str(),Name);
 
+   // if that addr did timeout before, we do not try it again
+   if(bad_addr.find(string(Name)) != bad_addr.end()) 
+      return false;
+
    /* If this is an IP rotation store the IP we are using.. If something goes
       wrong this will get tacked onto the end of the error message */
    if (LastHostAddr->ai_next != 0)
@@ -88,9 +98,12 @@ static bool DoConnect(struct addrinfo *Addr,string Host,
    
    /* This implements a timeout for connect by opening the connection
       nonblocking */
-   if (WaitFd(Fd,true,TimeOut) == false)
+   if (WaitFd(Fd,true,TimeOut) == false) {
+      bad_addr.insert(bad_addr.begin(), string(Name));
+      Owner->SetFailExtraMsg("\nFailReason: Timeout");
       return _error->Error(_("Could not connect to %s:%s (%s), "
                           "connection timed out"),Host.c_str(),Service,Name);
+   }
 
    // Check the socket for an error condition
    unsigned int Err;
@@ -101,6 +114,8 @@ static bool DoConnect(struct addrinfo *Addr,string Host,
    if (Err != 0)
    {
       errno = Err;
+      if(errno == ECONNREFUSED)
+         Owner->SetFailExtraMsg("\nFailReason: ConnectionRefused");
       return _error->Errno("connect",_("Could not connect to %s:%s (%s)."),Host.c_str(),
                           Service,Name);
    }
@@ -145,6 +160,10 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd,
       Hints.ai_socktype = SOCK_STREAM;
       Hints.ai_protocol = 0;
       
+      // if we couldn't resolve the host before, we don't try now
+      if(bad_addr.find(Host) != bad_addr.end()) 
+        return _error->Error(_("Could not resolve '%s'"),Host.c_str());
+
       // Resolve both the host and service simultaneously
       while (1)
       {
@@ -160,12 +179,17 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd,
                  DefPort = 0;
                  continue;
               }
+              bad_addr.insert(bad_addr.begin(), Host);
+              Owner->SetFailExtraMsg("\nFailReason: ResolveFailure");
               return _error->Error(_("Could not resolve '%s'"),Host.c_str());
            }
            
            if (Res == EAI_AGAIN)
+           {
+              Owner->SetFailExtraMsg("\nFailReason: TmpResolveFailure");
               return _error->Error(_("Temporary failure resolving '%s'"),
                                    Host.c_str());
+           }
            return _error->Error(_("Something wicked happened resolving '%s:%s' (%i)"),
                                 Host.c_str(),ServStr,Res);
         }
@@ -213,6 +237,6 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd,
 
    if (_error->PendingError() == true)
       return false;   
-   return _error->Error(_("Unable to connect to %s %s:"),Host.c_str(),ServStr);
+   return _error->Error(_("Unable to connect to %s:%s:"),Host.c_str(),ServStr);
 }
                                                                        /*}}}*/