diff options
| author | Daniel Campora <daniel@wipy.io> | 2015-06-03 17:28:03 +0200 |
|---|---|---|
| committer | Daniel Campora <daniel@wipy.io> | 2015-06-03 17:31:21 +0200 |
| commit | cc20482aa997af7c20fe4ec9cad85762aa52b458 (patch) | |
| tree | 74887d6293eeecdab78ee42cba3cec2a27449fa5 /cc3200/ftp | |
| parent | a546acda8c4c1342ee5f0e50733915e15a775756 (diff) | |
cc3200: Add method to configure the servers timeout.
With network.server_timeout(secs) the timeout can be changed.
The default value is 300 secs. Minimmum accpeted is 5 secs.
Without params the function returns the current configured timeout.
Diffstat (limited to 'cc3200/ftp')
| -rw-r--r-- | cc3200/ftp/ftp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cc3200/ftp/ftp.c b/cc3200/ftp/ftp.c index 0d30108e8..df28e78d0 100644 --- a/cc3200/ftp/ftp.c +++ b/cc3200/ftp/ftp.c @@ -68,7 +68,6 @@ #define FTP_UNIX_TIME_20150101 1420070400 #define FTP_UNIX_SECONDS_180_DAYS 15552000 #define FTP_DATA_TIMEOUT_MS 5000 // 5 seconds -#define FTP_CMD_TIMEOUT_MS 120000 // 2 minutes #define FTP_SOCKETFIFO_ELEMENTS_MAX 4 #define FTP_CYCLE_TIME_MS (SERVERS_CYCLE_TIME_MS * 2) @@ -253,7 +252,7 @@ void ftp_run (void) { ftp_wait_for_enabled(); break; case E_FTP_STE_START: - if (ftp_create_listening_socket(&ftp_data.lc_sd, FTP_CMD_PORT, FTP_CMD_CLIENTS_MAX )) { + if (wlan_is_connected() && ftp_create_listening_socket(&ftp_data.lc_sd, FTP_CMD_PORT, FTP_CMD_CLIENTS_MAX)) { ftp_data.state = E_FTP_STE_READY; } break; @@ -838,7 +837,7 @@ static void ftp_process_cmd (void) { } } else if (result == E_FTP_RESULT_CONTINUE) { - if (ftp_data.ctimeout++ > (FTP_CMD_TIMEOUT_MS / FTP_CYCLE_TIME_MS)) { + if (ftp_data.ctimeout++ > (servers_get_timeout() / FTP_CYCLE_TIME_MS)) { ftp_send_reply(221, NULL); } } |