summaryrefslogtreecommitdiffstatshomepage
path: root/cc3200/serverstask.c
diff options
context:
space:
mode:
authorDaniel Campora <daniel@wipy.io>2015-03-25 13:29:50 +0100
committerDaniel Campora <daniel@wipy.io>2015-03-25 15:22:21 +0100
commit684dba40f03e3b78cabf3a20c563d2913384edc2 (patch)
treefdff73cc17d75b2cf293fc536d211131ad57d0d8 /cc3200/serverstask.c
parente15f8198bc9efa85bfb9ec50ce7a0a0166e69989 (diff)
downloadmicropython-684dba40f03e3b78cabf3a20c563d2913384edc2.tar.gz
micropython-684dba40f03e3b78cabf3a20c563d2913384edc2.zip
cc3200: Roll back to the previous telnet and ftp timeouts.
Unfortunately, these timeouts are the only realiable way (for now), to be able to detect broken connections due to half-open sockets. Such a thing occurs when getting out of the WiFi coverage area or when disconnecting from the AP (sometimes the client doesn't send the disconnect packet).
Diffstat (limited to 'cc3200/serverstask.c')
-rw-r--r--cc3200/serverstask.c18
1 files changed, 1 insertions, 17 deletions
diff --git a/cc3200/serverstask.c b/cc3200/serverstask.c
index 4a401204d4..62e41fcd44 100644
--- a/cc3200/serverstask.c
+++ b/cc3200/serverstask.c
@@ -54,13 +54,12 @@ typedef struct {
volatile bool enabled;
volatile bool do_disable;
volatile bool do_enable;
- volatile bool do_reset;
}servers_Data_t;
/******************************************************************************
DECLARE PRIVATE DATA
******************************************************************************/
-static servers_Data_t servers_data = {.enabled = false, .do_disable = false, .do_enable = false, .do_reset = false};
+static servers_Data_t servers_data = {.enabled = false, .do_disable = false, .do_enable = false};
/******************************************************************************
DECLARE PRIVATE FUNCTIONS
@@ -96,16 +95,8 @@ void TASK_Servers (void *pvParameters) {
ftp_disable();
// now clear the flags
servers_data.do_disable = false;
- servers_data.do_reset = false;
servers_data.enabled = false;
}
- else if (servers_data.do_reset) {
- // reset network services
- telnet_reset();
- ftp_reset();
- // clear the flag
- servers_data.do_reset = false;
- }
else {
if (cycle) {
telnet_run();
@@ -135,11 +126,6 @@ void TASK_Servers (void *pvParameters) {
void servers_start (void) {
servers_data.do_disable = false;
servers_data.do_enable = true;
- servers_data.do_reset = true;
-}
-
-void servers_reset (void) {
- servers_data.do_reset = true;
}
void servers_stop (void) {
@@ -148,8 +134,6 @@ void servers_stop (void) {
do {
HAL_Delay (SERVERS_CYCLE_TIME_MS);
} while (servers_are_enabled());
- // clear the last command line
- telnet_reset();
}
bool servers_are_enabled (void) {