Tidy use of flNotFile

[apt.git] / methods / ftp.cc

diff --git a/methods/ftp.cc b/methods/ftp.cc
index 1068a8fdef2edc6b73b8ce07047649e78e3b6aa1..10f1406f50223e502139d5f5e6f0c4d8ec029374 100644 (file)
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -1,23 +1,24 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: ftp.cc,v 1.1 1999/03/15 06:00:59 jgg Exp $
+// $Id: ftp.cc,v 1.29 2002/04/24 05:35:13 jgg Exp $

 /* ######################################################################
 
 /* ######################################################################
 

-   HTTP Aquire Method - This is the FTP aquire method for APT.
+   FTP Aquire Method - This is the FTP aquire method for APT.

 
    This is a very simple implementation that does not try to optimize
    at all. Commands are sent syncronously with the FTP server (as the
    rfc recommends, but it is not really necessary..) and no tricks are
    done to speed things along.
 
    This is a very simple implementation that does not try to optimize
    at all. Commands are sent syncronously with the FTP server (as the
    rfc recommends, but it is not really necessary..) and no tricks are
    done to speed things along.

-                                                              
+                       
+   RFC 2428 describes the IPv6 FTP behavior
+   

    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>

-#include <apt-pkg/md5.h>
-#include "ftp.h"
+#include <apt-pkg/hashes.h>

 
 #include <sys/stat.h>
 #include <sys/time.h>
 
 #include <sys/stat.h>
 #include <sys/time.h>


@@ -27,6 +28,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <errno.h>
 #include <stdarg.h>

+#include <iostream>

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


@@ -34,11 +36,32 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 
 #include <arpa/inet.h>
 #include <netdb.h>
 

+#include "rfc2553emu.h"
+#include "connect.h"
+#include "ftp.h"

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

+using namespace std;
+
+/* This table is for the EPRT and EPSV commands, it maps the OS address
+   family to the IETF address families */
+struct AFMap
+{
+   unsigned long Family;
+   unsigned long IETFFamily;
+};
+
+#ifndef AF_INET6
+struct AFMap AFMap[] = {{AF_INET,1},{}};
+#else
+struct AFMap AFMap[] = {{AF_INET,1},{AF_INET6,2},{}};
+#endif
+

 unsigned long TimeOut = 120;
 URI Proxy;
 unsigned long TimeOut = 120;
 URI Proxy;

-bool Debug;
+string FtpMethod::FailFile;
+int FtpMethod::FailFd = -1;
+time_t FtpMethod::FailTime = 0;

 
 // FTPConn::FTPConn - Constructor                                      /*{{{*/
 // ---------------------------------------------------------------------
 
 // FTPConn::FTPConn - Constructor                                      /*{{{*/
 // ---------------------------------------------------------------------


@@ -46,8 +69,8 @@ bool Debug;
 FTPConn::FTPConn(URI Srv) : Len(0), ServerFd(-1), DataFd(-1), 
                             DataListenFd(-1), ServerName(Srv)
 {
 FTPConn::FTPConn(URI Srv) : Len(0), ServerFd(-1), DataFd(-1), 
                             DataListenFd(-1), ServerName(Srv)
 {

-   Debug = true;
-   memset(&PasvAddr,0,sizeof(PasvAddr));
+   Debug = _config->FindB("Debug::Acquire::Ftp",false);
+   PasvAddr = 0;

 }
                                                                        /*}}}*/
 // FTPConn::~FTPConn - Destructor                                      /*{{{*/
 }
                                                                        /*}}}*/
 // FTPConn::~FTPConn - Destructor                                      /*{{{*/


@@ -69,23 +92,24 @@ void FTPConn::Close()
    DataFd = -1;
    close(DataListenFd);
    DataListenFd = -1;
    DataFd = -1;
    close(DataListenFd);
    DataListenFd = -1;

-   memset(&PasvAddr,0,sizeof(PasvAddr));
+   
+   if (PasvAddr != 0)
+      freeaddrinfo(PasvAddr);
+   PasvAddr = 0;

 }
                                                                        /*}}}*/
 // FTPConn::Open - Open a new connection                               /*{{{*/
 // ---------------------------------------------------------------------
 /* Connect to the server using a non-blocking connection and perform a 
    login. */
 }
                                                                        /*}}}*/
 // FTPConn::Open - Open a new connection                               /*{{{*/
 // ---------------------------------------------------------------------
 /* Connect to the server using a non-blocking connection and perform a 
    login. */

