Tommy 碎碎念

奇怪的 pure-ftpd 錯誤: (?@?) [ERROR] Sorry, invalid address given

Mon, 16 Aug 2010 14:24:03 +0800

今天在辦公室要連回家裡的 ftp 抓些檔案時, 突然發現無法連線的錯誤, 在 FileZilla 會看到連線之後, 出現 425 Sorry, invalid address given 的訊息. 找了半天也查不出原因. 不過.... 奇怪的是, 另一台電腦連線回去又可以正常連線. 所以... 看起來不像是 server 的問題, 而是 client 的問題.

不過... 這台不能連的機器, 昨天還可以正常連線, 為什麼今天就不能用呢?

後來在 Google 看到了這篇文章, 指出 pure-ftpd 在反解 client 的 IP 出錯時, 會出現這個訊息. 依照說明, 加上 -H 參數 (如果用 Debian 系列, 在 /etc/pure-ftpd/conf/DontResolve 加上 yes 就可以了) 之後, 果然可以正常的連線了.

PS. 我記得反查失敗應該還是可以正常使用才對, 畢竟另一台電腦也應該反查不會有任何結果, 而宿舍的 ADSL 也應該一樣, 不過都可以正常連線. 只有今天早上才碰到這問題.... 也許是今天上層的 DNS 有點問題造成的吧.

修正 Pure-ftpd 1.0.22 在使用 TLS 協定時, 下傳檔案續傳不正確的問題.

Thu, 04 Jun 2009 19:13:32 +0800

一個多月之前, Pure-ftpd 推出了新的 1.0.22 版, 對我來說, 其中最重大的改變就是支援在 TLS/SSL 時也對傳送的資料加密. 所以... 我馬上就裝起來用了. 不過... 隔天確發現下載的檔案都有問題, 不過我試了幾個小檔案, 發現又很正常. 後來想到這兒的網路狀況有點不好, 或許是斷線後續傳造成的, 再測試一下, 果然經過續傳後, 檔案大小在傳送後就不一樣了.

改了一下, 寫了一些 log, 發現在使用 TLS/SSL 下傳檔案時, 是透過 mmap_send() 去處理, 而一般的情形是用 sendfile_send() 來處理. 而且在 sendfile_send() 裡頭, 是這樣處理續傳位置的:

#ifndef SENDFILE_NONE
int sendfile_send(int f, struct stat st, double *started)
{
    off_t left;
    off_t o;
# ifdef THROTTLING
    double ended;
    off_t transmitted = 0;
# endif
 
    o = restartat;
    while (o < st.st_size) {

但是在 mmap_send() 中是:

int mmap_send(int f, struct stat st, double *started)
{
    off_t s;
    off_t skip;
    off_t o;
    char *p, *buf;
    off_t left;
# ifdef THROTTLING
    double ended;
    off_t transmitted = 0;
# endif
 
    o = restartat & ~(map_size - 1);
    skip = restartat - o;
    while (o < st.st_size) {

至少在我家的 Debian 伺服器上頭, 上頭的運作是不正常的. 所以我就改了一下:

int mmap_send(int f, struct stat st, double *started)
{
    off_t s;
    off_t skip;
    off_t o;
    char *p, *buf;
    off_t left;
# ifdef THROTTLING
    double ended;
    off_t transmitted = 0;
# endif
 
// twu2 20090523 begin
// why change the restart pos?
//    o = restartat & ~(map_size - 1);
    o = restartat;
// twu2 20090523 end
    skip = restartat - o;

直接就使用 restartat 的值, 這樣子處理之後, 至少在 Debian 裡頭是正常的.

這個 patch 的內容如下:

diff -Nur src.orig/ftpd.c src/ftpd.c
--- src.orig/ftpd.c     2009-04-26 19:34:04.000000000 +0800
+++ src/ftpd.c  2009-06-04 18:55:25.024105416 +0800
@@ -3106,7 +3106,11 @@
     off_t transmitted = 0;
 # endif
 
-    o = restartat & ~(map_size - 1);
+// twu2 20090523 begin
+// why change the restart pos?
+//    o = restartat & ~(map_size - 1);
+    o = restartat;
+// twu2 20090523 end
     skip = restartat - o;
     while (o < st.st_size) {
 # ifdef FTPWHO

檔案可以在這兒抓: http://www.teatime.com.tw/~tommy/mypatch/pureftpd_1.0.22_tls_resume.patch

有需要的可能要自行修改. 這個 patch 我也有送給作者.... 不過也許是我的英文太破了, 就如同之前送的 patch 一樣, 都沒有後續的消息, 看起來似乎也不會進到官方的程式中, 至少目前的 snapshot 版本還沒包含這個修正.

FileZilla 3.0.4 keepalive 功能

Thu, 29 Nov 2007 13:10:50 +0800

在 FileZilla 3.0.4 版中, 作者終於加上了 KeepAlive 的功能了. 原本以為, 我另外加上的那個 keepalive patch 就用不到了. 不過... 用了兩天後, 發現... 目前這個版本的 keepalive 還是有些問題.

首先是由於使用的指令的關係, 在 pure-ftpd 中, 仍然會照成斷線. 這個問題比較容易解決, 只要多加一個 STAT 指令, 就可以避免 pure-ftpd 的逾時設計了. 修正如下:

diff -Nur filezilla-3.0.4.orig/src/engine/ftpcontrolsocket.cpp filezilla-3.0.4/src/engine/ftpcontrolsocket.cpp
--- filezilla-3.0.4.orig/src/engine/ftpcontrolsocket.cpp  Tue Nov 27 04:42:56 2007
+++ filezilla-3.0.4/src/engine/ftpcontrolsocket.cpp  Tue Nov 27 20:42:42 2007
@@ -4175,7 +4175,7 @@
   LogMessage(Status, _("Sending keep-alive command"));
   
   wxString cmd;
-  int i = rand() * 3 / (RAND_MAX + 1);
+  int i = rand() * 4 / (RAND_MAX + 1);
   if (!i)
     cmd = _T("NOOP");
   else if (i == 1)
@@ -4185,6 +4185,8 @@
     else
       cmd = _T("TYPE A");
   }
+  else if (i == 2)
+    cmd = _T("STAT");
   else
     cmd = _T("PWD");

Patch 可以由這兒抓取: http://www.teatime.com.tw/~tommy/mypatch/filezilla_3.0.4_keepalive_for_pureftpd.patch

不過, 在加上上頭的 patch 之後, 還是發現有逾時的情形, 因為不好查, 所以, 就在顯示的訊息上頭, 先加上時間, 方便於除錯. 修正如下:

diff -Nur filezilla-3.0.4.orig/src/interface/StatusView.cpp filezilla-3.0.4/src/interface/StatusView.cpp
--- filezilla-3.0.4.orig/src/interface/StatusView.cpp  Tue Nov 27 04:42:56 2007
+++ filezilla-3.0.4/src/interface/StatusView.cpp  Thu Nov 29 11:10:40 2007
@@ -151,6 +151,9 @@
 
   m_pTextCtrl->SetDefaultStyle(m_attributeCache[messagetype].attr);
 
+  wxDateTime now = wxDateTime::Now();
+  prefix += now.FormatISOTime();
+  prefix += _T(" ");
   prefix += m_attributeCache[messagetype].prefix;
 
   int lineLength = m_attributeCache[messagetype].len + message.Length();

Patch 可以由這兒抓取: http://www.teatime.com.tw/~tommy/mypatch/filezilla_3.0.4_add_time_to_message.patch

經過上頭的修正之後, 發現系統在經過 30 分鐘的閒置後, 就停止送出 keepalive 的指令. 看一下程式碼, 果然有個檢查 30 分鐘的地方, 不知道是作者故意的設計, 還是 bug? 到 SourceForge submit 給作者, 看是否是真要如此設計. 在得到答案之前, 當然只好自己弄個 patch 來用. 修正如下:

diff -Nur filezilla-3.0.4.orig/src/engine/ftpcontrolsocket.cpp filezilla-3.0.4/src/engine/ftpcontrolsocket.cpp
--- filezilla-3.0.4.orig/src/engine/ftpcontrolsocket.cpp  Tue Nov 27 04:42:56 2007
+++ filezilla-3.0.4/src/engine/ftpcontrolsocket.cpp  Thu Nov 29 12:33:40 2007
@@ -4204,9 +4204,11 @@
   if (!m_lastCommandCompletionTime.IsValid())
     return;
   
+/*
   wxTimeSpan span = wxDateTime::Now() - m_lastCommandCompletionTime;
   if (span.GetSeconds() >= (60 * 30))
     return;
+*/
 
   m_idleTimer.Start(30000, true);
 }

Patch 可以由這兒抓取: http://www.teatime.com.tw/~tommy/mypatch/filezilla_3.0.4_keepalive_after_30_minutes.patch

經過上頭的處理之後, 目前看起來運作就正常了.

如果需要 patch 過的執行檔, 請到 FileZillaPV 專案去下載吧.

2007/11/30:

作者表示, 30 分鐘的限制是故意的設計. 所以... 如果有這種一直連線的需求, 就自己 patch 吧.

FileZilla 3.0.3 patch for invalid hostname delay problem

Thu, 08 Nov 2007 16:26:11 +0800

由於前一陣子宿舍的 ADSL 十分的不穩定, 每隔幾分鐘就會斷線一次, 就發現在 FileZilla 3 傳檔的時候, 會因為斷線之後, 無法正確解析出 IP 時, 會馬上再次嘗試連線, 結果在不到一分鐘的時間內, 就達到 FileZilla3 允許設定的 99 次, 然後就會把該檔案放到失敗的 queue 當中, 不會再傳送了. 如果這時不小心把程式關了, 該檔案就消失在 queue 裡頭了.

不過, 自從九月的時候, 反應這個問題到現在, 仍然沒有解決. 在昨天 3.0.3 推出後, 就順便處理一下, 看起來似乎是可以正常使用.

這個修正如下:

diff -Nur Filezilla3/src/engine/engineprivate.cpp Filezilla3.patch/src/engine/engineprivate.cpp
--- Filezilla3/src/engine/engineprivate.cpp  Thu Nov  8 15:55:07 2007
+++ Filezilla3.patch/src/engine/engineprivate.cpp  Thu Nov  8 15:56:54 2007
@@ -219,8 +219,11 @@
 
     if (m_pCurrentCommand->GetId() == cmd_connect)
     {
-      if (!(nErrorCode & ~(FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED | FZ_REPLY_TIMEOUT)) && 
-        nErrorCode & (FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED) &&
+      if (((!m_pEventHandler->IsKindOf(CLASSINFO(wxFrame)) &&
+        !(nErrorCode & ~(FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED | FZ_REPLY_TIMEOUT | FZ_REPLY_CRITICALERROR)) &&
+        nErrorCode & (FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED | FZ_REPLY_CRITICALERROR)) ||
+        (!(nErrorCode & ~(FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED | FZ_REPLY_TIMEOUT)) && 
+        nErrorCode & (FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED))) &&
         m_retryCount < m_pOptions->GetOptionVal(OPTION_RECONNECTCOUNT))
       {
         m_retryCount++;

Patch 可以由這兒抓取: http://www.teatime.com.tw/~tommy/mypatch/filezilla_3.0.3_delay_for_invalid_hostname.patch

至於使用這個 patch 的執行檔, 請到 FileZillaPV 去抓吧.

KeepAlive patch (version 3) for FileZilla 3.0.1

Mon, 24 Sep 2007 22:50:57 +0800

修改之前的版本, 加上 QuickConnect 的處理.

修正如下:

diff -Nur Filezilla3/src/engine/ControlSocket.h Filezilla3.patch/src/engine/ControlSocket.h
--- Filezilla3/src/engine/ControlSocket.h  Mon Sep 24 22:05:20 2007
+++ Filezilla3.patch/src/engine/ControlSocket.h  Mon Sep 24 22:05:49 2007
@@ -115,6 +115,8 @@
   virtual int Chmod(const CChmodCommand& command) { return FZ_REPLY_NOTSUPPORTED; }
   virtual bool Connected() const = 0;
 
+  virtual int KeepAlive(const CKeepAliveCommand& command) { return FZ_REPLY_OK; }
+
   // If m_pCurrentOpData is zero, this function returns the current command
   // from the engine.
   enum Command GetCurrentCommandId() const;
diff -Nur Filezilla3/src/engine/FileZillaEngine.cpp Filezilla3.patch/src/engine/FileZillaEngine.cpp
--- Filezilla3/src/engine/FileZillaEngine.cpp  Mon Sep 24 22:05:20 2007
+++ Filezilla3.patch/src/engine/FileZillaEngine.cpp  Mon Sep 24 22:05:49 2007
@@ -70,6 +70,9 @@
   case cmd_chmod:
     res = Chmod(reinterpret_cast<const CChmodCommand&>(command));
     break;
+  case cmd_keepalive:
+    res = KeepAlive(reinterpret_cast<const CKeepAliveCommand &>(command));
+    break;
   default:
     return FZ_REPLY_SYNTAXERROR;
   }
diff -Nur Filezilla3/src/engine/commands.cpp Filezilla3.patch/src/engine/commands.cpp
--- Filezilla3/src/engine/commands.cpp  Mon Sep 24 22:05:20 2007
+++ Filezilla3.patch/src/engine/commands.cpp  Mon Sep 24 22:05:49 2007
@@ -10,6 +10,16 @@
   return m_Server;
 }
 
+CKeepAliveCommand::CKeepAliveCommand(bool keepAlive /*=true*/)
+    : m_keepAlive(keepAlive)
+{
+}
+
+bool CKeepAliveCommand::IsKeepAlive() const
+{
+  return m_keepAlive;
+}
+
 CListCommand::CListCommand(bool refresh /*=false*/)
   : m_refresh(refresh)
 {
diff -Nur Filezilla3/src/engine/engineprivate.cpp Filezilla3.patch/src/engine/engineprivate.cpp
--- Filezilla3/src/engine/engineprivate.cpp  Mon Sep 24 22:05:20 2007
+++ Filezilla3.patch/src/engine/engineprivate.cpp  Mon Sep 24 22:05:49 2007
@@ -525,6 +525,12 @@
   return m_pControlSocket->Chmod(command);
 }
 
+int CFileZillaEnginePrivate::KeepAlive(const CKeepAliveCommand& command)
+{
+  m_pCurrentCommand = command.Clone();
+  return m_pControlSocket->KeepAlive(command);
+}
+
 void CFileZillaEnginePrivate::SendDirectoryListingNotification(const CServerPath& path, bool onList, bool modified, bool failed)
 {
   wxASSERT(m_pControlSocket);
diff -Nur Filezilla3/src/engine/ftpcontrolsocket.cpp Filezilla3.patch/src/engine/ftpcontrolsocket.cpp
--- Filezilla3/src/engine/ftpcontrolsocket.cpp  Mon Sep 24 22:05:20 2007
+++ Filezilla3.patch/src/engine/ftpcontrolsocket.cpp  Mon Sep 24 22:05:49 2007
@@ -24,8 +24,11 @@
 #define LOGON_CUSTOMCOMMANDS 10
 #define LOGON_DONE    11
 
+#define KEEPALIVE_TIMER_ID wxID_HIGHEST + 5
+
 BEGIN_EVENT_TABLE(CFtpControlSocket, CRealControlSocket)
 EVT_FZ_EXTERNALIPRESOLVE(wxID_ANY, CFtpControlSocket::OnExternalIPAddress)
+EVT_TIMER(wxID_ANY, CFtpControlSocket::OnTimer)
 END_EVENT_TABLE();
 
 CRawTransferOpData::CRawTransferOpData()
@@ -137,6 +140,8 @@
   m_pTlsSocket = 0;
   m_protectDataChannel = false;
   m_lastTypeBinary = -1;
+  m_bEnableKeepAlive = false;
+  m_keepAliveTimer.SetOwner(this, KEEPALIVE_TIMER_ID);
 }
 
 CFtpControlSocket::~CFtpControlSocket()
@@ -147,12 +152,16 @@
 {
   LogMessage(Debug_Verbose, _T("CFtpControlSocket::OnReceive()"));
 
+  m_keepAliveStopWatch.Start();
+
   m_pBackend->Read(m_receiveBuffer + m_bufferLen, RECVBUFFERSIZE - m_bufferLen);
-  
+
   if (m_pBackend->Error())
   {
     if (m_pBackend->LastError() != wxSOCKET_WOULDBLOCK)
     {
+      m_bEnableKeepAlive = false;
+      m_keepAliveTimer.Stop();
       LogMessage(::Error, _("Disconnected from server"));
       DoClose();
     }
@@ -344,6 +353,7 @@
 
   if (m_repliesToSkip)
   {
+    SetWait(false);
     LogMessage(Debug_Info, _T("Skipping reply after cancelled operation."));
     if (m_Response[0] != '1')
       m_repliesToSkip--;
@@ -798,6 +808,7 @@
     LogMessage(::Error, _T("Failed to convert command to 8 bit charset"));
     return false;
   }
+  m_keepAliveStopWatch.Start();
   unsigned int len = (unsigned int)strlen(buffer);
   bool res = CRealControlSocket::Send(buffer, len);
   if (res)
@@ -3006,6 +3017,75 @@
   }
 
   return FZ_REPLY_WOULDBLOCK;
+}
+
+int CFtpControlSocket::KeepAlive(const CKeepAliveCommand& command)
+{
+  LogMessage(Debug_Verbose, _T("CFtpControlSocket::KeepAlive"));
+
+  if (command.IsKeepAlive())
+  {
+    if (!m_bEnableKeepAlive)
+    {
+      m_bEnableKeepAlive = true;
+      // FIXME:
+      // read keepalive option here
+      int min_wait = 30;
+      int max_wait = 60;
+      int waitsecond = min_wait + (int)(rand()*(max_wait - min_wait)/(RAND_MAX+1));
+      m_keepAliveTimer.Start(waitsecond * 1000);
+    }
+  }
+  else
+  {
+    if (m_bEnableKeepAlive)
+    {
+      m_bEnableKeepAlive = false;
+      m_keepAliveTimer.Stop();
+    }
+  }
+
+  m_bEnableKeepAlive = true;
+  return FZ_REPLY_OK;
+}
+
+void CFtpControlSocket::DoKeepAlive()
+{
+  LogMessage(Debug_Verbose, _T("CFtpControlSocket::DoKeepAlive"));
+
+  // ignore keepalive for last I/O for socket less than 15 seconds
+  if (m_keepAliveStopWatch.Time() < 15000)
+    return;
+  // choose any command
+  wxString commands[4] = {_T("PWD"),_T("REST 0"), _T("NOOP"), _T("STAT") };
+  int choice=(rand()*4)/(RAND_MAX+1);
+
+  m_repliesToSkip++;
+  Send(commands[choice]);
+  return;
+}
+
+void CFtpControlSocket::OnTimer(wxTimerEvent& event)
+{
+  if (event.GetId() == KEEPALIVE_TIMER_ID)
+  {
+    if (m_keepAliveTimer.IsRunning())
+    {
+      m_keepAliveTimer.Stop();
+      if (m_bEnableKeepAlive && IsConnected()) {
+        // FIXME:
+        // need to read the values from options...
+        int min_wait = 30;
+        int max_wait = 60;
+
+        int waitsecond = min_wait + (int)(rand()*(max_wait - min_wait)/(RAND_MAX+1));
+        m_keepAliveTimer.Start(waitsecond * 1000);
+        DoKeepAlive();
+      }
+    }
+  }
+  else
+    CControlSocket::OnTimer(event);
 }
 
 bool CFtpControlSocket::IsMisleadingListResponse() const
diff -Nur Filezilla3/src/engine/ftpcontrolsocket.h Filezilla3.patch/src/engine/ftpcontrolsocket.h
--- Filezilla3/src/engine/ftpcontrolsocket.h  Mon Sep 24 22:05:20 2007
+++ Filezilla3.patch/src/engine/ftpcontrolsocket.h  Mon Sep 24 22:05:49 2007
@@ -24,6 +24,12 @@
 
 protected:
   
+  bool m_bEnableKeepAlive;
+  wxTimer m_keepAliveTimer;
+  wxStopWatch m_keepAliveStopWatch;
+  virtual int KeepAlive(const CKeepAliveCommand& command);
+  void DoKeepAlive();
+
   virtual int ResetOperation(int nErrorCode);
 
   virtual int Connect(const CServer &server);
@@ -128,6 +134,7 @@
 
   DECLARE_EVENT_TABLE();
   void OnExternalIPAddress(fzExternalIPResolveEvent& event);
+  void OnTimer(wxTimerEvent& event);
 };
 
 class CIOThread;
diff -Nur Filezilla3/src/include/commands.h Filezilla3.patch/src/include/commands.h
--- Filezilla3/src/include/commands.h  Mon Sep 24 22:05:12 2007
+++ Filezilla3.patch/src/include/commands.h  Mon Sep 24 22:05:49 2007
@@ -19,6 +19,7 @@
   cmd_rename,
   cmd_chmod,
   cmd_raw,
+  cmd_keepalive,
 
   // Only used internally
   cmd_cwd,
@@ -74,6 +75,15 @@
   const CServer GetServer() const;
 protected:
   CServer m_Server;
+};
+
+DECLARE_COMMAND(CKeepAliveCommand, cmd_keepalive)
+  CKeepAliveCommand(bool keepAlive = true);
+
+  bool IsKeepAlive() const;
+
+protected:
+  bool m_keepAlive;
 };
 
 DECLARE_COMMAND(CDisconnectCommand, cmd_disconnect)
diff -Nur Filezilla3/src/include/engineprivate.h Filezilla3.patch/src/include/engineprivate.h
--- Filezilla3/src/include/engineprivate.h  Mon Sep 24 22:05:12 2007
+++ Filezilla3.patch/src/include/engineprivate.h  Mon Sep 24 22:05:49 2007
@@ -69,6 +69,7 @@
   int Mkdir(const CMkdirCommand& command);
   int Rename(const CRenameCommand& command);
   int Chmod(const CChmodCommand& command);
+  int KeepAlive(const CKeepAliveCommand& command);
 
   int ContinueConnect();
 
diff -Nur Filezilla3/src/interface/Mainfrm.cpp Filezilla3.patch/src/interface/Mainfrm.cpp
--- Filezilla3/src/interface/Mainfrm.cpp  Mon Sep 24 22:08:54 2007
+++ Filezilla3.patch/src/interface/Mainfrm.cpp  Mon Sep 24 22:09:18 2007
@@ -932,7 +932,10 @@
 
   CServerPath path;
   path.SetSafePath(COptions::Get()->GetOption(OPTION_LASTSERVERPATH));
-  m_pState->Connect(server, false, path);
+  // FIXME:
+  // read keepalive from option
+  bool keepAlive = true;
+  m_pState->Connect(server, false, keepAlive, path);
 }
 
 void CMainFrame::OnRefresh(wxCommandEvent &event)
@@ -1456,7 +1459,10 @@
       return;
   }
 
