Merge branch 'debian/experimental' into feature/srv-records

[apt.git] / methods / connect.cc

diff --git a/methods/connect.cc b/methods/connect.cc
index 3573d3cbf69f60bdbf5da3ff5ae532e58c9376ec..8de4ad74799d29715bee12d8e97ad670d20b7e2b 100644 (file)
--- a/methods/connect.cc
+++ b/methods/connect.cc
@@ -17,12 +17,14 @@
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/acquire-method.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/srvrec.h>
 
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
 #include <sstream>
-
+#include <string.h>
 #include<set>
 #include<string>
 
@@ -42,6 +44,9 @@ static int LastPort = 0;
 static struct addrinfo *LastHostAddr = 0;
 static struct addrinfo *LastUsed = 0;
 
+static std::vector<SrvRec> SrvRecords;
+static int LastSrvRecord = 0;
+
 // Set of IP/hostnames that we timed out before or couldn't resolve
 static std::set<std::string> bad_addr;
 
@@ -129,21 +134,18 @@ static bool DoConnect(struct addrinfo *Addr,std::string Host,
    return true;
 }
                                                                        /*}}}*/
-// Connect - Connect to a server                                       /*{{{*/
-// ---------------------------------------------------------------------
-/* Performs a connection to the server */
-bool Connect(std::string Host,int Port,const char *Service,int DefPort,int &Fd,
-            unsigned long TimeOut,pkgAcqMethod *Owner)
-{
-   if (_error->PendingError() == true)
-      return false;
 
+// Connect to a given Hostname 
+bool ConnectAfterSrvRecords(std::string Host,int Port,const char *Service,
+                            int DefPort,int &Fd,
+                            unsigned long TimeOut,pkgAcqMethod *Owner)
+{
    // Convert the port name/number
    char ServStr[300];
    if (Port != 0)
-      snprintf(ServStr,sizeof(ServStr),"%u",Port);
+      snprintf(ServStr,sizeof(ServStr),"%i", Port);
    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
@@ -167,6 +169,13 @@ bool Connect(std::string Host,int Port,const char *Service,int DefPort,int &Fd,
       Hints.ai_flags = AI_ADDRCONFIG;
       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());
@@ -182,7 +191,7 @@ bool Connect(std::string Host,int Port,const char *Service,int DefPort,int &Fd,
            {
               if (DefPort != 0)
               {
-                 snprintf(ServStr,sizeof(ServStr),"%u",DefPort);
+                 snprintf(ServStr, sizeof(ServStr), "%i", DefPort);
                  DefPort = 0;
                  continue;
               }
@@ -198,8 +207,8 @@ bool Connect(std::string Host,int Port,const char *Service,int DefPort,int &Fd,
                                    Host.c_str());
            }
            if (Res == EAI_SYSTEM)
-              return _error->Error(_("System error resolving '%s:%s' (%s)"),
-                                   Host.c_str(),ServStr,strerror(errno));
+              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));
         }
@@ -250,3 +259,38 @@ bool Connect(std::string Host,int Port,const char *Service,int DefPort,int &Fd,
    return _error->Error(_("Unable to connect to %s:%s:"),Host.c_str(),ServStr);
 }
                                                                        /*}}}*/
+// Connect - Connect to a server                                       /*{{{*/
+// ---------------------------------------------------------------------
+/* Performs a connection to the server */
+bool Connect(std::string Host,int Port,const char *Service,
+                            int DefPort,int &Fd,
+                            unsigned long TimeOut,pkgAcqMethod *Owner)
+{
+#if 0
+   if (_error->PendingError() == true)
+      return false;
+#endif
+
+   if(LastHost != Host || LastPort != Port)
+   {
+      SrvRecords.clear();
+      bool res = GetSrvRecords(Host, DefPort, SrvRecords);
+   }
+   if(SrvRecords.size() == 0)
+      return ConnectAfterSrvRecords(Host, Port, Service, DefPort, Fd, 
+                                    TimeOut, Owner);
+
+   bool connected = false;
+   while(SrvRecords.size() > 0)
+   {
+      Host = SrvRecords[0].target;
+      connected = ConnectAfterSrvRecords(Host, Port, Service, DefPort, Fd, 
+                                         TimeOut, Owner);
+      if(connected == true)
+         return true;
+
+      // we couldn't connect to this one, use the next
+      SrvRecords.erase(SrvRecords.begin());
+   } 
+   return false;
+}