-string LastHost;
-in_addr LastHostA;
-bool FTPConn::Open()
+bool FTPConn::Open(pkgAcqMethod *Owner)

 {
    // Use the already open connection if possible.
    if (ServerFd != -1)
       return true;
    
    Close();
 {
    // Use the already open connection if possible.
    if (ServerFd != -1)
       return true;
    
    Close();

-
+   

    // Determine the proxy setting
    if (getenv("ftp_proxy") == 0)
    {
    // Determine the proxy setting
    if (getenv("ftp_proxy") == 0)
    {


@@ -104,15 +128,20 @@ bool FTPConn::Open()
    else
       Proxy = getenv("ftp_proxy");
    
    else
       Proxy = getenv("ftp_proxy");
    

+   // Parse no_proxy, a , separated list of domains
+   if (getenv("no_proxy") != 0)
+   {
+      if (CheckDomainList(ServerName.Host,getenv("no_proxy")) == true)
+        Proxy = "";
+   }
+   

    // Determine what host and port to use based on the proxy settings
    // Determine what host and port to use based on the proxy settings

-   int Port = 21;
+   int Port = 0;

    string Host;   
    if (Proxy.empty() == true)
    {
       if (ServerName.Port != 0)
         Port = ServerName.Port;
    string Host;   
    if (Proxy.empty() == true)
    {
       if (ServerName.Port != 0)
         Port = ServerName.Port;

-      else
-        ServerName.Port = Port;

       Host = ServerName.Host;
    }
    else
       Host = ServerName.Host;
    }
    else


@@ -121,51 +150,28 @@ bool FTPConn::Open()
         Port = Proxy.Port;
       Host = Proxy.Host;
    }
         Port = Proxy.Port;
       Host = Proxy.Host;
    }

+
+   /* Connect to the remote server. Since FTP is connection oriented we
+      want to make sure we get a new server every time we reconnect */
+   RotateDNS();
+   if (Connect(Host,Port,"ftp",21,ServerFd,TimeOut,Owner) == false)
+      return false;
+
+   // Login must be before getpeername otherwise dante won't work.
+   Owner->Status("Logging in");
+   bool Res = Login();

    
    

-   /* 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)
-   {
-//      Owner->Status("Connecting to %s",Host.c_str());
-
-      // Lookup the host
-      hostent *Addr = gethostbyname(Host.c_str());
-      if (Addr == 0 || Addr->h_addr_list[0] == 0)
-        return _error->Error("Could not resolve '%s'",Host.c_str());
-      LastHost = Host;
-      LastHostA = *(in_addr *)(Addr->h_addr_list[0]);
-   }
+   // Get the remote server's address
+   PeerAddrLen = sizeof(PeerAddr);
+   if (getpeername(ServerFd,(sockaddr *)&PeerAddr,&PeerAddrLen) != 0)
+      return _error->Errno("getpeername","Unable to determine the peer name");

    
    

-//   Owner->Status("Connecting to %s (%s)",Host.c_str(),inet_ntoa(LastHostA));
+   // Get the local machine's address
+   ServerAddrLen = sizeof(ServerAddr);
+   if (getsockname(ServerFd,(sockaddr *)&ServerAddr,&ServerAddrLen) != 0)
+      return _error->Errno("getsockname","Unable to determine the local name");

    
    

-   // Get a socket
-   if ((ServerFd = socket(AF_INET,SOCK_STREAM,0)) < 0)
-      return _error->Errno("socket","Could not create a socket");
-   
-   // Connect to the server
-   struct sockaddr_in server;
-   server.sin_family = AF_INET;
-   server.sin_port = htons(Port);
-   server.sin_addr = LastHostA;
-   SetNonBlock(ServerFd,true);
-   if (connect(ServerFd,(sockaddr *)&server,sizeof(server)) < 0 &&
-       errno != EINPROGRESS)
-      return _error->Errno("socket","Could not create a socket");
-   Peer = server;
-   
-   /* This implements a timeout for connect by opening the connection
-      nonblocking */
-   if (WaitFd(ServerFd,true,TimeOut) == false)
-      return _error->Error("Could not connect, connection timed out");
-   unsigned int Err;
-   unsigned int Len = sizeof(Err);
-   if (getsockopt(ServerFd,SOL_SOCKET,SO_ERROR,&Err,&Len) != 0)
-      return _error->Errno("getsockopt","Failed");
-   if (Err != 0)
-      return _error->Error("Could not connect.");
-
-   return Login();
+   return Res;

 }
                                                                        /*}}}*/
 // FTPConn::Login - Login to the remote server                         /*{{{*/
 }
                                                                        /*}}}*/
 // FTPConn::Login - Login to the remote server                         /*{{{*/


@@ -179,7 +185,7 @@ bool FTPConn::Login()
    
    // Setup the variables needed for authentication
    string User = "anonymous";
    
    // Setup the variables needed for authentication
    string User = "anonymous";

-   string Pass = "apt_get_ftp_2.0@debian.linux.user";
+   string Pass = "apt_get_ftp_2.1@debian.linux.user";

 
    // Fill in the user/pass
    if (ServerName.User.empty() == false)
 
    // Fill in the user/pass
    if (ServerName.User.empty() == false)


@@ -209,17 +215,10 @@ bool FTPConn::Login()
         return _error->Error("PASS failed, server said: %s",Msg.c_str());
       
       // Enter passive mode
         return _error->Error("PASS failed, server said: %s",Msg.c_str());
       
       // Enter passive mode

-      TryPassive = false;
-      if (_config->Exists("Acquire::FTP::Passive::" + ServerName.Host) == true &&
-         _config->FindB("Acquire::FTP::Passive::" + ServerName.Host,true) == true)
-      {
-        TryPassive = true;
-      }      
+      if (_config->Exists("Acquire::FTP::Passive::" + ServerName.Host) == true)
+        TryPassive = _config->FindB("Acquire::FTP::Passive::" + ServerName.Host,true);

       else
       else

-      {
-        if (_config->FindB("Acquire::FTP::Passive",true) == true)
-           TryPassive = true;
-      }      
+        TryPassive = _config->FindB("Acquire::FTP::Passive",true);      

    }
    else
    {      
    }
    else
    {      


@@ -244,7 +243,10 @@ bool FTPConn::Login()
         
         // Substitute the variables into the command
         char SitePort[20];
         
         // Substitute the variables into the command
         char SitePort[20];

-        sprintf(SitePort,"%u",ServerName.Port);
+        if (ServerName.Port != 0)
+           sprintf(SitePort,"%u",ServerName.Port);
+        else
+           strcpy(SitePort,"21");

         string Tmp = Opts->Value;
         Tmp = SubstVar(Tmp,"$(PROXY_USER)",Proxy.User);
         Tmp = SubstVar(Tmp,"$(PROXY_PASS)",Proxy.Password);
         string Tmp = Opts->Value;
         Tmp = SubstVar(Tmp,"$(PROXY_USER)",Proxy.User);
         Tmp = SubstVar(Tmp,"$(PROXY_PASS)",Proxy.Password);


@@ -262,22 +264,23 @@ bool FTPConn::Login()
       
       // Enter passive mode
       TryPassive = false;
       
       // Enter passive mode
       TryPassive = false;

-      if (_config->Exists("Acquire::FTP::Passive::" + ServerName.Host) == true &&
-         _config->FindB("Acquire::FTP::Passive::" + ServerName.Host,true) == true)
-      {
-        TryPassive = true;
-      }      
+      if (_config->Exists("Acquire::FTP::Passive::" + ServerName.Host) == true)
+        TryPassive = _config->FindB("Acquire::FTP::Passive::" + ServerName.Host,true);

       else
       {
       else
       {

-        if (_config->Exists("Acquire::FTP::Proxy::Passive") == true &&
-            _config->FindB("Acquire::FTP::Proxy::Passive",true) == true)
-           TryPassive = true;
+        if (_config->Exists("Acquire::FTP::Proxy::Passive") == true)
+           TryPassive = _config->FindB("Acquire::FTP::Proxy::Passive",true);

         else
         else

-           if (_config->FindB("Acquire::FTP::Passive",true) == true)
-              TryPassive = true;              
+           TryPassive = _config->FindB("Acquire::FTP::Passive",true);

       }            
    }
 
       }            
    }
 