-  m_pState->Connect(pData->m_server, true, pData->m_remoteDir);
+  // FIXME:
+  // read keepalive from option
+  bool keepAlive = true;
+  m_pState->Connect(pData->m_server, true, keepAlive, pData->m_remoteDir);
 
   if (pData->m_localDir != _T(""))
     m_pState->SetLocalDir(pData->m_localDir);
diff -Nur Filezilla3/src/interface/quickconnectbar.cpp Filezilla3.patch/src/interface/quickconnectbar.cpp
--- Filezilla3/src/interface/quickconnectbar.cpp  Mon Sep 24 22:08:54 2007
+++ Filezilla3.patch/src/interface/quickconnectbar.cpp  Mon Sep 24 22:09:18 2007
@@ -108,7 +108,10 @@
     return;
   }
 
-  if (!m_pState->Connect(server, true))
+  // FIXME:
+  // read keepalive from option
+  bool keepAlive = true;
+  if (!m_pState->Connect(server, true, keepAlive))
     return;
 
   CRecentServerList::SetMostRecentServer(server);
diff -Nur Filezilla3/src/interface/state.cpp Filezilla3.patch/src/interface/state.cpp
--- Filezilla3/src/interface/state.cpp  Mon Sep 24 22:08:54 2007
+++ Filezilla3.patch/src/interface/state.cpp  Mon Sep 24 22:09:18 2007
@@ -259,7 +259,7 @@
   NotifyHandlers(STATECHANGE_APPLYFILTER);
 }
 
-bool CState::Connect(const CServer& server, bool askBreak, const CServerPath& path /*=CServerPath()*/)
+bool CState::Connect(const CServer& server, bool askBreak, bool keepAlive /*=false*/, const CServerPath& path /*=CServerPath()*/)
 {
   if (!m_pEngine)
     return false;
@@ -273,6 +273,8 @@
 
   m_pCommandQueue->ProcessCommand(new CConnectCommand(server));
   m_pCommandQueue->ProcessCommand(new CListCommand(path));
+  if (keepAlive)
+    m_pCommandQueue->ProcessCommand(new CKeepAliveCommand(true));
   
   COptions::Get()->SetLastServer(server);
   COptions::Get()->SetOption(OPTION_LASTSERVERPATH, path.GetSafePath());
diff -Nur Filezilla3/src/interface/state.h Filezilla3.patch/src/interface/state.h
--- Filezilla3/src/interface/state.h  Mon Sep 24 22:08:54 2007
+++ Filezilla3.patch/src/interface/state.h  Mon Sep 24 22:09:18 2007
@@ -40,7 +40,7 @@
   static bool LocalDirHasParent(const wxString& dir);
   static bool LocalDirIsWriteable(const wxString& dir);
 
-  bool Connect(const CServer& server, bool askBreak, const CServerPath& path = CServerPath());
+  bool Connect(const CServer& server, bool askBreak, bool keepAlive = false, const CServerPath& path = CServerPath());
 
   bool SetRemoteDir(const CDirectoryListing *m_pDirectoryListing, bool modified = false);
   const CDirectoryListing *GetRemoteDir() const;

Patch 可以由這兒抓取: http://www.teatime.com.tw/~tommy/mypatch/filezilla3_keepalive.patch
製作出來的 Windows 執行檔可以由這兒抓: http://www.teatime.com.tw/~tommy/files/filezilla/filezilla301.7z

有需要的就自己抓回去用吧.

在 FileZilla3 的視窗標題顯示連線的伺服器

Mon, 24 Sep 2007 14:02:38 +0800

由於公司內有好幾台伺服器的常用路徑都一樣, 所以在使用 FileZilla 時, 常常忘了同前連線的是那一個伺服器, 就想到是否可以把目前連線的伺服器給顯示在程式的標題上頭, 也因此就產生的這樣的一個 patch 了.這個 patch 如下:

diff -Nur Filezilla3/src/interface/Mainfrm.cpp Filezilla3.patch/src/interface/Mainfrm.cpp
--- Filezilla3/src/interface/Mainfrm.cpp  Mon Sep 24 21:49:26 2007
+++ Filezilla3.patch/src/interface/Mainfrm.cpp  Mon Sep 24 21:49:58 2007
@@ -911,6 +911,8 @@
     return;
   }
 
