X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/4fe6e0c27fd1ec5b4217012616efad6db3fe8b36..4bec02c237e8e218bc7d4bcf7142e0450480138b:/methods/connect.cc?ds=sidebyside diff --git a/methods/connect.cc b/methods/connect.cc index e9109423b..a5af1f1a6 100644 --- a/methods/connect.cc +++ b/methods/connect.cc @@ -1,10 +1,13 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: connect.cc,v 1.8 2002/02/28 03:51:55 jgg Exp $ +// $Id: connect.cc,v 1.10.2.1 2004/01/16 18:58:50 mdz Exp $ /* ###################################################################### Connect - Replacement connect call - + + This was originally authored by Jason Gunthorpe + and is placed in the Public Domain, do with it what you will. + ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ @@ -15,6 +18,10 @@ #include #include #include +#include + +#include +#include // Internet stuff #include @@ -23,6 +30,7 @@ #include #include "rfc2553emu.h" +#include /*}}}*/ static string LastHost; @@ -30,6 +38,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 bad_addr; + // RotateDNS - Select a new server from a DNS rotation /*{{{*/ // --------------------------------------------------------------------- /* This is called during certain errors in order to recover by selecting a @@ -57,47 +68,57 @@ static bool DoConnect(struct addrinfo *Addr,string Host, getnameinfo(Addr->ai_addr,Addr->ai_addrlen, Name,sizeof(Name),Service,sizeof(Service), NI_NUMERICHOST|NI_NUMERICSERV); - Owner->Status("Connecting to %s (%s)",Host.c_str(),Name); + 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) { - char Name2[NI_MAXHOST + NI_MAXSERV + 10]; - snprintf(Name2,sizeof(Name2),"[IP: %s %s]",Name,Service); - Owner->SetFailExtraMsg(string(Name2)); - } - else - Owner->SetFailExtraMsg(""); + std::stringstream ss; + ioprintf(ss, _("[IP: %s %s]"),Name,Service); + Owner->SetIP(ss.str()); + } // Get a socket if ((Fd = socket(Addr->ai_family,Addr->ai_socktype, Addr->ai_protocol)) < 0) - return _error->Errno("socket","Could not create a socket for %s (f=%u t=%u p=%u)", + return _error->Errno("socket",_("Could not create a socket for %s (f=%u t=%u p=%u)"), Name,Addr->ai_family,Addr->ai_socktype,Addr->ai_protocol); SetNonBlock(Fd,true); if (connect(Fd,Addr->ai_addr,Addr->ai_addrlen) < 0 && errno != EINPROGRESS) - return _error->Errno("connect","Cannot initiate the connection " - "to %s:%s (%s).",Host.c_str(),Service,Name); + return _error->Errno("connect",_("Cannot initiate the connection " + "to %s:%s (%s)."),Host.c_str(),Service,Name); /* This implements a timeout for connect by opening the connection nonblocking */ - if (WaitFd(Fd,true,TimeOut) == false) - return _error->Error("Could not connect to %s:%s (%s), " - "connection timed out",Host.c_str(),Service,Name); + if (WaitFd(Fd,true,TimeOut) == false) { + bad_addr.insert(bad_addr.begin(), string(Name)); + Owner->SetFailReason("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; unsigned int Len = sizeof(Err); if (getsockopt(Fd,SOL_SOCKET,SO_ERROR,&Err,&Len) != 0) - return _error->Errno("getsockopt","Failed"); + return _error->Errno("getsockopt",_("Failed")); if (Err != 0) { errno = Err; - return _error->Errno("connect","Could not connect to %s:%s (%s).",Host.c_str(), + if(errno == ECONNREFUSED) + Owner->SetFailReason("ConnectionRefused"); + else if (errno == ETIMEDOUT) + Owner->SetFailReason("ConnectionTimedOut"); + bad_addr.insert(bad_addr.begin(), string(Name)); + return _error->Errno("connect",_("Could not connect to %s:%s (%s)."),Host.c_str(), Service,Name); } @@ -125,7 +146,7 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd, sensible */ if (LastHost != Host || LastPort != Port) { - Owner->Status("Connecting to %s",Host.c_str()); + Owner->Status(_("Connecting to %s"),Host.c_str()); // Free the old address structure if (LastHostAddr != 0) @@ -139,8 +160,13 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd, struct addrinfo Hints; memset(&Hints,0,sizeof(Hints)); Hints.ai_socktype = SOCK_STREAM; + Hints.ai_flags = AI_ADDRCONFIG; 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) { @@ -156,14 +182,19 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd, DefPort = 0; continue; } - return _error->Error("Could not resolve '%s'",Host.c_str()); + bad_addr.insert(bad_addr.begin(), Host); + Owner->SetFailReason("ResolveFailure"); + return _error->Error(_("Could not resolve '%s'"),Host.c_str()); } if (Res == EAI_AGAIN) - return _error->Error("Temporary failure resolving '%s'", + { + Owner->SetFailReason("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); + } + return _error->Error(_("Something wicked happened resolving '%s:%s' (%i - %s)"), + Host.c_str(),ServStr,Res,gai_strerror(Res)); } break; } @@ -209,6 +240,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); } /*}}}*/