+   // Force the use of extended commands
+   if (_config->Exists("Acquire::FTP::ForceExtended::" + ServerName.Host) == true)
+      ForceExtended = _config->FindB("Acquire::FTP::ForceExtended::" + ServerName.Host,true);
+   else
+      ForceExtended = _config->FindB("Acquire::FTP::ForceExtended",false);
+   

    // Binary mode
    if (WriteMsg(Tag,Msg,"TYPE I") == false)
       return false;
    // Binary mode
    if (WriteMsg(Tag,Msg,"TYPE I") == false)
       return false;


@@ -292,6 +295,9 @@ bool FTPConn::Login()
 /* This performs a very simple buffered read. */
 bool FTPConn::ReadLine(string &Text)
 {
 /* This performs a very simple buffered read. */
 bool FTPConn::ReadLine(string &Text)
 {

+   if (ServerFd == -1)
+      return false;
+   

    // Suck in a line
    while (Len < sizeof(Buffer))
    {
    // Suck in a line
    while (Len < sizeof(Buffer))
    {


@@ -315,12 +321,21 @@ bool FTPConn::ReadLine(string &Text)
 
       // Wait for some data..
       if (WaitFd(ServerFd,false,TimeOut) == false)
 
       // Wait for some data..
       if (WaitFd(ServerFd,false,TimeOut) == false)

+      {
+        Close();

         return _error->Error("Connection timeout");
         return _error->Error("Connection timeout");

+      }

       
       // Suck it back
       
       // Suck it back

-      int Res = read(ServerFd,Buffer,sizeof(Buffer) - Len);
+      int Res = read(ServerFd,Buffer + Len,sizeof(Buffer) - Len);
+      if (Res == 0)
+        _error->Error("Server closed the connection");

       if (Res <= 0)
       if (Res <= 0)

-        return _error->Errno("read","Read error");
+      {
+        _error->Errno("read","Read error");
+        Close();
+        return false;
+      }      

       Len += Res;
    }
 
       Len += Res;
    }
 


@@ -348,7 +363,7 @@ bool FTPConn::ReadResp(unsigned int &Ret,string &Text)
    if (*End == ' ')
    {
       if (Debug == true)
    if (*End == ' ')
    {
       if (Debug == true)

-        cout << "<- '" << QuoteString(Text,"") << "'" << endl;
+        cerr << "<- '" << QuoteString(Text,"") << "'" << endl;

       return true;
    }
    
       return true;
    }
    


@@ -390,7 +405,7 @@ bool FTPConn::ReadResp(unsigned int &Ret,string &Text)
    }      
 
    if (Debug == true && _error->PendingError() == false)
    }      
 
    if (Debug == true && _error->PendingError() == false)

-      cout << "<- '" << QuoteString(Text,"") << "'" << endl;
+      cerr << "<- '" << QuoteString(Text,"") << "'" << endl;

       
    return !_error->PendingError();
 }
       
    return !_error->PendingError();
 }


@@ -409,7 +424,7 @@ bool FTPConn::WriteMsg(unsigned int &Ret,string &Text,const char *Fmt,...)
    strcat(S,"\r\n");
  
    if (Debug == true)
    strcat(S,"\r\n");
  
    if (Debug == true)

-      cout << "-> '" << QuoteString(S,"") << "'" << endl;
+      cerr << "-> '" << QuoteString(S,"") << "'" << endl;

 
    // Send it off
    unsigned long Len = strlen(S);
 
    // Send it off
    unsigned long Len = strlen(S);


@@ -417,11 +432,19 @@ bool FTPConn::WriteMsg(unsigned int &Ret,string &Text,const char *Fmt,...)
    while (Len != 0)
    {
       if (WaitFd(ServerFd,true,TimeOut) == false)
    while (Len != 0)
    {
       if (WaitFd(ServerFd,true,TimeOut) == false)

+      {
+        Close();

         return _error->Error("Connection timeout");
         return _error->Error("Connection timeout");

+      }

       
       int Res = write(ServerFd,S + Start,Len);
       if (Res <= 0)
       
       int Res = write(ServerFd,S + Start,Len);
       if (Res <= 0)

-        return _error->Errno("write","Write Error");
+      {
+        _error->Errno("write","Write Error");
+        Close();
+        return false;
+      }
+      

       Len -= Res;
       Start += Res;
    }
       Len -= Res;
       Start += Res;
    }