+  SetLabel(_T("FileZilla"));
+
   CServer server;
   event.Enable(COptions::Get()->GetLastServer(server));
 }
@@ -930,6 +932,8 @@
       return;
   }
 
+  SetLabel(_T("FileZilla - ") + server.FormatServer());
+
   CServerPath path;
   path.SetSafePath(COptions::Get()->GetOption(OPTION_LASTSERVERPATH));
   m_pState->Connect(server, false, path);
@@ -1455,6 +1459,8 @@
     if (!CLoginManager::Get().GetPassword(pData->m_server, false, pData->m_name))
       return;
   }
+
+  SetLabel(_T("FileZilla - ") + pData->m_server.FormatServer());
 
   m_pState->Connect(pData->m_server, true, pData->m_remoteDir);
 
diff -Nur Filezilla3/src/interface/quickconnectbar.cpp Filezilla3.patch/src/interface/quickconnectbar.cpp
--- Filezilla3/src/interface/quickconnectbar.cpp  Mon Sep 24 21:49:26 2007
+++ Filezilla3.patch/src/interface/quickconnectbar.cpp  Mon Sep 24 21:56:46 2007
@@ -108,6 +108,9 @@
     return;
   }
 
+  if (GetParent() != NULL)
+    GetParent()->SetLabel(_T("FileZilla - ") + server.FormatServer());
+
   if (!m_pState->Connect(server, true))
     return;

Patch 可以由這兒抓取: http://www.teatime.com.tw/~tommy/mypatch/filezilla3_title_show_server.patch
製作出來的 Windows 執行檔可以由這兒抓: http://www.teatime.com.tw/~tommy/files/filezilla/filezilla301.7z

2007/09/24:

加上對於 QuickConnect 的處理.

KeepAlive patch (version 2) for FileZilla 3

Thu, 16 Aug 2007 13:17:16 +0800

昨天的 patch 被作者給 reject 了. 因為他認為把 timer 放到主視窗中, 在執行 keepalive 指令時, 會 block UI 的操作 (不過, 就算不放在這兒, 本來在送出指令時, 一定會影響到其他指令的執行啊?), 另外就是送出 TYPE I 與 TYPE A 指令, 因為原本的程式內有記錄目前的狀態, 可能會造成錯誤. 所以就暫時不接受這個 patch. 所以改了一下, 做了第二版的 patch, 把 timer 移出 MainFrm, 放到 CFtpControlSocket 裡頭, 並修改 keepalive 會送出的指令, 去除 TYPE I/TYPE A, 然後加上 NOOP/STAT/MKD/RMD 等指令. 因為 MKD/RMD 等指令沒有參數, 會回傳 5xx 的錯誤 (其他的指令如果 server 沒支援, 也應該是回傳 5xx), 所以在處理 keepalive 時, 也順便忽略所有的 5xx 錯誤碼.

這個修正如下:

diff -Nur Filezilla3/src/engine/ControlSocket.h Filezilla3.patch/src/engine/ControlSocket.h
--- Filezilla3/src/engine/ControlSocket.h  Thu Aug 16 12:54:33 2007
+++ Filezilla3.patch/src/engine/ControlSocket.h  Thu Aug 16 12:55:42 2007
@@ -115,6 +115,8 @@
   virtual int Chmod(const CChmodCommand& command) { return FZ_REPLY_NOTSUPPORTED; }
   virtual bool Connected() const = 0;
 
+  virtual int KeepAlive(const CKeepAliveCommand& command) { return FZ_REPLY_OK; }
+
   // If m_pCurrentOpData is zero, this function returns the current command
   // from the engine.
   enum Command GetCurrentCommandId() const;
diff -Nur Filezilla3/src/engine/FileZillaEngine.cpp Filezilla3.patch/src/engine/FileZillaEngine.cpp
--- Filezilla3/src/engine/FileZillaEngine.cpp  Thu Aug 16 12:54:35 2007
+++ Filezilla3.patch/src/engine/FileZillaEngine.cpp  Thu Aug 16 12:55:50 2007
@@ -70,6 +70,9 @@
   case cmd_chmod:
     res = Chmod(reinterpret_cast<const CChmodCommand&>(command));
     break;
+  case cmd_keepalive:
+    res = KeepAlive(reinterpret_cast<const CKeepAliveCommand &>(command));
+    break;
   default:
     return FZ_REPLY_SYNTAXERROR;
   }
diff -Nur Filezilla3/src/engine/commands.cpp Filezilla3.patch/src/engine/commands.cpp
--- Filezilla3/src/engine/commands.cpp  Thu Aug 16 12:54:35 2007
+++ Filezilla3.patch/src/engine/commands.cpp  Thu Aug 16 12:55:57 2007
@@ -10,6 +10,16 @@
   return m_Server;
 }
 
+CKeepAliveCommand::CKeepAliveCommand(bool keepAlive /*=true*/)
+    : m_keepAlive(keepAlive)
+{
+}
+
+bool CKeepAliveCommand::IsKeepAlive() const
+{
+  return m_keepAlive;
+}
+
 CListCommand::CListCommand(bool refresh /*=false*/)
   : m_refresh(refresh)
 {
diff -Nur Filezilla3/src/engine/engineprivate.cpp Filezilla3.patch/src/engine/engineprivate.cpp
--- Filezilla3/src/engine/engineprivate.cpp  Thu Aug 16 12:54:35 2007
+++ Filezilla3.patch/src/engine/engineprivate.cpp  Thu Aug 16 12:56:05 2007
@@ -525,6 +525,12 @@
   return m_pControlSocket->Chmod(command);
 }
 
+int CFileZillaEnginePrivate::KeepAlive(const CKeepAliveCommand& command)
+{
+  m_pCurrentCommand = command.Clone();
+  return m_pControlSocket->KeepAlive(command);
+}
+
 void CFileZillaEnginePrivate::SendDirectoryListingNotification(const CServerPath& path, bool onList, bool modified, bool failed)
 {
   wxASSERT(m_pControlSocket);
diff -Nur Filezilla3/src/engine/ftpcontrolsocket.cpp Filezilla3.patch/src/engine/ftpcontrolsocket.cpp
--- Filezilla3/src/engine/ftpcontrolsocket.cpp  Thu Aug 16 12:54:35 2007
+++ Filezilla3.patch/src/engine/ftpcontrolsocket.cpp  Thu Aug 16 12:55:24 2007
@@ -24,8 +24,11 @@
 #define LOGON_CUSTOMCOMMANDS 10
 #define LOGON_DONE    11
 
+#define KEEPALIVE_TIMER_ID wxID_HIGHEST + 5
+
 BEGIN_EVENT_TABLE(CFtpControlSocket, CRealControlSocket)
 EVT_FZ_EXTERNALIPRESOLVE(wxID_ANY, CFtpControlSocket::OnExternalIPAddress)
+EVT_TIMER(wxID_ANY, CFtpControlSocket::OnTimer)
 END_EVENT_TABLE();
 
 CRawTransferOpData::CRawTransferOpData()
@@ -137,6 +140,8 @@
   m_pTlsSocket = 0;
   m_protectDataChannel = false;
   m_lastTypeBinary = -1;
+  m_bEnableKeepAlive = false;
+  m_keepAliveTimer.SetOwner(this, KEEPALIVE_TIMER_ID);
 }
 
 CFtpControlSocket::~CFtpControlSocket()
@@ -147,12 +152,16 @@
 {
   LogMessage(Debug_Verbose, _T("CFtpControlSocket::OnReceive()"));
 
+  m_keepAliveStopWatch.Start();
+
   m_pBackend->Read(m_receiveBuffer + m_bufferLen, RECVBUFFERSIZE - m_bufferLen);
   
   if (m_pBackend->Error())
   {
     if (m_pBackend->LastError() != wxSOCKET_WOULDBLOCK)
     {
+      m_bEnableKeepAlive = false;
+      m_keepAliveTimer.Stop();
       LogMessage(::Error, _("Disconnected from server"));
       DoClose();
     }
@@ -386,6 +395,9 @@
   case cmd_rawtransfer:
     TransferParseResponse();
     break;
+  case cmd_keepalive:
+    KeepAliveParseResponse();
+    break;
   case cmd_none:
     LogMessage(Debug_Verbose, _T("Out-of-order reply, ignoring."));
     break;
@@ -798,6 +810,7 @@
     LogMessage(::Error, _T("Failed to convert command to 8 bit charset"));
     return false;
   }
+  m_keepAliveStopWatch.Start();
   unsigned int len = (unsigned int)strlen(buffer);
   bool res = CRealControlSocket::Send(buffer, len);
   if (res)
@@ -1254,6 +1267,8 @@
     return DeleteSend(prevResult);
   case cmd_removedir:
     return RemoveDirSend(prevResult);
+  case cmd_keepalive:
+    return KeepAliveSend();
   default:
     LogMessage(__TFILE__, __LINE__, this, ::Debug_Warning, _T("Unknown opID (%d) in SendNextCommand"), m_pCurOpData->opId);
     ResetOperation(FZ_REPLY_INTERNALERROR);
@@ -3006,6 +3021,126 @@
   }
 
   return FZ_REPLY_WOULDBLOCK;
