/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
-#pragma implementation "ftp.h"
+ #pragma implementation "ftp.h"
#endif
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
#if wxUSE_SOCKETS
wxFTP::wxFTP()
: wxProtocol()
{
- wxChar tmp[256];
-
m_lastError = wxPROTO_NOERR;
m_streaming = FALSE;
m_user = _T("anonymous");
- wxGetUserName(tmp, 256);
- m_passwd.sprintf(_T("%s@"),tmp);
- wxGetHostName(tmp, 256);
- m_passwd += tmp;
+ m_passwd = wxGetUserId();
+ m_passwd += '@';
+ m_passwd += wxGetHostName();
SetNotify(0);
+ SetFlags(NONE);
}
wxFTP::~wxFTP()
////////////////////////////////////////////////////////////////
bool wxFTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))
{
- if (!m_handler) {
- m_lastError = wxPROTO_NOHNDLR;
- return FALSE;
- }
-
if (!wxProtocol::Connect(addr)) {
m_lastError = wxPROTO_NETERR;
return FALSE;
bool wxFTP::GetResult(char exp)
{
- if ((m_lastError = GetLine(this, m_lastResult)))
+ m_lastError = GetLine(this, m_lastResult);
+ if ( m_lastError )
return FALSE;
if (m_lastResult.GetChar(0) != exp) {
m_lastError = wxPROTO_PROTERR;
key += _T(' ');
while (m_lastResult.Index(key) != 0) {
- if ((m_lastError = GetLine(this, m_lastResult)))
+ m_lastError = GetLine(this, m_lastResult);
+ if ( m_lastError )
return FALSE;
}
}
wxInputFTPStream(wxFTP *ftp_clt, wxSocketBase *sock)
: wxSocketInputStream(*sock), m_ftp(ftp_clt) {}
- size_t StreamSize() const { return m_ftpsize; }
+ size_t GetSize() const { return m_ftpsize; }
virtual ~wxInputFTPStream(void)
{
- if (LastError() != wxStream_NOERROR)
+ if (LastError() == wxStream_NOERROR)
m_ftp->GetResult('2');
else
m_ftp->Abort();
{
wxIPV4address addr;
wxSocketClient *client;
- struct sockaddr sin;
int a[6];
wxString straddr;
int addr_pos;
+ wxUint16 port;
+ wxUint32 hostaddr;
if (!SendCommand(_T("PASV"), '2'))
return NULL;
- sin.sa_family = AF_INET;
addr_pos = m_lastResult.Find(_T('('));
if (addr_pos == -1) {
m_lastError = wxPROTO_PROTERR;
}
straddr = m_lastResult(addr_pos+1, m_lastResult.Length());
wxSscanf((const wxChar *)straddr,_T("%d,%d,%d,%d,%d,%d"),&a[2],&a[3],&a[4],&a[5],&a[0],&a[1]);
- sin.sa_data[2] = (char)a[2];
- sin.sa_data[3] = (char)a[3];
- sin.sa_data[4] = (char)a[4];
- sin.sa_data[5] = (char)a[5];
- sin.sa_data[0] = (char)a[0];
- sin.sa_data[1] = (char)a[1];
- addr.Disassemble(&sin, sizeof(sin));
+ hostaddr = (wxUint16)a[5] << 24 | (wxUint16)a[4] << 16 |
+ (wxUint16)a[3] << 8 | a[2];
+ addr.Hostname(hostaddr);
- client = m_handler->CreateClient();
+ port = (wxUint16)a[0] << 8 | a[1];
+ addr.Service(port);
+
+ client = new wxSocketClient();
if (!client->Connect(addr)) {
delete client;
return NULL;
in_stream->m_ftpsize = wxAtoi(WXSTRINGCAST str_size);
}
+ sock->SetFlags(WAITALL);
return in_stream;
}
return NULL;
}
- sock->SetEventHandler(*GetNextHandler(), m_id);
- sock->Notify(m_notifyme);
- sock->SetNotify(m_neededreq);
-
return file_list;
}
#endif