summaryrefslogtreecommitdiff
path: root/methods/ftp.h
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 16:56:32 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 16:56:32 +0000
commitb2e465d6d32d2dc884f58b94acb7e35f671a87fe (patch)
tree5928383b9bde7b0ba9812e6526ad746466e558f7 /methods/ftp.h
parent00b47c98ca4a4349686a082eba6d77decbb03a4d (diff)
downloadapt-b2e465d6d32d2dc884f58b94acb7e35f671a87fe.tar.gz
Join with aliencode
Author: jgg Date: 2001-02-20 07:03:16 GMT Join with aliencode
Diffstat (limited to 'methods/ftp.h')
-rw-r--r--methods/ftp.h18
1 files changed, 14 insertions, 4 deletions
diff --git a/methods/ftp.h b/methods/ftp.h
index 7416589a0..f791195b3 100644
--- a/methods/ftp.h
+++ b/methods/ftp.h
@@ -1,5 +1,6 @@
// -*- 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.3 2001/02/20 07:03:18 jgg Exp $
+// $Id: ftp.h,v 1.3 2001/02/20 07:03:18 jgg Exp $
/* ######################################################################
FTP Aquire Method - This is the FTP aquire method for APT.
@@ -17,12 +18,20 @@ 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 Login();
@@ -41,6 +50,7 @@ class FTPConn
bool Open(pkgAcqMethod *Owner);
void Close();
bool GoPasv();
+ bool ExtGoPasv();
// Query
bool Size(const char *Path,unsigned long &Size);