Allow specifying non default port for wxFTP connections.

Add a wxFTP::Connect() overload taking a port number.

Also specify the default port (21) explicitly if resolving "ftp" service name
failed.

Closes #12145.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/protocol/ftp.h b/include/wx/protocol/ftp.h
index bfe39ce0176f108173a8b9f8bcec48582f5283bb..186e21ffddb24f628888073660124a7ce3e709aa 100644 (file)
--- a/include/wx/protocol/ftp.h
+++ b/include/wx/protocol/ftp.h
@@ -35,8 +35,9 @@ public:
     virtual ~wxFTP();
 
     // Connecting and disconnecting
-    bool Connect(const wxSockAddress& addr, bool wait = true);
-    bool Connect(const wxString& host);
+    virtual bool Connect(const wxSockAddress& addr, bool wait = true);
+    virtual bool Connect(const wxString& host) { return Connect(host, 0); }
+    virtual bool Connect(const wxString& host, unsigned short port);
 
     // disconnect
     virtual bool Close();

diff --git a/interface/wx/protocol/ftp.h b/interface/wx/protocol/ftp.h
index 364e5e434d9cb4c6634c77c8e09b69bea8e5f13e..b03ce1a163247f578d2824d071a1515621f1911d 100644 (file)
--- a/interface/wx/protocol/ftp.h
+++ b/interface/wx/protocol/ftp.h
@@ -112,6 +112,22 @@ public:
 
 
 
+    //@{
+    /**
+        Connect to the FTP server to default port (21) of the specified @a host.
+     */
+    virtual bool Connect(const wxString& host);
+
+    /**
+        Connect to the FTP server to any port of the specified @a host.
+        By default (@a port = 0), connection is made to default FTP port (21)
+        of the specified @a host.
+
+        @since 2.9.1
+     */
+    virtual bool Connect(const wxString& host, unsigned short port);
+    //@}
+
     /**
         @name Functions for managing the FTP connection
      */

diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp
index b1761ba38720d77ae9135a885f6f10ffa67d0666..218fa457842eb05cafea224ffb0c3bac89504772 100644 (file)
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -155,11 +155,15 @@ bool wxFTP::Connect(const wxSockAddress& addr, bool WXUNUSED(wait))
     return true;
 }
 
-bool wxFTP::Connect(const wxString& host)
+bool wxFTP::Connect(const wxString& host, unsigned short port)
 {
     wxIPV4address addr;
     addr.Hostname(host);
-    addr.Service(wxT("ftp"));
+
+    if ( port )
+        addr.Service(port);
+    else if (!addr.Service(wxT("ftp")))
+        addr.Service(21);
 
     return Connect(addr);
 }