Additional test for the case when installed version != newest version

[apt.git] / methods / connect.cc

diff --git a/methods/connect.cc b/methods/connect.cc
index d0dcde698388ca95db58526d33f545a847e2455e..d9c9a1dd4bc41da0798dcd5987222d949ab89e92 100644 (file)
--- a/methods/connect.cc
+++ b/methods/connect.cc
@@ -1,20 +1,31 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: connect.cc,v 1.6 2000/05/28 04:34:44 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                                                       /*{{{*/

-#include "connect.h"
+#include <config.h>
+

 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>

+#include <apt-pkg/strutl.h>
+#include <apt-pkg/acquire-method.h>
+#include <apt-pkg/configuration.h>

 
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
 
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>

+#include <sstream>
+
+#include<set>
+#include<string>

 
 // Internet stuff
 #include <netinet/in.h>
 
 // Internet stuff
 #include <netinet/in.h>


@@ -22,57 +33,97 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 
 #include <arpa/inet.h>
 #include <netdb.h>
 

+#include "connect.h"

 #include "rfc2553emu.h"
 #include "rfc2553emu.h"

+#include <apti18n.h>

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

-static string LastHost;
+static std::string LastHost;

 static int LastPort = 0;
 static struct addrinfo *LastHostAddr = 0;
 static struct addrinfo *LastUsed = 0;
 
 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<std::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 
+   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. */

-static bool DoConnect(struct addrinfo *Addr,string Host,
+static bool DoConnect(struct addrinfo *Addr,std::string Host,

                      unsigned long TimeOut,int &Fd,pkgAcqMethod *Owner)
 {
    // Show a status indicator
    char Name[NI_MAXHOST];
    char Service[NI_MAXSERV];
                      unsigned long TimeOut,int &Fd,pkgAcqMethod *Owner)
 {
    // Show a status indicator
    char Name[NI_MAXHOST];
    char Service[NI_MAXSERV];

-   Name[0] = 0;
+   
+   Name[0] = 0;   

    Service[0] = 0;
    getnameinfo(Addr->ai_addr,Addr->ai_addrlen,
               Name,sizeof(Name),Service,sizeof(Service),
               NI_NUMERICHOST|NI_NUMERICSERV);
    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);
-   
+   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(std::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)
+   {
+      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)
    // 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 (%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 */
    
    /* 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(), std::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)
    // 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;
    
    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(), std::string(Name));
+      return _error->Errno("connect",_("Could not connect to %s:%s (%s)."),Host.c_str(),

                           Service,Name);
    }
    
                           Service,Name);
    }
    


@@ -82,7 +133,7 @@ static bool DoConnect(struct addrinfo *Addr,string Host,
 // Connect - Connect to a server                                       /*{{{*/
 // ---------------------------------------------------------------------
 /* Performs a connection to the server */
 // Connect - Connect to a server                                       /*{{{*/
 // ---------------------------------------------------------------------
 /* Performs a connection to the server */

-bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd,
+bool Connect(std::string Host,int Port,const char *Service,int DefPort,int &Fd,

             unsigned long TimeOut,pkgAcqMethod *Owner)
 {
    if (_error->PendingError() == true)
             unsigned long TimeOut,pkgAcqMethod *Owner)
 {
    if (_error->PendingError() == true)


@@ -91,16 +142,16 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd,
    // Convert the port name/number
    char ServStr[300];
    if (Port != 0)
    // Convert the port name/number
    char ServStr[300];
    if (Port != 0)

-      snprintf(ServStr,sizeof(ServStr),"%u",Port);
+      snprintf(ServStr,sizeof(ServStr),"%i", Port);

    else
    else

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

 
       // Free the old address structure
       if (LastHostAddr != 0)
 
       // Free the old address structure
       if (LastHostAddr != 0)


@@ -114,8 +165,20 @@ 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;
       struct addrinfo Hints;
       memset(&Hints,0,sizeof(Hints));
       Hints.ai_socktype = SOCK_STREAM;

+      Hints.ai_flags = AI_ADDRCONFIG;

       Hints.ai_protocol = 0;
       
       Hints.ai_protocol = 0;
       

+      if(_config->FindB("Acquire::ForceIPv4", false) == true)
+         Hints.ai_family = AF_INET;
+      else if(_config->FindB("Acquire::ForceIPv6", false) == true)
+         Hints.ai_family = AF_INET6;
+      else
+         Hints.ai_family = AF_UNSPEC;
+
+      // 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)
       {
       // Resolve both the host and service simultaneously
       while (1)
       {


@@ -127,15 +190,26 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd,
            {
               if (DefPort != 0)
               {
            {
               if (DefPort != 0)
               {

-                 snprintf(ServStr,sizeof(ServStr),"%u",DefPort);
+                 snprintf(ServStr, sizeof(ServStr), "%i", DefPort);

                  DefPort = 0;
                  continue;
               }
                  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());

            }
            
            }
            

-           return _error->Error("Something wicked happend resolving '%s:%s'",
-                                Host.c_str(),ServStr);
+           if (Res == EAI_AGAIN)
+           {
+              Owner->SetFailReason("TmpResolveFailure");
+              return _error->Error(_("Temporary failure resolving '%s'"),
+                                   Host.c_str());
+           }
+           if (Res == EAI_SYSTEM)
+              return _error->Errno("getaddrinfo", _("System error resolving '%s:%s'"),
+                                      Host.c_str(),ServStr);
+           return _error->Error(_("Something wicked happened resolving '%s:%s' (%i - %s)"),
+                                Host.c_str(),ServStr,Res,gai_strerror(Res));

         }
         break;
       }
         }
         break;
       }


@@ -165,14 +239,22 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd,
         CurHost = CurHost->ai_next;
       }
       while (CurHost != 0 && CurHost->ai_family == AF_UNIX);
         CurHost = CurHost->ai_next;
       }
       while (CurHost != 0 && CurHost->ai_family == AF_UNIX);

-        
-      LastUsed = 0;
+
+      /* 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(),ServStr);
+      return false;   
+   return _error->Error(_("Unable to connect to %s:%s:"),Host.c_str(),ServStr);

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