@@ -433,10 +456,19 @@ bool FTPConn::WriteMsg(unsigned int &Ret,string &Text,const char *Fmt,...)
 // ---------------------------------------------------------------------
 /* Try to enter passive mode, the return code does not indicate if passive
    mode could or could not be established, only if there was a fatal error. 
 // ---------------------------------------------------------------------
 /* Try to enter passive mode, the return code does not indicate if passive
    mode could or could not be established, only if there was a fatal error. 

-   Borrowed mostly from lftp. We have to enter passive mode every time 
- we make a data connection :| */
+   We have to enter passive mode every time we make a data connection :| */

 bool FTPConn::GoPasv()
 {
 bool FTPConn::GoPasv()
 {

+   /* The PASV command only works on IPv4 sockets, even though it could
+      in theory suppory IPv6 via an all zeros reply */
+   if (((struct sockaddr *)&PeerAddr)->sa_family != AF_INET || 
+       ForceExtended == true)
+      return ExtGoPasv();
+   
+   if (PasvAddr != 0)
+      freeaddrinfo(PasvAddr);
+   PasvAddr = 0;
+   

    // Try to enable pasv mode
    unsigned int Tag;
    string Msg;
    // Try to enable pasv mode
    unsigned int Tag;
    string Msg;


@@ -446,41 +478,139 @@ bool FTPConn::GoPasv()
    // Unsupported function
    string::size_type Pos = Msg.find('(');
    if (Tag >= 400 || Pos == string::npos)
    // Unsupported function
    string::size_type Pos = Msg.find('(');
    if (Tag >= 400 || Pos == string::npos)

-   {
-      memset(&PasvAddr,0,sizeof(PasvAddr));

       return true;
       return true;

-   }

 
    // Scan it
    unsigned a0,a1,a2,a3,p0,p1;
    if (sscanf(Msg.c_str() + Pos,"(%u,%u,%u,%u,%u,%u)",&a0,&a1,&a2,&a3,&p0,&p1) != 6)
 
    // Scan it
    unsigned a0,a1,a2,a3,p0,p1;
    if (sscanf(Msg.c_str() + Pos,"(%u,%u,%u,%u,%u,%u)",&a0,&a1,&a2,&a3,&p0,&p1) != 6)

+      return true;
+   
+   /* Some evil servers return 0 to mean their addr. We can actually speak
+      to these servers natively using IPv6 */
+   if (a0 == 0 && a1 == 0 && a2 == 0 && a3 == 0)

    {
    {

-      memset(&PasvAddr,0,sizeof(PasvAddr));
+      // Get the IP in text form
+      char Name[NI_MAXHOST];
+      char Service[NI_MAXSERV];
+      getnameinfo((struct sockaddr *)&PeerAddr,PeerAddrLen,
+                 Name,sizeof(Name),Service,sizeof(Service),
+                 NI_NUMERICHOST|NI_NUMERICSERV);
+      
+      struct addrinfo Hints;
+      memset(&Hints,0,sizeof(Hints));
+      Hints.ai_socktype = SOCK_STREAM;
+      Hints.ai_family = ((struct sockaddr *)&PeerAddr)->sa_family;
+      Hints.ai_flags |= AI_NUMERICHOST;
+      
+      // Get a new passive address.
+      char Port[100];
+      snprintf(Port,sizeof(Port),"%u",(p0 << 8) + p1);
+      if (getaddrinfo(Name,Port,&Hints,&PasvAddr) != 0)
+        return true;

       return true;
    }
    
       return true;
    }
    

-   // lftp used this horrid byte order manipulation.. Ik.
-   PasvAddr.sin_family = AF_INET;
-   unsigned char *a;
-   unsigned char *p;
-   a = (unsigned char *)&PasvAddr.sin_addr;
-   p = (unsigned char *)&PasvAddr.sin_port;
+   struct addrinfo Hints;
+   memset(&Hints,0,sizeof(Hints));
+   Hints.ai_socktype = SOCK_STREAM;
+   Hints.ai_family = AF_INET;
+   Hints.ai_flags |= AI_NUMERICHOST;

    
    

-   // Some evil servers return 0 to mean their addr
-   if (a0 == 0 && a1 == 0 && a2 == 0 && a3 == 0)
+   // Get a new passive address.
+   char Port[100];
+   snprintf(Port,sizeof(Port),"%u",(p0 << 8) + p1);
+   char Name[100];
+   snprintf(Name,sizeof(Name),"%u.%u.%u.%u",a0,a1,a2,a3);
+   if (getaddrinfo(Name,Port,&Hints,&PasvAddr) != 0)
+      return true;
+   return true;
+}
+                                                                       /*}}}*/
+// FTPConn::ExtGoPasv - Enter Extended Passive mode                    /*{{{*/
+// ---------------------------------------------------------------------
+/* Try to enter extended passive mode. See GoPasv above and RFC 2428 */
+bool FTPConn::ExtGoPasv()
+{
+   if (PasvAddr != 0)
+      freeaddrinfo(PasvAddr);
+   PasvAddr = 0;
+   
+   // Try to enable pasv mode
+   unsigned int Tag;
+   string Msg;
+   if (WriteMsg(Tag,Msg,"EPSV") == false)
+      return false;
+   
+   // Unsupported function
+   string::size_type Pos = Msg.find('(');
+   if (Tag >= 400 || Pos == string::npos)
+      return true;
+
+   // Scan it   
+   string::const_iterator List[4];
+   unsigned Count = 0;
+   Pos++;
+   for (string::const_iterator I = Msg.begin() + Pos; I < Msg.end(); I++)

    {
    {

-      PasvAddr.sin_addr = Peer.sin_addr;
+      if (*I != Msg[Pos])
+        continue;
+      if (Count >= 4)
+        return true;
+      List[Count++] = I;
+   }
+   if (Count != 4)
+      return true;
+   
+   // Break it up ..
+   unsigned long Proto = 0;
+   unsigned long Port = 0;
+   string IP;
+   IP = string(List[1]+1,List[2]);
+   Port = atoi(string(List[2]+1,List[3]).c_str());
+   if (IP.empty() == false)
+      Proto = atoi(string(List[0]+1,List[1]).c_str());
+   
+   if (Port == 0)
+      return false;
+
+   // String version of the port
+   char PStr[100];
+   snprintf(PStr,sizeof(PStr),"%lu",Port);
+
+   // Get the IP in text form
+   struct addrinfo Hints;
+   memset(&Hints,0,sizeof(Hints));
+   Hints.ai_socktype = SOCK_STREAM;
+   Hints.ai_flags |= AI_NUMERICHOST;
+   
+   /* The RFC defined case, connect to the old IP/protocol using the
+      new port. */
+   if (IP.empty() == true)
+   {
+      // Get the IP in text form
+      char Name[NI_MAXHOST];
+      char Service[NI_MAXSERV];
+      getnameinfo((struct sockaddr *)&PeerAddr,PeerAddrLen,
+                 Name,sizeof(Name),Service,sizeof(Service),
+                 NI_NUMERICHOST|NI_NUMERICSERV);
+      IP = Name;
+      Hints.ai_family = ((struct sockaddr *)&PeerAddr)->sa_family;

    }
    else
    {
    }
    else
    {

-      a[0] = a0; 
-      a[1] = a1; 
-      a[2] = a2; 
-      a[3] = a3;
+      // Get the family..
+      Hints.ai_family = 0;
+      for (unsigned J = 0; AFMap[J].Family != 0; J++)
+        if (AFMap[J].IETFFamily == Proto)
+           Hints.ai_family = AFMap[J].Family;
+      if (Hints.ai_family == 0)
+        return true;

    }
    
    }
    

-   p[0] = p0;
-   p[1] = p1;
+   // Get a new passive address.
+   int Res;
+   if ((Res = getaddrinfo(IP.c_str(),PStr,&Hints,&PasvAddr)) != 0)
+      return true;

    
    return true;
 }
    
    return true;
 }


