Fixed active FTP transfer (broken in rev 1.11), was waiting for connection from

server before sending STOR command.

src/sbbs3/execnet.cpp

@@ -793,8 +793,22 @@ bool sbbs_t::ftp_put(csi_t* csi, SOCKET ctrl_sock, char* src, char* dest)
 			close_socket(data_sock);
 			return(false);
 		}
+	}
 
-	} else {	/* Normal (Active) FTP */
+	if((fp=fopen(src,"rb"))==NULL) {
+		close_socket(data_sock);
+		return(false);
+	}
+
+	sprintf(cmd,"STOR %s",dest);
+
+	if(!ftp_cmd(csi,ctrl_sock,cmd,rsp) 
+		|| atoi(rsp)!=150 /* Open data connection */) {
+		close_socket(data_sock);
+		return(false);
+	}
+
+	if(!(csi->ftp_mode&CS_FTP_PASV)) {	/* Normal (Active) FTP */
 
 		/* Setup for select() */
 		tv.tv_sec=TIMEOUT_SOCK_LISTEN;
@@ -824,22 +838,8 @@ bool sbbs_t::ftp_put(csi_t* csi, SOCKET ctrl_sock, char* src, char* dest)
 		data_sock=accept_sock;
 	}
 
-	if((fp=fopen(src,"rb"))==NULL) {
-		close_socket(data_sock);
-		return(false);
-	}
-
-	sprintf(cmd,"STOR %s",dest);
-
-	if(!ftp_cmd(csi,ctrl_sock,cmd,rsp) 
-		|| atoi(rsp)!=150 /* Open data connection */) {
-		close_socket(data_sock);
-		return(false);
-	}
-
 	while(online && !feof(fp)) {
 
-
 		rd=fread(buf,sizeof(char),sizeof(buf),fp);
 		if(rd<1) /* EOF or READ error */
 			break;