+}
+
+class CKeepAliveOpData : public COpData
+{
+public:
+  CKeepAliveOpData(const wxString& command)
+    : COpData(cmd_keepalive)
+  {
+    m_command = command;
+  }
+
+  wxString m_command;
+};
+
+int CFtpControlSocket::KeepAlive(const CKeepAliveCommand& command)
+{
+  LogMessage(Debug_Verbose, _T("CFtpControlSocket::KeepAlive"));
+
+  if (command.IsKeepAlive())
+  {
+    if (!m_bEnableKeepAlive)
+    {
+      m_bEnableKeepAlive = true;
+      // FIXME:
+      // read keepalive option here
+      int min_wait = 30;
+      int max_wait = 60;
+      int waitsecond = min_wait + (int)(rand()*(max_wait - min_wait)/(RAND_MAX+1));
+      m_keepAliveTimer.Start(waitsecond * 1000);
+    }
+  }
+  else
+  {
+    if (m_bEnableKeepAlive)
+    {
+      m_bEnableKeepAlive = false;
+      m_keepAliveTimer.Stop();
+    }
+  }
+
+  m_bEnableKeepAlive = true;
+  return FZ_REPLY_OK;
+}
+
+int CFtpControlSocket::DoKeepAlive()
+{
+  LogMessage(Debug_Verbose, _T("CFtpControlSocket::DoKeepAlive"));
+
+  // ignore keepalive for last I/O for socket less than 15 seconds
+  if (m_keepAliveStopWatch.Time() < 15000)
+    return FZ_REPLY_OK;
+  // choose any command
+  wxString commands[6] = {_T("PWD"),_T("REST 0"), _T("NOOP"), _T("STAT"), _T("RMD"), _T("MKD") };
+  int choice=(rand()*6)/(RAND_MAX+1);
+  m_pCurOpData = new CKeepAliveOpData(commands[choice]);
+
+  return SendNextCommand();
+}
+
+int CFtpControlSocket::KeepAliveSend()
+{
+  LogMessage(Debug_Verbose, _T("CFtpControlSocket::KeepAliveSend"));
+
+  if (!m_pCurOpData)
+  {
+    LogMessage(__TFILE__, __LINE__, this, Debug_Info, _T("Empty m_pCurOpData"));
+    ResetOperation(FZ_REPLY_INTERNALERROR);
+    return FZ_REPLY_ERROR;
+  }
+
+  CDirectoryCache cache;
+  cache.InvalidateServer(*m_pCurrentServer);
+  m_CurrentPath = CServerPath();
+
+  CKeepAliveOpData *pData = static_cast<CKeepAliveOpData *>(m_pCurOpData);
+
+  if (!Send(pData->m_command))
+    return FZ_REPLY_ERROR;
+
+  return FZ_REPLY_WOULDBLOCK;
+}
+
+int CFtpControlSocket::KeepAliveParseResponse()
+{
+  LogMessage(Debug_Verbose, _T("CFtpControlSocket::KeepAliveParseResponse"));
+
+  int code = GetReplyCode();
+  if (code == 2 || code == 3 || code == 5)
+  {
+    ResetOperation(FZ_REPLY_OK);
+    return FZ_REPLY_OK;
+  }
+  else
+  {
+    ResetOperation(FZ_REPLY_ERROR);
+    return FZ_REPLY_ERROR;
+  }
+}
+
+void CFtpControlSocket::OnTimer(wxTimerEvent& event)
+{
+  if (event.GetId() == KEEPALIVE_TIMER_ID)
+  {
+    if (m_keepAliveTimer.IsRunning())
+    {
+      m_keepAliveTimer.Stop();
+      if (m_bEnableKeepAlive) {
+        // FIXME:
+        // need to read the values from options...
+        int min_wait = 30;
+        int max_wait = 60;
+
+        int waitsecond = min_wait + (int)(rand()*(max_wait - min_wait)/(RAND_MAX+1));
+        m_keepAliveTimer.Start(waitsecond * 1000);
+        DoKeepAlive();
+      }
+    }
+  }
+  else
+    CControlSocket::OnTimer(event);
 }
 
 bool CFtpControlSocket::IsMisleadingListResponse() const
diff -Nur Filezilla3/src/engine/ftpcontrolsocket.h Filezilla3.patch/src/engine/ftpcontrolsocket.h
--- Filezilla3/src/engine/ftpcontrolsocket.h  Thu Aug 16 12:54:33 2007
+++ Filezilla3.patch/src/engine/ftpcontrolsocket.h  Thu Aug 16 12:55:33 2007
@@ -24,6 +24,14 @@
 
 protected:
   
+  bool m_bEnableKeepAlive;
+  wxTimer m_keepAliveTimer;
+  wxStopWatch m_keepAliveStopWatch;
+  virtual int KeepAlive(const CKeepAliveCommand& command);
+  int DoKeepAlive();
+  int KeepAliveParseResponse();
+  int KeepAliveSend();
+
   virtual int ResetOperation(int nErrorCode);
 
   virtual int Connect(const CServer &server);
@@ -128,6 +136,7 @@
 
   DECLARE_EVENT_TABLE();
   void OnExternalIPAddress(fzExternalIPResolveEvent& event);
+  void OnTimer(wxTimerEvent& event);
 };
 
 class CIOThread;
diff -Nur Filezilla3/src/include/commands.h Filezilla3.patch/src/include/commands.h
--- Filezilla3/src/include/commands.h  Thu Aug 16 12:54:39 2007
+++ Filezilla3.patch/src/include/commands.h  Thu Aug 16 12:56:21 2007
@@ -19,6 +19,7 @@
   cmd_rename,
   cmd_chmod,
   cmd_raw,
+  cmd_keepalive,
 
   // Only used internally
   cmd_cwd,
@@ -74,6 +75,15 @@
   const CServer GetServer() const;
 protected:
   CServer m_Server;
+};
+
+DECLARE_COMMAND(CKeepAliveCommand, cmd_keepalive)
+  CKeepAliveCommand(bool keepAlive = true);
+
+  bool IsKeepAlive() const;
+
+protected:
+  bool m_keepAlive;
 };
 
 DECLARE_COMMAND(CDisconnectCommand, cmd_disconnect)
diff -Nur Filezilla3/src/include/engineprivate.h Filezilla3.patch/src/include/engineprivate.h
--- Filezilla3/src/include/engineprivate.h  Thu Aug 16 12:54:39 2007
+++ Filezilla3.patch/src/include/engineprivate.h  Thu Aug 16 12:56:27 2007
@@ -69,6 +69,7 @@
   int Mkdir(const CMkdirCommand& command);
   int Rename(const CRenameCommand& command);
   int Chmod(const CChmodCommand& command);
+  int KeepAlive(const CKeepAliveCommand& command);
 
   int ContinueConnect();
 
diff -Nur Filezilla3/src/interface/Mainfrm.cpp Filezilla3.patch/src/interface/Mainfrm.cpp
--- Filezilla3/src/interface/Mainfrm.cpp  Thu Aug 16 12:54:45 2007
+++ Filezilla3.patch/src/interface/Mainfrm.cpp  Thu Aug 16 12:57:02 2007
@@ -825,7 +825,10 @@
 
   CServerPath path;
   path.SetSafePath(COptions::Get()->GetOption(OPTION_LASTSERVERPATH));
-  m_pState->Connect(server, false, path);
+  // FIXME:
+  // read keepalive from option
+  bool keepAlive = true;
+  m_pState->Connect(server, false, path, keepAlive);
 }
 
 void CMainFrame::OnRefresh(wxCommandEvent &event)
@@ -1341,7 +1344,10 @@
       return;
   }
 
-  m_pState->Connect(pData->m_server, true, pData->m_remoteDir);
+  // FIXME:
+  // read keepalive from option
+  bool keepAlive = true;
+  m_pState->Connect(pData->m_server, true, pData->m_remoteDir, keepAlive);
 
   if (pData->m_localDir != _T(""))
     m_pState->SetLocalDir(pData->m_localDir);
diff -Nur Filezilla3/src/interface/state.cpp Filezilla3.patch/src/interface/state.cpp
--- Filezilla3/src/interface/state.cpp  Thu Aug 16 12:54:45 2007
+++ Filezilla3.patch/src/interface/state.cpp  Thu Aug 16 12:57:13 2007
@@ -247,7 +247,7 @@
   NotifyHandlers(STATECHANGE_APPLYFILTER);
 }
 
