esp32/ltepp: bug fix in ppp suspension

iwahdan88 · iwahdan88 · commit bf11cc002e59 · 2019-01-19T15:21:11.000+01:00
diff --git a/esp32/lte/lteppp.c b/esp32/lte/lteppp.c
@@ -428,7 +428,7 @@ static void TASK_LTE (void *pvParameters) {
                 uart_get_buffered_data_len(LTE_UART_ID, &rx_len);
                 if (rx_len > 0) {
                     // try to read up to the size of the buffer
-                    rx_len = uart_read_bytes(LTE_UART_ID, (uint8_t *)lteppp_trx_buffer, sizeof(lteppp_trx_buffer), 
+                    rx_len = uart_read_bytes(LTE_UART_ID, (uint8_t *)lteppp_trx_buffer, sizeof(lteppp_trx_buffer),
                                              LTE_TRX_WAIT_MS(sizeof(lteppp_trx_buffer)) / portTICK_RATE_MS);
                     if (rx_len > 0) {
                         pppos_input_tcpip(lteppp_pcb, (uint8_t *)lteppp_trx_buffer, rx_len);
@@ -494,13 +494,17 @@ static uint32_t lteppp_output_callback(ppp_pcb *pcb, u8_t *data, u32_t len, void
     }
     else
     {
-        memcpy(&(lteppp_queue_buffer[top]), (const char*)data, len);
-        top += len;
-        if(top > LTE_UART_BUFFER_SIZE)
+        uint32_t temp = top + len;
+        if(temp > LTE_UART_BUFFER_SIZE)
         {
-            top = LTE_UART_BUFFER_SIZE -1;
+            return 0;
+        }
+        else
+        {
+            memcpy(&(lteppp_queue_buffer[top]), (const char*)data, len);
+            top += len;
+            return len;
         }
-        return len;
     }
     return tx_bytes;
 }

Original file line number	Diff line number	Diff line change
`@@ -428,7 +428,7 @@ static void TASK_LTE (void *pvParameters) {`
`428`	`428`	`uart_get_buffered_data_len(LTE_UART_ID, & E69F rx_len);`
`429`	`429`	`if (rx_len > 0) {`
`430`	`430`	`// try to read up to the size of the buffer`
`431`		`- rx_len = uart_read_bytes(LTE_UART_ID, (uint8_t *)lteppp_trx_buffer, sizeof(lteppp_trx_buffer),`
	`431`	`+ rx_len = uart_read_bytes(LTE_UART_ID, (uint8_t *)lteppp_trx_buffer, sizeof(lteppp_trx_buffer),`
`432`	`432`	`LTE_TRX_WAIT_MS(sizeof(lteppp_trx_buffer)) / portTICK_RATE_MS);`
`433`	`433`	`if (rx_len > 0) {`
`434`	`434`	`pppos_input_tcpip(lteppp_pcb, (uint8_t *)lteppp_trx_buffer, rx_len);`
`@@ -494,13 +494,17 @@ static uint32_t lteppp_output_callback(ppp_pcb pcb, u8_t data, u32_t len, void`
`494`	`494`	`}`
`495`	`495`	`else`
`496`	`496`	`{`
`497`		`- memcpy(&(lteppp_queue_buffer[top]), (const char*)data, len);`
`498`		`- top += len;`
`499`		`- if(top > LTE_UART_BUFFER_SIZE)`
	`497`	`+ uint32_t temp = top + len;`
	`498`	`+ if(temp > LTE_UART_BUFFER_SIZE)`
`500`	`499`	`{`
`501`		`- top = LTE_UART_BUFFER_SIZE -1;`
	`500`	`+ return 0;`
	`501`	`+ }`
	`502`	`+ else`
	`503`	`+ {`
	`504`	`+ memcpy(&(lteppp_queue_buffer[top]), (const char*)data, len);`
	`505`	`+ top += len;`
	`506`	`+ return len;`
`502`	`507`	`}`
`503`		`- return len;`
`504`	`508`	`}`
`505`	`509`	`return tx_bytes;`
`506`	`510`	`}`