add new config options "Acquire::ForceIPv4" and

[apt.git] / methods / connect.cc

diff --git a/methods/connect.cc b/methods/connect.cc
index b5f48907ec97460a251bb4a035c8e7001e9e74a5..35f4723ce33b2dbb3fac9cb96059107e95eba21c 100644 (file)
--- a/methods/connect.cc
+++ b/methods/connect.cc
@@ -11,13 +11,18 @@
    ##################################################################### */
                                                                        /*}}}*/
 // 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>
 
 #include<set>
 #include<string>


@@ -28,17 +33,18 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 
 #include <arpa/inet.h>
 #include <netdb.h>
 

+#include "connect.h"

 #include "rfc2553emu.h"
 #include <apti18n.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;
 
 // Set of IP/hostnames that we timed out before or couldn't resolve
 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;
+static std::set<std::string> bad_addr;

 
 // RotateDNS - Select a new server from a DNS rotation                 /*{{{*/
 // ---------------------------------------------------------------------
 
 // RotateDNS - Select a new server from a DNS rotation                 /*{{{*/
 // ---------------------------------------------------------------------


@@ -55,7 +61,7 @@ void RotateDNS()
 // 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
                      unsigned long TimeOut,int &Fd,pkgAcqMethod *Owner)
 {
    // Show a status indicator


@@ -70,19 +76,17 @@ static bool DoConnect(struct addrinfo *Addr,string Host,
    Owner->Status(_("Connecting to %s (%s)"),Host.c_str(),Name);
 
    // if that addr did timeout before, we do not try it again
    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()) 
+   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)
    {
       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,
       
    // Get a socket
    if ((Fd = socket(Addr->ai_family,Addr->ai_socktype,


@@ -99,8 +103,8 @@ 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) {
    /* 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");
+      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);
    }
       return _error->Error(_("Could not connect to %s:%s (%s), "
                           "connection timed out"),Host.c_str(),Service,Name);
    }


@@ -115,7 +119,10 @@ static bool DoConnect(struct addrinfo *Addr,string Host,
    {
       errno = Err;
       if(errno == ECONNREFUSED)
    {
       errno = Err;
       if(errno == ECONNREFUSED)

-         Owner->SetFailExtraMsg("\nFailReason: ConnectionRefused");
+         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);
    }
       return _error->Errno("connect",_("Could not connect to %s:%s (%s)."),Host.c_str(),
                           Service,Name);
    }


@@ -126,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)


@@ -158,8 +165,16 @@ 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());
       // 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());


@@ -180,18 +195,21 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd,
                  continue;
               }
               bad_addr.insert(bad_addr.begin(), Host);
                  continue;
               }
               bad_addr.insert(bad_addr.begin(), Host);

-              Owner->SetFailExtraMsg("\nFailReason: ResolveFailure");
+              Owner->SetFailReason("ResolveFailure");

               return _error->Error(_("Could not resolve '%s'"),Host.c_str());
            }
            
            if (Res == EAI_AGAIN)
            {
               return _error->Error(_("Could not resolve '%s'"),Host.c_str());
            }
            
            if (Res == EAI_AGAIN)
            {

-              Owner->SetFailExtraMsg("\nFailReason: TmpResolveFailure");
+              Owner->SetFailReason("TmpResolveFailure");

               return _error->Error(_("Temporary failure resolving '%s'"),
                                    Host.c_str());
            }
               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);
+           if (Res == EAI_SYSTEM)
+              return _error->Error(_("System error resolving '%s:%s' (%s)"),
+                                   Host.c_str(),ServStr,strerror(errno));
+           return _error->Error(_("Something wicked happened resolving '%s:%s' (%i - %s)"),
+                                Host.c_str(),ServStr,Res,gai_strerror(Res));

         }
         break;
       }
         }
         break;
       }