doc/po/pt.po: updated, thanks to Américo Monteir

[apt.git] / methods / ftp.h

diff --git a/methods/ftp.h b/methods/ftp.h
index 7416589a0c9dc11f937eac3783a6574c0ba38aff..dd92f0086e936043af045211f923ae0eccad9ceb 100644 (file)
--- a/methods/ftp.h
+++ b/methods/ftp.h
@@ -1,14 +1,21 @@
 // -*- 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 Acquire Method - This is the FTP acquire method for APT.
 
    ##################################################################### */
                                                                        /*}}}*/
 #ifndef APT_FTP_H
 #define APT_FTP_H
 
+#include <apt-pkg/strutl.h>
+
+#include <sys/types.h>
+#include <time.h>
+#include <string>
+
 class FTPConn
 {
    char Buffer[1024*10];
@@ -17,36 +24,45 @@ class FTPConn
    int DataFd;
    int DataListenFd;
    URI ServerName;
+   bool ForceExtended;
    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 ReadLine(std::string &Text);
    bool Login();
    bool CreateDataFd();
    bool Finalize();
    
    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);
-   bool WriteMsg(unsigned int &Ret,string &Text,const char *Fmt,...);
+   bool ReadResp(unsigned int &Ret,std::string &Text);
+   bool WriteMsg(unsigned int &Ret,std::string &Text,const char *Fmt,...);
    
    // Connection control
    bool Open(pkgAcqMethod *Owner);
    void Close();   
    bool GoPasv();
+   bool ExtGoPasv();
    
    // Query
-   bool Size(const char *Path,unsigned long &Size);
+   bool Size(const char *Path,unsigned long long &Size);
    bool ModTime(const char *Path, time_t &Time);
-   bool Get(const char *Path,FileFd &To,unsigned long Resume,
-           MD5Summation &MD5,bool &Missing);
+   bool Get(const char *Path,FileFd &To,unsigned long long Resume,
+           Hashes &MD5,bool &Missing);
    
    FTPConn(URI Srv);
    ~FTPConn();
@@ -55,14 +71,14 @@ class FTPConn
 class FtpMethod : public pkgAcqMethod
 {
    virtual bool Fetch(FetchItem *Itm);
-   virtual bool Configuration(string Message);
+   virtual bool Configuration(std::string Message);
    
    FTPConn *Server;
    
-   static string FailFile;
+   static std::string FailFile;
    static int FailFd;
    static time_t FailTime;
-   static void SigTerm(int);
+   static APT_NORETURN void SigTerm(int);
    
    public: