Ticket #1459: ControlSocket.cpp.patch

C:/Documents

@@ -2525 +2554 @@
     // Get local port
     SOCKADDR_IN addr;
     int len = sizeof(addr);
+
+    // Fix: Formerly, the data connection would always be opened using the server's default (primary) IP.
+    // This would cause Windows Firewall to freak out if control connection was opened on a secondary IP.
+    // When using Active FTP behind Windows Firewall, no connection could be made. This fix ensures the data
+    // socket is on the same IP as the control socket.
+    // 12/13/2004 - DKW
+    CStdString ControlIP;
+    SOCKADDR_IN sockAddr;
+
+    memset(&sockAddr, 0, sizeof(sockAddr));
+    int nSockAddrLen = sizeof(sockAddr);
+    BOOL bResult = this->GetSockName((SOCKADDR*)&sockAddr, &nSockAddrLen);
+    if (bResult)
+        ControlIP = inet_ntoa(sockAddr.sin_addr);
+
     if (GetSockName((SOCKADDR *)&addr, &len))
     {
         int nPort = ntohs(addr.sin_port);
         // Try create control conn. port - 1
         if (nPort > 1)
-            if (pTransferSocket->Create(nPort - 1, SOCK_STREAM, FD_CONNECT))
+        {
+            if (pTransferSocket->Create(nPort - 1, SOCK_STREAM, FD_CONNECT, ControlIP))
                 bCreated = TRUE;
             // Try create control conn. port + 1 if necessary
             if (!bCreated && nPort < 65535)
-                if (pTransferSocket->Create(nPort + 1, SOCK_STREAM, FD_CONNECT))
+            {
+                if (pTransferSocket->Create(nPort + 1, SOCK_STREAM, FD_CONNECT, ControlIP))
                     bCreated = TRUE;
+            }
+        }
     }
     if (!bCreated)
+    {
         // Let the OS find a valid port
-        if (!pTransferSocket->Create(0, SOCK_STREAM, FD_CONNECT))
+        if (!pTransferSocket->Create(0, SOCK_STREAM, FD_CONNECT, ControlIP))
         {
             // Give up
             Send("421 Can't create socket");
             ResetTransferstatus();
             return FALSE;
-        }           
+        }
+    }
+
     if (m_pGssLayer && m_pGssLayer->AuthSuccessful())
         m_transferstatus.socket->UseGSS(m_pGssLayer);