-bool CState::Connect(const CServer& server, bool askBreak, const CServerPath& path /*=CServerPath()*/)
+bool CState::Connect(const CServer& server, bool askBreak, const CServerPath& path /*=CServerPath()*/, bool keepAlive)
 {
   if (!m_pEngine)
     return false;
@@ -261,6 +261,8 @@
 
   m_pCommandQueue->ProcessCommand(new CConnectCommand(server));
   m_pCommandQueue->ProcessCommand(new CListCommand(path));
+  if (keepAlive)
+    m_pCommandQueue->ProcessCommand(new CKeepAliveCommand(true));
   
   COptions::Get()->SetLastServer(server);
   COptions::Get()->SetOption(OPTION_LASTSERVERPATH, path.GetSafePath());
diff -Nur Filezilla3/src/interface/state.h Filezilla3.patch/src/interface/state.h
--- Filezilla3/src/interface/state.h  Thu Aug 16 12:54:43 2007
+++ Filezilla3.patch/src/interface/state.h  Thu Aug 16 12:57:18 2007
@@ -40,7 +40,7 @@
   static bool LocalDirHasParent(const wxString& dir);
   static bool LocalDirIsWriteable(const wxString& dir);
 
-  bool Connect(const CServer& server, bool askBreak, const CServerPath& path = CServerPath());
+  bool Connect(const CServer& server, bool askBreak, const CServerPath& path = CServerPath(), bool keepAlive = false);
 
   bool SetRemoteDir(const CDirectoryListing *m_pDirectoryListing, bool modified = false);
   const CDirectoryListing *GetRemoteDir() const;

Patch 可以由這兒抓取: http://www.teatime.com.tw/~tommy/mypatch/filezilla3_rc1_keepalive2.patch
製作出來的 Windows 執行檔可以由這兒抓: http://www.teatime.com.tw/~tommy/files/filezilla/filezilla3_rc1.7z

有需要的就自己抓回去用吧.

KeepAlive patch for FileZilla3

Wed, 15 Aug 2007 22:21:16 +0800

在 FileZilla 3 rc1 裡頭, sftp 似乎原本就有 keepalive 的功能, 但是在 FTP 裡頭, 這個功能並不存在. 所以當 FTP 連線過一段時間後, 會發現目前的連線就因為 timeout 而中斷了. 如果要使用就必須重新連線. 不知道為什麼作者一直不把這個在 FileZilla 2 就提供的功能, 實作到 FileZilla 3? 這兩天因為看了 FileZilla 3 的 source code, 就順便加上這個功能.

這個 patch 內容如下:

diff -Nur Filezilla3/src/engine/ControlSocket.h Filezilla3.patch/src/engine/ControlSocket.h
--- Filezilla3/src/engine/ControlSocket.h  Wed Aug 15 21:15:50 2007
+++ Filezilla3.patch/src/engine/ControlSocket.h  Wed Aug 15 21:34:19 2007
@@ -115,6 +115,8 @@
   virtual int Chmod(const CChmodCommand& command) { return FZ_REPLY_NOTSUPPORTED; }
   virtual bool Connected() const = 0;
 
+  virtual int KeepAlive(const CKeepAliveCommand& command) { return FZ_REPLY_OK; }
+
   // If m_pCurrentOpData is zero, this function returns the current command
   // from the engine.
   enum Command GetCurrentCommandId() const;
diff -Nur Filezilla3/src/engine/FileZillaEngine.cpp Filezilla3.patch/src/engine/FileZillaEngine.cpp
--- Filezilla3/src/engine/FileZillaEngine.cpp  Wed Aug 15 21:15:52 2007
+++ Filezilla3.patch/src/engine/FileZillaEngine.cpp  Wed Aug 15 21:34:45 2007
@@ -70,6 +70,9 @@
   case cmd_chmod:
     res = Chmod(reinterpret_cast<const CChmodCommand&>(command));
     break;
+  case cmd_keepalive:
+    res = KeepAlive(reinterpret_cast<const CKeepAliveCommand &>(command));
+    break;
   default:
     return FZ_REPLY_SYNTAXERROR;
   }
diff -Nur Filezilla3/src/engine/engineprivate.cpp Filezilla3.patch/src/engine/engineprivate.cpp
--- Filezilla3/src/engine/engineprivate.cpp  Wed Aug 15 21:15:52 2007
+++ Filezilla3.patch/src/engine/engineprivate.cpp  Wed Aug 15 21:35:14 2007
@@ -525,6 +525,18 @@
   return m_pControlSocket->Chmod(command);
 }
 
+int CFileZillaEnginePrivate::KeepAlive(const CKeepAliveCommand& command)
+{
+  if (!IsConnected())
+    return FZ_REPLY_NOTCONNECTED;
+
+  if (IsBusy())
+    return FZ_REPLY_BUSY;
+
+  m_pCurrentCommand = command.Clone();
+  return m_pControlSocket->KeepAlive(command);
+}
+
 void CFileZillaEnginePrivate::SendDirectoryListingNotification(const CServerPath& path, bool onList, bool modified, bool failed)
 {
   wxASSERT(m_pControlSocket);
diff -Nur Filezilla3/src/engine/ftpcontrolsocket.cpp Filezilla3.patch/src/engine/ftpcontrolsocket.cpp
--- Filezilla3/src/engine/ftpcontrolsocket.cpp  Wed Aug 15 21:15:52 2007
+++ Filezilla3.patch/src/engine/ftpcontrolsocket.cpp  Wed Aug 15 21:38:08 2007
@@ -147,6 +147,8 @@
 {
   LogMessage(Debug_Verbose, _T("CFtpControlSocket::OnReceive()"));
 
+  m_stopWatch.Start();
+
   m_pBackend->Read(m_receiveBuffer + m_bufferLen, RECVBUFFERSIZE - m_bufferLen);
   
   if (m_pBackend->Error())
@@ -386,6 +388,9 @@
   case cmd_rawtransfer:
     TransferParseResponse();
     break;
+  case cmd_keepalive:
+    KeepAliveParseResponse();
+    break;
   case cmd_none:
     LogMessage(Debug_Verbose, _T("Out-of-order reply, ignoring."));
     break;
@@ -798,6 +803,7 @@
     LogMessage(::Error, _T("Failed to convert command to 8 bit charset"));
     return false;
   }
+  m_stopWatch.Start();
   unsigned int len = (unsigned int)strlen(buffer);
   bool res = CRealControlSocket::Send(buffer, len);
   if (res)
@@ -1254,6 +1260,8 @@
     return DeleteSend(prevResult);
   case cmd_removedir:
     return RemoveDirSend(prevResult);
+  case cmd_keepalive:
+    return KeepAliveSend();
   default:
     LogMessage(__TFILE__, __LINE__, this, ::Debug_Warning, _T("Unknown opID (%d) in SendNextCommand"), m_pCurOpData->opId);
     ResetOperation(FZ_REPLY_INTERNALERROR);
@@ -3007,6 +3015,74 @@
 
   return FZ_REPLY_WOULDBLOCK;
 }
+
+class CKeepAliveOpData : public COpData
+{
+public:
+  CKeepAliveOpData(const wxString& command)
+    : COpData(cmd_keepalive)
+  {
+    m_command = command;
+  }
+
+  wxString m_command;
+};
+
+int CFtpControlSocket::KeepAlive(const CKeepAliveCommand& command)
+{
+  LogMessage(Debug_Verbose, _("CFtpControlSocket::KeepAlive"));
+
+  // ignore keepalive for last I/O for socket less than 15 seconds
+  if (m_stopWatch.Time() < 15000)
+    return FZ_REPLY_OK;
+  // choose any command
+  wxString commands[4] = {_T("PWD"),_T("REST 0"), _T("TYPE A"), _T("TYPE I") };
+  int choice=(rand()*4)/(RAND_MAX+1);
+  m_pCurOpData = new CKeepAliveOpData(commands[choice]);
+
+  return SendNextCommand();
+}
+
+int CFtpControlSocket::KeepAliveSend()
+{
+  LogMessage(Debug_Verbose, _T("CFtpControlSocket::KeepAliveSend"));
+
+  if (!m_pCurOpData)
+  {
+    LogMessage(__TFILE__, __LINE__, this, Debug_Info, _T("Empty m_pCurOpData"));
+    ResetOperation(FZ_REPLY_INTERNALERROR);
+    return FZ_REPLY_ERROR;
+  }
+
+  CDirectoryCache cache;
+  cache.InvalidateServer(*m_pCurrentServer);
+  m_CurrentPath = CServerPath();
+
+  CKeepAliveOpData *pData = static_cast<CKeepAliveOpData *>(m_pCurOpData);
+
+  if (!Send(pData->m_command))
+    return FZ_REPLY_ERROR;
+
+  return FZ_REPLY_WOULDBLOCK;
+}
+
+int CFtpControlSocket::KeepAliveParseResponse()
+{
+  LogMessage(Debug_Verbose, _T("CFtpControlSocket::KeepAliveParseResponse"));
+
+  int code = GetReplyCode();
+  if (code == 2 || code == 3)
+  {
+    ResetOperation(FZ_REPLY_OK);
+    return FZ_REPLY_OK;
+  }
+  else
+  {
+    ResetOperation(FZ_REPLY_ERROR);
+    return FZ_REPLY_ERROR;
+  }
+}
+
 
 bool CFtpControlSocket::IsMisleadingListResponse() const
 {
diff -Nur Filezilla3/src/engine/ftpcontrolsocket.h Filezilla3.patch/src/engine/ftpcontrolsocket.h
--- Filezilla3/src/engine/ftpcontrolsocket.h  Wed Aug 15 21:15:50 2007
+++ Filezilla3.patch/src/engine/ftpcontrolsocket.h  Wed Aug 15 21:30:14 2007
@@ -24,6 +24,11 @@
 
 protected:
   
+  wxStopWatch m_stopWatch;
+  virtual int KeepAlive(const CKeepAliveCommand& command);
+  int KeepAliveParseResponse();
+  int KeepAliveSend();
+
   virtual int ResetOperation(int nErrorCode);
 
   virtual int Connect(const CServer &server);
diff -Nur Filezilla3/src/include/commands.h Filezilla3.patch/src/include/commands.h
--- Filezilla3/src/include/commands.h  Wed Aug 15 21:15:37 2007
+++ Filezilla3.patch/src/include/commands.h  Wed Aug 15 21:15:07 2007
@@ -19,6 +19,7 @@
   cmd_rename,
   cmd_chmod,
   cmd_raw,
+  cmd_keepalive,
 
   // Only used internally
   cmd_cwd,
@@ -76,6 +77,8 @@
   CServer m_Server;
 };
 
