evaluate Acquire::Languages= before LANG= (Closes: #602573)

[apt.git] / methods / ftp.h

diff --git a/methods/ftp.h b/methods/ftp.h
index 7416589a0c9dc11f937eac3783a6574c0ba38aff..d7f1f7fbece776cb0bfba3febbcf4fbc44da0384 100644 (file)
--- a/methods/ftp.h
+++ b/methods/ftp.h
@@ -1,5 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // -*- mode: cpp; mode: fold -*-

-// Description                                                         /*{{{*/// $Id: ftp.h,v 1.2 1999/03/15 07:20:41 jgg Exp $
+// Description                                                         /*{{{*/// $Id: ftp.h,v 1.4 2001/03/06 07:15:29 jgg Exp $
+// $Id: ftp.h,v 1.4 2001/03/06 07:15:29 jgg Exp $

 /* ######################################################################
 
    FTP Aquire Method - This is the FTP aquire method for APT.
 /* ######################################################################
 
    FTP Aquire Method - This is the FTP aquire method for APT.


@@ -17,12 +18,20 @@ class FTPConn
    int DataFd;
    int DataListenFd;
    URI ServerName;
    int DataFd;
    int DataListenFd;
    URI ServerName;

+   bool ForceExtended;

    bool TryPassive;
    bool Debug;
    bool TryPassive;
    bool Debug;

-   
-   struct sockaddr_in PasvAddr;
-   struct sockaddr_in Peer;

 
 

+   struct addrinfo *PasvAddr;
+   
+   // Generic Peer Address
+   struct sockaddr_storage PeerAddr;
+   socklen_t PeerAddrLen;
+   
+   // Generic Server Address (us)
+   struct sockaddr_storage ServerAddr;
+   socklen_t ServerAddrLen;
+   

    // Private helper functions
    bool ReadLine(string &Text);      
    bool Login();
    // Private helper functions
    bool ReadLine(string &Text);      
    bool Login();


@@ -31,7 +40,7 @@ class FTPConn
    
    public:
 
    
    public:
 

-   bool Comp(URI Other) {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;};
+   bool Comp(URI Other) {return Other.Host == ServerName.Host && Other.Port == ServerName.Port && Other.User == ServerName.User && Other.Password == ServerName.Password; };

    
    // Raw connection IO
    bool ReadResp(unsigned int &Ret,string &Text);
    
    // Raw connection IO
    bool ReadResp(unsigned int &Ret,string &Text);


@@ -41,12 +50,13 @@ class FTPConn
    bool Open(pkgAcqMethod *Owner);
    void Close();   
    bool GoPasv();
    bool Open(pkgAcqMethod *Owner);
    void Close();   
    bool GoPasv();

+   bool ExtGoPasv();

    
    // Query
    bool Size(const char *Path,unsigned long &Size);
    bool ModTime(const char *Path, time_t &Time);
    bool Get(const char *Path,FileFd &To,unsigned long Resume,
    
    // Query
    bool Size(const char *Path,unsigned long &Size);
    bool ModTime(const char *Path, time_t &Time);
    bool Get(const char *Path,FileFd &To,unsigned long Resume,

-           MD5Summation &MD5,bool &Missing);
+           Hashes &MD5,bool &Missing);

    
    FTPConn(URI Srv);
    ~FTPConn();
    
    FTPConn(URI Srv);
    ~FTPConn();