@@ -488,19 +618,20 @@ bool FTPConn::GoPasv()
 // FTPConn::Size - Return the size of a file                           /*{{{*/
 // ---------------------------------------------------------------------
 /* Grab the file size from the server, 0 means no size or empty file */
 // FTPConn::Size - Return the size of a file                           /*{{{*/
 // ---------------------------------------------------------------------
 /* Grab the file size from the server, 0 means no size or empty file */

-unsigned long FTPConn::Size(const char *Path)
+bool FTPConn::Size(const char *Path,unsigned long &Size)

 {
    // Query the size
    unsigned int Tag;
    string Msg;
 {
    // Query the size
    unsigned int Tag;
    string Msg;

+   Size = 0;

    if (WriteMsg(Tag,Msg,"SIZE %s",Path) == false)
       return false;
    
    char *End;
    if (WriteMsg(Tag,Msg,"SIZE %s",Path) == false)
       return false;
    
    char *End;

-   unsigned long Size = strtol(Msg.c_str(),&End,10);
+   Size = strtol(Msg.c_str(),&End,10);

    if (Tag >= 400 || End == Msg.c_str())
    if (Tag >= 400 || End == Msg.c_str())

-      return 0;
-   return Size;
+      Size = 0;
+   return true;

 }
                                                                        /*}}}*/
 // FTPConn::ModTime - Return the modification time of the file         /*{{{*/
 }
                                                                        /*}}}*/
 // FTPConn::ModTime - Return the modification time of the file         /*{{{*/


@@ -521,18 +652,7 @@ bool FTPConn::ModTime(const char *Path, time_t &Time)
       return true;
    
    // Parse it
       return true;
    
    // Parse it

-   struct tm tm;
-   memset(&tm,0,sizeof(tm));   
-   if (sscanf(Msg.c_str(),"%4d%2d%2d%2d%2d%2d",&tm.tm_year,&tm.tm_mon,
-             &tm.tm_mday,&tm.tm_hour,&tm.tm_min,&tm.tm_sec) != 6)
-      return true;
-   
-   tm.tm_year -= 1900;
-   tm.tm_mon--;
-   
-   /* We use timegm from the GNU C library, libapt-pkg will provide this
-      symbol if it does not exist */
-   Time = timegm(&tm);
+   StrToTime(Msg,Time);

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -551,79 +671,127 @@ bool FTPConn::CreateDataFd()
         return false;
       
       // Oops, didn't work out, don't bother trying again.
         return false;
       
       // Oops, didn't work out, don't bother trying again.

-      if (PasvAddr.sin_port == 0)
+      if (PasvAddr == 0)

         TryPassive = false;
    }
    
    // Passive mode?
         TryPassive = false;
    }
    
    // Passive mode?