+DECLARE_COMMAND(CKeepAliveCommand, cmd_keepalive)
+};
 DECLARE_COMMAND(CDisconnectCommand, cmd_disconnect)
 };
 
diff -Nur Filezilla3/src/include/engineprivate.h Filezilla3.patch/src/include/engineprivate.h
--- Filezilla3/src/include/engineprivate.h  Wed Aug 15 21:15:37 2007
+++ Filezilla3.patch/src/include/engineprivate.h  Wed Aug 15 21:15:07 2007
@@ -69,6 +69,7 @@
   int Mkdir(const CMkdirCommand& command);
   int Rename(const CRenameCommand& command);
   int Chmod(const CChmodCommand& command);
+  int KeepAlive(const CKeepAliveCommand& command);
 
   int ContinueConnect();
 
diff -Nur Filezilla3/src/interface/Mainfrm.cpp Filezilla3.patch/src/interface/Mainfrm.cpp
--- Filezilla3/src/interface/Mainfrm.cpp  Wed Aug 15 21:15:58 2007
+++ Filezilla3.patch/src/interface/Mainfrm.cpp  Wed Aug 15 21:33:21 2007
@@ -43,6 +43,7 @@
 #endif
 
 #define TRANSFERSTATUS_TIMER_ID wxID_HIGHEST + 3
+#define KEEPALIVE_TIMER_ID TRANSFERSTATUS_TIMER_ID + 1
 
 static const int statbarWidths[6] = {
 #ifdef __WXMSW__
@@ -159,6 +160,7 @@
   }
 
   m_transferStatusTimer.SetOwner(this, TRANSFERSTATUS_TIMER_ID);
+  m_keepAliveTimer.SetOwner(this, KEEPALIVE_TIMER_ID);
 
   CreateMenus();
   CreateToolBar();
@@ -696,6 +698,7 @@
   if (!m_pState->m_pCommandQueue->Idle())
     return;
 
+  m_keepAliveTimer.Stop();
   m_pState->m_pCommandQueue->ProcessCommand(new CDisconnectCommand());
 }
 
@@ -769,6 +772,8 @@
   m_pSendLed = 0;
   m_pRecvLed = 0;
 
+  m_keepAliveTimer.Stop();
+
   m_transferStatusTimer.Stop();
 
   bool res = true;
@@ -826,6 +831,9 @@
   CServerPath path;
   path.SetSafePath(COptions::Get()->GetOption(OPTION_LASTSERVERPATH));
   m_pState->Connect(server, false, path);
+  // FIXME:
+  // need to read from options, do this only for KeepAlive enabled
+  m_keepAliveTimer.Start(1000);
 }
 
 void CMainFrame::OnRefresh(wxCommandEvent &event)
@@ -898,6 +906,39 @@
     else
       m_transferStatusTimer.Stop();
   }
+  else if (event.GetId() == KEEPALIVE_TIMER_ID && m_keepAliveTimer.IsRunning())
+  {
+    // make sure engine and commandqueue exist
+    if (!m_pState && !m_pState->m_pEngine && !m_pState->m_pCommandQueue)
+    {
+      m_keepAliveTimer.Stop();
+      return;
+    }
+    // just do this for idle, wait for next timer
+    if (!m_pState->m_pCommandQueue->Idle())
+      return;
+    // if not connected, stop keepalive timer
+    if (!m_pState->m_pEngine->IsConnected())
+    {
+      m_keepAliveTimer.Stop();
+      return;
+    }
+    // FIXME:
+    // need to read the values from options...
+    int min_wait = 30;
+    int max_wait = 60;
+
+    // if just connected, the interval will be 1000
+    bool first_time = (m_keepAliveTimer.GetInterval() == 1000);
+
+    int waitsecond = min_wait + (int)(rand()*(max_wait - min_wait)/(RAND_MAX+1));
+    m_keepAliveTimer.Stop();
+    m_keepAliveTimer.Start(waitsecond * 1000);
+    // skip keepalive for just connected
+    if (first_time)
+      return;
+    m_pState->m_pCommandQueue->ProcessCommand(new CKeepAliveCommand());
+  }
 }
 
 void CMainFrame::SetProgress(const CTransferStatus *pStatus)
@@ -1342,6 +1383,9 @@
   }
 
   m_pState->Connect(pData->m_server, true, pData->m_remoteDir);
+  // FIXME:
+  // need to read from options, do this only for KeepAlive enabled
+  m_keepAliveTimer.Start(1000);
 
   if (pData->m_localDir != _T(""))
     m_pState->SetLocalDir(pData->m_localDir);
diff -Nur Filezilla3/src/interface/Mainfrm.h Filezilla3.patch/src/interface/Mainfrm.h
--- Filezilla3/src/interface/Mainfrm.h  Wed Aug 15 21:15:56 2007
+++ Filezilla3.patch/src/interface/Mainfrm.h  Wed Aug 15 21:15:21 2007
@@ -84,6 +84,9 @@
   CLed* m_pRecvLed;
   CLed* m_pSendLed;
   wxTimer m_transferStatusTimer;
+
+  wxTimer m_keepAliveTimer;
+
   CThemeProvider* m_pThemeProvider;
 #if FZ_MANUALUPDATECHECK && FZ_AUTOUPDATECHECK
   CUpdateWizard* m_pUpdateWizard;

Patch 可以由這兒抓取: http://www.teatime.com.tw/~tommy/mypatch/filezilla3_rc1_keepalive.patch
製作出來的 Windows 執行檔可以由這兒抓: http://www.teatime.com.tw/~tommy/files/filezilla/filezilla3_rc1.7z
Patch 已送給作者: http://sourceforge.net/tracker/index.php?func=detail&aid=1774714&group_id=21558&atid=372243

由於不知道怎麼處理設定的部份, 所以這個版本一定會啟用 keepalive 的功能, 目前是 30-60 秒會送出一個指令, 設定的部份如果作者接受這個 patch 的話, 就應該會加上吧.

如果有需要可以先抓上頭的版本回去使用吧. 如果這個版本執行時, 使用某些 dialog (如 About ...) 會當掉的話, 可以抓 nightly builds 裡頭的 zip, 把裡面的 resources 目錄的檔案覆蓋掉你目前的版本就可以了.

讓 FileZilla3 rc1 記得之前的視窗大小與位置

Mon, 13 Aug 2007 22:53:02 +0800

前幾天 FileZilla 作者發表了 FileZilla 3.0 RC1 的版本. 終於進入 RC 的階段了. 對我來說, 我在 FileZilla 2.x 裡頭會用到的功能, 在這個版本中多數都已經存在了. 所以就想之後都改用 FileZilla 3 的版本. 不過.... 用了一下, 發現... 這個版本仍然不會記錄之前的 UI 大小與位置, 也就是每次執行時, 所出現的畫面並不是我熟悉的, 變成每次都要調整一次. 所以... 乾脆自己修改一下, 加上這個功能來使用.這個修正如下:

diff -Nur Filezilla3/src/interface/Mainfrm.cpp Filezilla3.patch/src/interface/Mainfrm.cpp
--- Filezilla3/src/interface/Mainfrm.cpp  Mon Aug 13 14:01:20 2007
+++ Filezilla3.patch/src/interface/Mainfrm.cpp  Mon Aug 13 17:19:00 2007
@@ -29,6 +29,7 @@
 #include "export.h"
 #include "import.h"
 #include "recursive_operation.h"
+#include <wx/tokenzr.h>
 
 #ifndef __WXMSW__
 #include "resources/filezilla.xpm"
@@ -198,7 +199,7 @@
   m_pStatusView = new CStatusView(m_pTopSplitter, -1);
   m_pQueuePane = new CQueue(m_pBottomSplitter, this, m_pAsyncRequestQueue);
   m_pQueueView = m_pQueuePane->GetQueueView();
