andrey/k210-sdk-stuff
1
0
Fork 0
mirror of https://github.com/laanwj/k210-sdk-stuff.git synced 2024-11-22 01:16:20 +04:00
Code Issues Projects Releases Wiki Activity

linux: Solve an issue with incomplete packets

Browse Source 
esp_read_responses was throwing away the buffer contents between
invocations, which is not a good idea if there might be a (partial)
async notification such a a received packet in there.
This commit is contained in:
Wladimir J. van der Laan 2020-02-22 11:39:28 +00:00
parent 526e9683c2
commit aab7c0a84b
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
linux/esptun.c
View File

@ -38,6 +38,7 @@
bool debug = false; bool debug = false;
char *progname; char *progname;
uint8_t esp_buffer[ESP_BUFSIZE]; uint8_t esp_buffer[ESP_BUFSIZE];
size_t esp_end;
uint8_t tap_buffer[TAP_BUFSIZE]; uint8_t tap_buffer[TAP_BUFSIZE];
size_t tap2net; size_t tap2net;
size_t net2tap; size_t net2tap;
@ -354,21 +355,22 @@ static void tun_tx_packet(int fd, const uint8_t *esp_buffer, size_t size) {
/** Get OK/FAIL status after running a command on the ESP. */ /** Get OK/FAIL status after running a command on the ESP. */
static bool esp_read_responses(int fd, bool early_terminate) static bool esp_read_responses(int fd, bool early_terminate)
{ {
bool finished = false;
bool retval = false;
/** TODO handle timeouts. */ /** TODO handle timeouts. */
size_t end = 0; while (!finished) {
while (true) { ssize_t n = read(fd, &esp_buffer[esp_end], ESP_BUFSIZE - esp_end);
ssize_t n = read(fd, &esp_buffer[end], ESP_BUFSIZE - end);
if (n <= 0) { if (n <= 0) {
perror("Reading from UART"); perror("Reading from UART");
exit(1); exit(1);
} }
end += n; esp_end += n;
size_t ptr = 0; size_t ptr = 0;
while (ptr < end) { while (ptr < esp_end) {
const uint8_t *resp = &esp_buffer[ptr]; const uint8_t *resp = &esp_buffer[ptr];
struct packet_info pkt_info; struct packet_info pkt_info;
size_t len = esp_response_is_complete(resp, end - ptr, &pkt_info); size_t len = esp_response_is_complete(resp, esp_end - ptr, &pkt_info);
if (len) { if (len) {
log_debug("<-: "); log_debug("<-: ");
debug_response(resp, len); debug_response(resp, len);
@ -376,12 +378,14 @@ static bool esp_read_responses(int fd, bool early_terminate)
/* Check for final response */ /* Check for final response */
if (is_prefix(resp, len, S("OK")) if (is_prefix(resp, len, S("OK"))
|| is_prefix(resp, len, S("SEND OK"))) { || is_prefix(resp, len, S("SEND OK"))) {
return true; finished = true;
retval = true;
} }
if (is_prefix(resp, len, S("FAIL")) if (is_prefix(resp, len, S("FAIL"))
|| is_prefix(resp, len, S("ERROR")) || is_prefix(resp, len, S("ERROR"))
|| is_prefix(resp, len, S("ALREADY CONNECTED"))) { || is_prefix(resp, len, S("ALREADY CONNECTED"))) {
return false; finished = true;
retval = false;
} }
/* Log interesting info responses */ /* Log interesting info responses */
if (is_prefix(resp, len, S("+CIPSTA_CUR"))) { if (is_prefix(resp, len, S("+CIPSTA_CUR"))) {
@ -399,7 +403,7 @@ static bool esp_read_responses(int fd, bool early_terminate)
/* On non-final response, keep reading. */ /* On non-final response, keep reading. */
} else { } else {
if (end == ESP_BUFSIZE) { if (esp_end == ESP_BUFSIZE) {
/* Buffer full but command wasn't complete - this isn't good, /* Buffer full but command wasn't complete - this isn't good,
* exit to prevent looping forever. */ * exit to prevent looping forever. */
my_err("Buffer full with unterminated command"); my_err("Buffer full with unterminated command");
@ -408,14 +412,18 @@ static bool esp_read_responses(int fd, bool early_terminate)
} }
ptr += len; ptr += len;
} }
/* Remove processed responses from esp_buffer by shifting bytes. */ /* Remove processed responses from esp_buffer by shifting bytes. */
memmove(esp_buffer, &esp_buffer[ptr], end - ptr); memmove(esp_buffer, &esp_buffer[ptr], esp_end - ptr);
end -= ptr; esp_end -= ptr;
if (early_terminate && end == 0) {
if (early_terminate && esp_end == 0) {
/* All responses processed, back to select so that packets from tun get a chance. */ /* All responses processed, back to select so that packets from tun get a chance. */
return true; finished = true;
retval = true;
} }
} }
return retval;
} }
/** Send a packet to ESP interface. */ /** Send a packet to ESP interface. */