* merged changes from the conference

[apt.git] / methods / connect.cc

diff --git a/methods/connect.cc b/methods/connect.cc
index e92eebe760bf3d8506a859880cb03c57b5fae01a..981ac1371cc1d902eabf011fb398f5126db94466 100644 (file)
--- a/methods/connect.cc
+++ b/methods/connect.cc
@@ -1,10 +1,13 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: connect.cc,v 1.5 2000/05/12 05:04:57 jgg Exp $
+// $Id: connect.cc,v 1.10.2.1 2004/01/16 18:58:50 mdz Exp $

 /* ######################################################################
 
    Connect - Replacement connect call
 /* ######################################################################
 
    Connect - Replacement connect call

-   
+
+   This was originally authored by Jason Gunthorpe <jgg@debian.org>
+   and is placed in the Public Domain, do with it what you will.
+      

    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/


@@ -23,6 +26,7 @@
 #include <netdb.h>
 
 #include "rfc2553emu.h"
 #include <netdb.h>
 
 #include "rfc2553emu.h"

+#include <apti18n.h>

                                                                        /*}}}*/
 
 static string LastHost;
                                                                        /*}}}*/
 
 static string LastHost;


@@ -30,6 +34,18 @@ static int LastPort = 0;
 static struct addrinfo *LastHostAddr = 0;
 static struct addrinfo *LastUsed = 0;
 
 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. */
 // DoConnect - Attempt a connect operation                             /*{{{*/
 // ---------------------------------------------------------------------
 /* This helper function attempts a connection to a single address. */


@@ -38,37 +54,57 @@ static bool DoConnect(struct addrinfo *Addr,string Host,
 {
    // Show a status indicator
    char Name[NI_MAXHOST];
 {
    // Show a status indicator
    char Name[NI_MAXHOST];

-   Name[0] = 0;
-   getnameinfo(Addr->ai_addr,Addr->ai_addrlen,
-              Name,sizeof(Name),0,0,NI_NUMERICHOST);
-   Owner->Status("Connecting to %s (%s)",Host.c_str(),Name);
+   char Service[NI_MAXSERV];

    
    

+   Name[0] = 0;   
+   Service[0] = 0;
+   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);
+
+   /* 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)
    // 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)
    
    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);
+      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)
    
    /* 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);
    if (getsockopt(Fd,SOL_SOCKET,SO_ERROR,&Err,&Len) != 0)
    // 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)
    
    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;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -80,67 +116,67 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd,
 {
    if (_error->PendingError() == true)
       return false;
 {
    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
       sensible */
    if (LastHost != Host || LastPort != Port)
    {
    
    /* 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
       sensible */
    if (LastHost != Host || LastPort != Port)
    {

-      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);
+      Owner->Status(_("Connecting to %s"),Host.c_str());

 
       // Free the old address structure
       if (LastHostAddr != 0)
       {
         freeaddrinfo(LastHostAddr);
         LastHostAddr = 0;
 
       // 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;
       }
       
       // 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;
       
       // 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)
               {
             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;
               }
                  DefPort = 0;
                  continue;
               }

-              return _error->Error("Could not resolve '%s'",Host.c_str());
+              return _error->Error(_("Could not resolve '%s'"),Host.c_str());

            }
            
            }
            

-           return _error->Error("Something wicked happend resolving '%s/%s'",
-                                Host.c_str(),S);
+           if (Res == EAI_AGAIN)
+              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);

         }
         break;
       }
       
         }
         break;
       }
       

-      if (LastHostAddr->ai_family == AF_UNIX)
-        return _error->Error("getaddrinfo returned a unix domain socket\n");
-      

       LastHost = Host;
       LastPort = Port;
       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;
    struct addrinfo *CurHost = LastHostAddr;
    if (LastUsed != 0)
        CurHost = LastUsed;


@@ -155,14 +191,28 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd,
       close(Fd);
       Fd = -1;
       
       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();
       if (CurHost != 0)
         _error->Discard();

-   }
-   
+   }   
+

    if (_error->PendingError() == true)
    if (_error->PendingError() == true)

-      return false;
-   return _error->Error("Unable to connect to '%s'",Host.c_str());
+      return false;   
+   return _error->Error(_("Unable to connect to %s %s:"),Host.c_str(),ServStr);

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/