summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2008-02-08 11:31:11 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2008-02-08 11:31:11 +0100
commit654881fb48c5e4fb1e542179f20ded294dd3ae83 (patch)
tree34426f80d54044c68cba669442ddeccc98128298
parent76264cb71becaeabc2df863272e440d494491a56 (diff)
* methods/connect.cc:
- remember hosts with Resolve failures or connect Timeouts
-rw-r--r--debian/changelog2
-rw-r--r--methods/connect.cc16
2 files changed, 18 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 2a4112ef8..14abe5721 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ apt (0.7.11) UNRELEASED; urgency=low
* apt-pkg/deb/debmetaindex.cc:
- add missing "Release" file uri when apt-get update --print-uris
is run
+ * methods/connect.cc:
+ - remember hosts with Resolve failures or connect Timeouts
-- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Jan 2008 12:06:12 +0100
diff --git a/methods/connect.cc b/methods/connect.cc
index aef7db389..355bd5c4d 100644
--- 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)
@@ -89,6 +99,7 @@ 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) {
+ 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);
@@ -149,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)
{
@@ -164,6 +179,7 @@ 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());
}