// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: connect.cc,v 1.4 1999/11/19 05:01:54 jgg Exp $
+// $Id: connect.cc,v 1.7 2001/02/20 07:03:18 jgg Exp $
/* ######################################################################
Connect - Replacement connect call
static struct addrinfo *LastHostAddr = 0;
static struct addrinfo *LastUsed = 0;
+// RotateDNS - Select a new server from a DNS rotation /*{{{*/
+// ---------------------------------------------------------------------
+/* This is called during certain errors in order to recover by selecting a
+ new server */
+void RotateDNS()
+{
+ if (LastUsed != 0 && LastUsed->ai_next != 0)
+ LastUsed = LastUsed->ai_next;
+ else
+ LastUsed = LastHostAddr;
+}
+ /*}}}*/
// DoConnect - Attempt a connect operation /*{{{*/
// ---------------------------------------------------------------------
/* This helper function attempts a connection to a single address. */
{
// Show a status indicator
char Name[NI_MAXHOST];
- Name[0] = 0;
+ char Service[NI_MAXSERV];
+
+ Name[0] = 0;
+ Service[0] = 0;
getnameinfo(Addr->ai_addr,Addr->ai_addrlen,
- Name,sizeof(Name),0,0,NI_NUMERICHOST);
+ Name,sizeof(Name),Service,sizeof(Service),
+ NI_NUMERICHOST|NI_NUMERICSERV);
Owner->Status("Connecting to %s (%s)",Host.c_str(),Name);
-
+
+ /* 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("");
+
// 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");
+ 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).",Host.c_str(),Name);
+ "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), "
- "connection timed out",Host.c_str(),Name);
-
+ 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);
return _error->Errno("getsockopt","Failed");
if (Err != 0)
- return _error->Error("Could not connect to %s (%s).",Host.c_str(),Name);
-
+ {
+ errno = Err;
+ return _error->Errno("connect","Could not connect to %s:%s (%s).",Host.c_str(),
+ Service,Name);
+ }
+
return true;
}
/*}}}*/
{
if (_error->PendingError() == true)
return false;
+
+ // Convert the port name/number
+ char ServStr[300];
+ if (Port != 0)
+ snprintf(ServStr,sizeof(ServStr),"%u",Port);
+ else
+ snprintf(ServStr,sizeof(ServStr),"%s",Service);
/* We used a cached address record.. Yes this is against the spec but
the way we have setup our rotating dns suggests that this is more
{
Owner->Status("Connecting to %s",Host.c_str());
- // Lookup the host
- char S[300];
- if (Port != 0)
- snprintf(S,sizeof(S),"%u",Port);
- else
- snprintf(S,sizeof(S),"%s",Service);
-
// Free the old address structure
if (LastHostAddr != 0)
{
freeaddrinfo(LastHostAddr);
LastHostAddr = 0;
+ LastUsed = 0;
}
// We only understand SOCK_STREAM sockets.
struct addrinfo Hints;
memset(&Hints,0,sizeof(Hints));
Hints.ai_socktype = SOCK_STREAM;
- Hints.ai_protocol = IPPROTO_TCP; // Right?
+ Hints.ai_protocol = 0;
// Resolve both the host and service simultaneously
while (1)
{
int Res;
- if ((Res = getaddrinfo(Host.c_str(),S,&Hints,&LastHostAddr)) != 0 ||
+ if ((Res = getaddrinfo(Host.c_str(),ServStr,&Hints,&LastHostAddr)) != 0 ||
LastHostAddr == 0)
{
if (Res == EAI_NONAME || Res == EAI_SERVICE)
{
if (DefPort != 0)
{
- snprintf(S,sizeof(S),"%u",DefPort);
+ snprintf(ServStr,sizeof(ServStr),"%u",DefPort);
DefPort = 0;
continue;
}
return _error->Error("Could not resolve '%s'",Host.c_str());
}
- return _error->Error("Something wicked happend resolving '%s/%s'",
- Host.c_str(),S);
+ return _error->Error("Something wicked happened resolving '%s:%s' (%i)",
+ Host.c_str(),ServStr,Res);
}
break;
}
- if (LastHostAddr->ai_family == AF_UNIX)
- return _error->Error("getaddrinfo returned a unix domain socket\n");
-
LastHost = Host;
LastPort = Port;
- LastUsed = 0;
}
- // Get the printable IP address
+ // When we have an IP rotation stay with the last IP.
struct addrinfo *CurHost = LastHostAddr;
if (LastUsed != 0)
CurHost = LastUsed;
close(Fd);
Fd = -1;
- CurHost = CurHost->ai_next;
- LastUsed = 0;
+ // Ignore UNIX domain sockets
+ do
+ {
+ CurHost = CurHost->ai_next;
+ }
+ while (CurHost != 0 && CurHost->ai_family == AF_UNIX);
+
+ /* If we reached the end of the search list then wrap around to the
+ start */
+ if (CurHost == 0 && LastUsed != 0)
+ CurHost = LastHostAddr;
+
+ // Reached the end of the search cycle
+ if (CurHost == LastUsed)
+ break;
+
if (CurHost != 0)
_error->Discard();
- }
-
- return false;
+ }
+
+ if (_error->PendingError() == true)
+ return false;
+ return _error->Error("Unable to connect to %s %s:",Host.c_str(),ServStr);
}
/*}}}*/
projects / apt.git / blobdiff