-   if (PasvAddr.sin_port != 0)
+   if (PasvAddr != 0)

    {
       // Get a socket
    {
       // Get a socket

-      if ((DataFd = socket(AF_INET,SOCK_STREAM,0)) < 0)
+      if ((DataFd = socket(PasvAddr->ai_family,PasvAddr->ai_socktype,
+                          PasvAddr->ai_protocol)) < 0)

         return _error->Errno("socket","Could not create a socket");
       
       // Connect to the server
       SetNonBlock(DataFd,true);
         return _error->Errno("socket","Could not create a socket");
       
       // Connect to the server
       SetNonBlock(DataFd,true);

-      if (connect(DataFd,(sockaddr *)&PasvAddr,sizeof(PasvAddr)) < 0 &&
+      if (connect(DataFd,PasvAddr->ai_addr,PasvAddr->ai_addrlen) < 0 &&

          errno != EINPROGRESS)
         return _error->Errno("socket","Could not create a socket");
    
       /* This implements a timeout for connect by opening the connection
          errno != EINPROGRESS)
         return _error->Errno("socket","Could not create a socket");
    
       /* This implements a timeout for connect by opening the connection

-       nonblocking */
-      if (WaitFd(ServerFd,true,TimeOut) == false)
+         nonblocking */
+      if (WaitFd(DataFd,true,TimeOut) == false)

         return _error->Error("Could not connect data socket, connection timed out");
       unsigned int Err;
       unsigned int Len = sizeof(Err);
         return _error->Error("Could not connect data socket, connection timed out");
       unsigned int Err;
       unsigned int Len = sizeof(Err);

-      if (getsockopt(ServerFd,SOL_SOCKET,SO_ERROR,&Err,&Len) != 0)
+      if (getsockopt(DataFd,SOL_SOCKET,SO_ERROR,&Err,&Len) != 0)

         return _error->Errno("getsockopt","Failed");
       if (Err != 0)
         return _error->Errno("getsockopt","Failed");
       if (Err != 0)

-        return _error->Error("Could not connect.");
-      
+        return _error->Error("Could not connect passive socket.");
+

       return true;
    }
    
    // Port mode :<
       return true;
    }
    
    // Port mode :<

-   if (DataListenFd == -1)
+   close(DataListenFd);
+   DataListenFd = -1;
+
+   // Get the information for a listening socket.
+   struct addrinfo *BindAddr = 0;
+   struct addrinfo Hints;
+   memset(&Hints,0,sizeof(Hints));
+   Hints.ai_socktype = SOCK_STREAM;
+   Hints.ai_flags |= AI_PASSIVE;
+   Hints.ai_family = ((struct sockaddr *)&ServerAddr)->sa_family;
+   int Res;
+   if ((Res = getaddrinfo(0,"0",&Hints,&BindAddr)) != 0)
+      return _error->Error("getaddrinfo was unable to get a listening socket");
+   
+   // Construct the socket
+   if ((DataListenFd = socket(BindAddr->ai_family,BindAddr->ai_socktype,
+                             BindAddr->ai_protocol)) < 0)

    {
    {

-      // Get a socket
-      if ((DataListenFd = socket(AF_INET,SOCK_STREAM,0)) < 0)
-        return _error->Errno("socket","Could not create a socket");
-      
-      // Bind and listen
-      sockaddr_in Addr;
-      memset(&Addr,0,sizeof(Addr));
-      if (bind(DataListenFd,(sockaddr *)&Addr,sizeof(Addr)) < 0)
-        return _error->Errno("bind","Could not bind a socket");
-      if (listen(DataListenFd,1) < 0)
-        return _error->Errno("listen","Could not listen on the socket");
-      SetNonBlock(DataListenFd,true);
+      freeaddrinfo(BindAddr);
+      return _error->Errno("socket","Could not create a socket");

    }
    
    }
    

+   // Bind and listen
+   if (bind(DataListenFd,BindAddr->ai_addr,BindAddr->ai_addrlen) < 0)
+   {
+      freeaddrinfo(BindAddr);
+      return _error->Errno("bind","Could not bind a socket");
+   }
+   freeaddrinfo(BindAddr);   
+   if (listen(DataListenFd,1) < 0)
+      return _error->Errno("listen","Could not listen on the socket");
+   SetNonBlock(DataListenFd,true);
+   

    // Determine the name to send to the remote
    // Determine the name to send to the remote

-   sockaddr_in Addr;
-   sockaddr_in Addr2;
-   socklen_t Jnk = sizeof(Addr);
-   if (getsockname(DataListenFd,(sockaddr *)&Addr,&Jnk) < 0)
-      return _error->Errno("getsockname","Could not determine the socket's name");
-   Jnk = sizeof(Addr2);
-   if (getsockname(ServerFd,(sockaddr *)&Addr2,&Jnk) < 0)
+   struct sockaddr_storage Addr;
+   socklen_t AddrLen = sizeof(Addr);
+   if (getsockname(DataListenFd,(sockaddr *)&Addr,&AddrLen) < 0)

       return _error->Errno("getsockname","Could not determine the socket's name");
       return _error->Errno("getsockname","Could not determine the socket's name");

-   
-   // This bit ripped from qftp
-   unsigned long badr = ntohl(*(unsigned long *)&Addr2.sin_addr);
-   unsigned long bp = ntohs(Addr.sin_port);

 
 

-   // Send the port command
+   // Reverse the address. We need the server address and the data port.
+   char Name[NI_MAXHOST];
+   char Service[NI_MAXSERV];
+   char Service2[NI_MAXSERV];
+   getnameinfo((struct sockaddr *)&Addr,AddrLen,
+              Name,sizeof(Name),Service,sizeof(Service),
+              NI_NUMERICHOST|NI_NUMERICSERV);
+   getnameinfo((struct sockaddr *)&ServerAddr,ServerAddrLen,
+              Name,sizeof(Name),Service2,sizeof(Service2),
+              NI_NUMERICHOST|NI_NUMERICSERV);
+
+   // Send off an IPv4 address in the old port format
+   if (((struct sockaddr *)&Addr)->sa_family == AF_INET && 
+       ForceExtended == false)
+   {
+      // Convert the dots in the quad into commas
+      for (char *I = Name; *I != 0; I++)
+        if (*I == '.')
+           *I = ',';
+      unsigned long Port = atoi(Service);
+      
+      // Send the port command
+      unsigned int Tag;
+      string Msg;
+      if (WriteMsg(Tag,Msg,"PORT %s,%d,%d",
+                  Name,
+                  (int)(Port >> 8) & 0xff, (int)(Port & 0xff)) == false)
+        return false;
+      if (Tag >= 400)
+        return _error->Error("Unable to send PORT command");
+      return true;
+   }
+
+   // Construct an EPRT command
+   unsigned Proto = 0;
+   for (unsigned J = 0; AFMap[J].Family != 0; J++)
+      if (AFMap[J].Family == ((struct sockaddr *)&Addr)->sa_family)
+        Proto = AFMap[J].IETFFamily;
+   if (Proto == 0)
+      return _error->Error("Unkonwn address family %u (AF_*)",
+                          ((struct sockaddr *)&Addr)->sa_family);
+   
+   // Send the EPRT command

    unsigned int Tag;
    string Msg;
    unsigned int Tag;
    string Msg;

-   if (WriteMsg(Tag,Msg,"PORT %d,%d,%d,%d,%d,%d", 
-               (int) (badr >> 24) & 0xff, (int) (badr >> 16) & 0xff, 
-               (int) (badr >> 8) & 0xff,  (int) badr & 0xff, 
-               (int) (bp >> 8) & 0xff, (int) bp & 0xff) == false)
+   if (WriteMsg(Tag,Msg,"EPRT |%u|%s|%s|",Proto,Name,Service) == false)

       return false;
    if (Tag >= 400)
       return false;
    if (Tag >= 400)

-      return _error->Error("Unable to send port command");
-
+      return _error->Error("EPRT failed, server said: %s",Msg.c_str());

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -634,7 +802,7 @@ bool FTPConn::CreateDataFd()
 bool FTPConn::Finalize()
 {
    // Passive mode? Do nothing
 bool FTPConn::Finalize()
 {
    // Passive mode? Do nothing

-   if (PasvAddr.sin_port != 0)
+   if (PasvAddr != 0)

       return true;
    
    // Close any old socket..
       return true;
    
    // Close any old socket..


@@ -652,6 +820,9 @@ bool FTPConn::Finalize()
    if (DataFd < 0)
       return _error->Errno("accept","Unable to accept connection");
 
    if (DataFd < 0)
       return _error->Errno("accept","Unable to accept connection");
 

+   close(DataListenFd);
+   DataListenFd = -1;
+   

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -659,13 +830,15 @@ bool FTPConn::Finalize()
 // ---------------------------------------------------------------------
 /* This opens a data connection, sends REST and RETR and then
    transfers the file over. */
 // ---------------------------------------------------------------------
 /* This opens a data connection, sends REST and RETR and then
    transfers the file over. */

-bool FTPConn::Get(const char *Path,FileFd &To,unsigned long Resume)
+bool FTPConn::Get(const char *Path,FileFd &To,unsigned long Resume,
+                 Hashes &Hash,bool &Missing)

 {
 {

+   Missing = false;

    if (CreateDataFd() == false)
       return false;
 
    unsigned int Tag;
    if (CreateDataFd() == false)
       return false;
 
    unsigned int Tag;

-   string Msg;
+   string Msg;   

    if (Resume != 0)
    {      
       if (WriteMsg(Tag,Msg,"REST %u",Resume) == false)
    if (Resume != 0)
    {      
       if (WriteMsg(Tag,Msg,"REST %u",Resume) == false)


@@ -676,13 +849,29 @@ bool FTPConn::Get(const char *Path,FileFd &To,unsigned long Resume)
    
    if (To.Truncate(Resume) == false)
       return false;
    
    if (To.Truncate(Resume) == false)
       return false;

+
+   if (To.Seek(0) == false)
+      return false;
+   
+   if (Resume != 0)
+   {
+      if (Hash.AddFD(To.Fd(),Resume) == false)
+      {
+        _error->Errno("read","Problem hashing file");
+        return false;
+      }
+   }

    
    // Send the get command
    if (WriteMsg(Tag,Msg,"RETR %s",Path) == false)
       return false;
    
    if (Tag >= 400)
    
    // Send the get command
    if (WriteMsg(Tag,Msg,"RETR %s",Path) == false)
       return false;
    
    if (Tag >= 400)

+   {
+      if (Tag == 550)
+        Missing = true;

       return _error->Error("Unable to fetch file, server said '%s'",Msg.c_str());
       return _error->Error("Unable to fetch file, server said '%s'",Msg.c_str());

+   }

    
    // Finish off the data connection
    if (Finalize() == false)
    
    // Finish off the data connection
    if (Finalize() == false)


@@ -694,8 +883,11 @@ bool FTPConn::Get(const char *Path,FileFd &To,unsigned long Resume)
    {
       // Wait for some data..
       if (WaitFd(DataFd,false,TimeOut) == false)
    {
       // Wait for some data..
       if (WaitFd(DataFd,false,TimeOut) == false)

-        return _error->Error("Data socket connect timed out");
-    
+      {
+        Close();
+        return _error->Error("Data socket timed out");
+      }
+      

       // Read the data..
       int Res = read(DataFd,Buffer,sizeof(Buffer));
       if (Res == 0)
       // Read the data..
       int Res = read(DataFd,Buffer,sizeof(Buffer));
       if (Res == 0)


@@ -706,9 +898,13 @@ bool FTPConn::Get(const char *Path,FileFd &To,unsigned long Resume)
            continue;
         break;
       }
            continue;
         break;
       }

-      
+   
+      Hash.Add(Buffer,Res);

       if (To.Write(Buffer,Res) == false)
       if (To.Write(Buffer,Res) == false)

+      {
+        Close();

         return false;
         return false;

+      }      

    }
 
    // All done
    }
 
    // All done


@@ -724,37 +920,189 @@ bool FTPConn::Get(const char *Path,FileFd &To,unsigned long Resume)
 }
                                                                        /*}}}*/
 
 }
                                                                        /*}}}*/
 

-int main()
+// FtpMethod::FtpMethod - Constructor                                  /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+FtpMethod::FtpMethod() : pkgAcqMethod("1.0",SendConfig)

 {
 {

-   FTPConn Con(URI("ftp://va.debian.org/debian/README"));
-   string Msg;
-   _config->Set("Acquire::FTP::Passive","false");
+   signal(SIGTERM,SigTerm);
+   signal(SIGINT,SigTerm);

    
    

-   while (1)
+   Server = 0;
+   FailFd = -1;
+}
+                                                                       /*}}}*/
+// FtpMethod::SigTerm - Handle a fatal signal                          /*{{{*/
+// ---------------------------------------------------------------------
+/* This closes and timestamps the open file. This is neccessary to get 
+   resume behavoir on user abort */
+void FtpMethod::SigTerm(int)
+{
+   if (FailFd == -1)
+      _exit(100);
+   close(FailFd);
+   
+   // Timestamp
+   struct utimbuf UBuf;
+   UBuf.actime = FailTime;
+   UBuf.modtime = FailTime;
+   utime(FailFile.c_str(),&UBuf);
+   
+   _exit(100);
+}
+                                                                       /*}}}*/
+// FtpMethod::Configuration - Handle a configuration message           /*{{{*/
+// ---------------------------------------------------------------------
+/* We stash the desired pipeline depth */
+bool FtpMethod::Configuration(string Message)
+{
+   if (pkgAcqMethod::Configuration(Message) == false)
+      return false;
+   
+   TimeOut = _config->FindI("Acquire::Ftp::Timeout",TimeOut);
+   return true;
+}
+                                                                       /*}}}*/
+// FtpMethod::Fetch - Fetch a file                                     /*{{{*/
+// ---------------------------------------------------------------------
+/* Fetch a single file, called by the base class..  */
+bool FtpMethod::Fetch(FetchItem *Itm)
+{
+   URI Get = Itm->Uri;
+   const char *File = Get.Path.c_str();
+   FetchResult Res;
+   Res.Filename = Itm->DestFile;
+   Res.IMSHit = false;
+   
+   // Connect to the server
+   if (Server == 0 || Server->Comp(Get) == false)

    {
    {

-      if (Con.Open() == false)
-        break;
-      cout << "Size: " << Con.Size("/debian/README") << endl;
-      
-      time_t Time;
-      Con.ModTime("/debian/README",Time);      
-      cout << "Time: " << TimeRFC1123(Time) << endl;
+      delete Server;
+      Server = new FTPConn(Get);
+   }
+  
+   // Could not connect is a transient error..
+   if (Server->Open(this) == false)
+   {
+      Server->Close();
+      Fail(true);
+      return true;
+   }

    
    

+   // Get the files information
+   Status("Query");
+   unsigned long Size;
+   if (Server->Size(File,Size) == false ||
+       Server->ModTime(File,FailTime) == false)
+   {
+      Fail(true);
+      return true;
+   }
+   Res.Size = Size;
+
+   // See if it is an IMS hit
+   if (Itm->LastModified == FailTime)
+   {
+      Res.Size = 0;
+      Res.IMSHit = true;
+      URIDone(Res);
+      return true;
+   }
+   
+   // See if the file exists
+   struct stat Buf;
+   if (stat(Itm->DestFile.c_str(),&Buf) == 0)
+   {
+      if (Size == (unsigned)Buf.st_size && FailTime == Buf.st_mtime)

       {
       {

-        
-      FileFd F("t",FileFd::WriteEmpty);
-      Con.Get("/debian/README",F);
+        Res.Size = Buf.st_size;
+        Res.LastModified = Buf.st_mtime;
+        Res.ResumePoint = Buf.st_size;
+        URIDone(Res);
+        return true;

       }
       
       }
       

+      // Resume?
+      if (FailTime == Buf.st_mtime && Size > (unsigned)Buf.st_size)
+        Res.ResumePoint = Buf.st_size;
+   }
+   
+   // Open the file
+   Hashes Hash;
+   {
+      FileFd Fd(Itm->DestFile,FileFd::WriteAny);
+      if (_error->PendingError() == true)
+        return false;
+      
+      URIStart(Res);
+      
+      FailFile = Itm->DestFile;
+      FailFile.c_str();   // Make sure we dont do a malloc in the signal handler
+      FailFd = Fd.Fd();
+      
+      bool Missing;
+      if (Server->Get(File,Fd,Res.ResumePoint,Hash,Missing) == false)

       {
       {

+        Fd.Close();

         
         

-      FileFd F("t3",FileFd::WriteEmpty);
-      Con.Get("/debian/README.pgp",F);
+        // Timestamp
+        struct utimbuf UBuf;
+        UBuf.actime = FailTime;
+        UBuf.modtime = FailTime;
+        utime(FailFile.c_str(),&UBuf);
+        
+        // If the file is missing we hard fail otherwise transient fail
+        if (Missing == true)
+           return false;
+        Fail(true);
+        return true;

       }
       }

+
+      Res.Size = Fd.Size();
+   }
+   
+   Res.LastModified = FailTime;
+   Res.TakeHashes(Hash);
+   
+   // Timestamp
+   struct utimbuf UBuf;
+   UBuf.actime = FailTime;
+   UBuf.modtime = FailTime;
+   utime(Queue->DestFile.c_str(),&UBuf);
+   FailFd = -1;
+
+   URIDone(Res);
+   
+   return true;
+}
+                                                                       /*}}}*/
+
+int main(int argc,const char *argv[])
+{ 
+   /* See if we should be come the http client - we do this for http
+      proxy urls */
+   if (getenv("ftp_proxy") != 0)
+   {
+      URI Proxy = string(getenv("ftp_proxy"));

       
       

-      break;
+      // Run the HTTP method
+      if (Proxy.Access == "http")
+      {
+        // Copy over the environment setting
+        char S[300];
+        snprintf(S,sizeof(S),"http_proxy=%s",getenv("ftp_proxy"));
+        putenv(S);
+        putenv("no_proxy=");
+        
+        // Run the http method
+        string Path = flNotFile(argv[0]) + "http";
+        execl(Path.c_str(),Path.c_str(),0);
+        cerr << "Unable to invoke " << Path << endl;
+        exit(100);
+      }      

    }
    
    }
    

-   _error->DumpErrors();
-   return 0;
+   FtpMethod Mth;
+   
+   return Mth.Run();

 }
 }