-  
+
   m_pLocalTreeViewPanel = new CView(m_pLocalSplitter);
   m_pLocalListViewPanel = new CView(m_pLocalSplitter);
   m_pLocalTreeView = new CLocalTreeView(m_pLocalTreeViewPanel, -1, m_pState, m_pQueueView);
@@ -251,7 +252,7 @@
     m_pLocalListViewPanel->SetHeader(m_pLocalViewHeader);
     m_pLocalSplitter->Initialize(m_pLocalListViewPanel);
   }
-  
+
   m_pRemoteViewHeader = new CRemoteViewHeader(m_pRemoteSplitter, m_pState);
   if (COptions::Get()->GetOptionVal(OPTION_SHOW_TREE_REMOTE))
   {
@@ -275,6 +276,38 @@
 
   Layout();
 
+    // is_maximized win_x win_y win_width win_height top_pos bottom_height view_pos view_height local_pos remote_pos
+  wxString posString = COptions::Get()->GetOption(OPTION_WINDOW_POSITION);
+    wxStringTokenizer tokens(posString, _T(" "));
+    int count = tokens.CountTokens();
+    unsigned long * aPosValues = new unsigned long[count];
+    for (int i = 0; i < count; i++) {
+        wxString token = tokens.GetNextToken();
+        token.ToULong(aPosValues + i);
+    }
+    if (count == 11) {
+        if (aPosValues[0])
+            Maximize();
+        else {
+            Move(aPosValues[1], PosaValues[2]);
+            SetClientSize(aPosValues[3], aPosValues[4]);
+        }
+        m_pTopSplitter->SetSashPosition(aPosValues[5]);
+
+        int x, y;
+        m_pBottomSplitter->GetClientSize(&x, &y);
+        y -= aPosValues[6];
+        if (y < 100) y = 100;
+        m_pBottomSplitter->SetSashPosition(y);
+
+        m_ViewSplitterSashPos = (float)aPosValues[7]/aPosValues[8];
+        m_pViewSplitter->SetSashPosition(aPosValues[7]);
+
+        m_pLocalSplitter->SetSashPosition(aPosValues[9]);
+        m_pRemoteSplitter->SetSashPosition(aPosValues[10]);
+    }
+    delete [] aValues;
+
   wxString localDir = COptions::Get()->GetOption(OPTION_LASTLOCALDIR);
   if (!m_pState->SetLocalDir(localDir))
     m_pState->SetLocalDir(_T("/"));
@@ -750,6 +783,35 @@
 
 void CMainFrame::OnClose(wxCloseEvent &event)
 {
+  wxString posString;
+    // is_maximized
+    locations += wxString::Format(_T("%d "), IsMaximized() ? 1 : 0);
+    int x, y;
+    // pos_x pos_y
+    GetPosition(&x, &y);
+    posString += wxString::Format(_T("%d %d "), x, y);
+    // pos_width pos_height
+    GetClientSize(&x, &y);
+    posString += wxString::Format(_T("%d %d "), x, y);
+    // top_pos
+    posString += wxString::Format(_T("%d "), m_pTopSplitter->GetSashPosition());
+    // bottom_height
+  m_pBottomSplitter->GetClientSize(&x, &y);
+    posString += wxString::Format(_T("%d "), y - m_pBottomSplitter->GetSashPosition());
+    // view_pos
+    posString += wxString::Format(_T("%d "), m_pViewSplitter->GetSashPosition());
+    // view_height
+  m_pViewSplitter->GetClientSize(&x, &y);
+  if (COptions::Get()->GetOptionVal(OPTION_FILEPANE_LAYOUT) != 1)
+        posString += wxString::Format(_T("%d "), x);
+  else
+        posString += wxString::Format(_T("%d "), y);
+    // local_pos
+    posString += wxString::Format(_T("%d "), m_pLocalSplitter->GetSashPosition());
+    // remote_pos
+    posString += wxString::Format(_T("%d "), m_pRemoteSplitter->GetSashPosition());
+  COptions::Get()->SetOption(OPTION_WINDOW_POSITION, posString);
+
   Show(false);
   m_bQuit = true;
   delete m_pSendLed;
diff -Nur Filezilla3/src/interface/Options.cpp Filezilla3.patch/src/interface/Options.cpp
--- Filezilla3/src/interface/Options.cpp  Mon Aug 13 14:01:21 2007
+++ Filezilla3.patch/src/interface/Options.cpp  Mon Aug 13 16:59:12 2007
@@ -81,7 +81,8 @@
   { "Queue successful autoclear", number, _T("0") },
   { "Queue column widths", string, _T("") },
   { "Local filelist colwidths", string, _T("") },
-  { "Remote filelist colwidths", string, _T("") }
+  { "Remote filelist colwidths", string, _T("") },
+  { "Window position and size", string, _T("") }
 };
 
 COptions::COptions()
@@ -195,7 +196,7 @@
 {
   if (!SetOptionNoSave(nID, value))
     return false;
-  
+
   if (m_pXmlFile)
     m_pXmlFile->Save();
 
@@ -416,7 +417,7 @@
     return;
 
   TiXmlElement *element = m_pXmlFile->GetElement();
-  
+
   while (path != _T(""))
   {
     wxString sub;
diff -Nur Filezilla3/src/interface/Options.h Filezilla3.patch/src/interface/Options.h
--- Filezilla3/src/interface/Options.h  Mon Aug 13 14:01:21 2007
+++ Filezilla3.patch/src/interface/Options.h  Mon Aug 13 16:58:26 2007
@@ -35,6 +35,7 @@
   OPTION_QUEUE_COLUMN_WIDTHS,
   OPTION_LOCALFILELIST_COLUMN_WIDTHS,
   OPTION_REMOTEFILELIST_COLUMN_WIDTHS,
+  OPTION_WINDOW_POSITION,
 
   // Has to be last element
   OPTIONS_NUM
@@ -57,7 +58,7 @@
 
   virtual bool SetOption(unsigned int nID, int value);
   virtual bool SetOption(unsigned int nID, wxString value);
-  
+
   bool SetOptionNoSave(unsigned int nID, int value);
   bool SetOptionNoSave(unsigned int nID, wxString value);
 
@@ -72,7 +73,7 @@
 
   void SaveColumnWidths(const wxListCtrl* const pListCtrl, unsigned int optionId);
   bool ReadColumnWidths(unsigned int optionId, unsigned int count, unsigned long* widths);
-  
+
 protected:
   COptions();
   virtual ~COptions();

Patch 可以由這兒抓取: http://www.teatime.com.tw/~tommy/mypatch/filezilla3_rc1_save_position.patch
製作出來的 Windows 執行檔可以由這兒抓: http://www.teatime.com.tw/~tommy/files/filezilla/filezilla3_rc1_save_position.7z
Patch 已送給作者: https://sourceforge.net/tracker/?func=detail&atid=372243&aid=1773124&group_id=21558

這樣子處理之後, 果然使用上就順手多了.

在 FileZilla 3 RC1 中, 除了這個問題外, 我覺得還有兩個小問題:

Keep Alive 的功能還沒有, 所以隔一段時間就會斷線.
在 Queue 裡頭的檔案, 不能暫時停止, 只能移除.

如果你認為這兩個小問題對你沒影響, 歡迎也加入 FileZilla 3 的使用行列吧.

2007/08/14:

作者做了部份修改之後, 把這個 patch 納入官方版本中了. (另外... 好像 SourceForge 上頭的 CVS 與 SVN 並沒有同步.... 目前在 CVS 上頭的版本比較舊, 要抓 SVN 上頭的才會是最新的版本)

FileZilla 3 beta 8, 可以考慮取代 FileZilla 2 了

Sun, 13 May 2007 10:40:02 +0800

FileZilla 的作者在這幾天發表了 FileZilla 3 beta8, 試用了一下下, 多數 FileZilla 2 在 ftp/sftp 上頭的功能, 都已經在裡頭了. 就整個 ftp/sfpt 的引擎部份來看, 目前運作都正常. 包含了 UTF-8 的支援, 目前已經不需要另外自己 patch 了.

在 sftp 的傳輸速度上, 也比 FileZilla 2 要快上許多. 我在 local 的網路測試, 記得以前用 FileZilla 2.x 的時候, 都只能有 300-400KB/s 上下的速度, 而在 FileZilla 3 上頭, 可以到 3-4MB/s 左右. 效能好了十倍左右.

不過目前在 UI 上頭的方便性來說, 仍不如 FileZilla 2 好用, 視窗大小, 位置, 裡頭的欄位大小等等, 每次進入都會歸零, 並不會記憶之前的設定. 這也是後續的 beta 版本或 rc 版本要改進的地方. 另外, 這個版本目前沒有辦法匯入 FileZilla 2 的設定, 所以, 所有的站台設定要重設一次. 應該在正式版之前也會加上這個功能才對. 在這些小改進之後, 相信 FileZilla 3 的正式版本, 應該很快就會出來了.

就目前的試用感覺來看. 至少這個版本已經足夠滿足一般的使用. 應該可以考慮取代 FileZilla 2.x 了.