lwIpWrapper: CNetIf refactor ping functions

Author: fabik111

libraries/Ethernet/src/Ethernet.cpp

@@ -226,24 +226,24 @@ IPAddress CEthernet::dnsServerIP() {
 /* -------------------------------------------------------------------------- */
 int CEthernet::ping(IPAddress ip, uint8_t ttl) {
 /* -------------------------------------------------------------------------- */
-   return CLwipIf::getInstance().ping(ip, ttl);
+  return CLwipIf::getInstance().ping(ip, ttl);
 }
 
 /* -------------------------------------------------------------------------- */
 int CEthernet::ping(const String &hostname, uint8_t ttl)
 /* -------------------------------------------------------------------------- */
 {
-	return ping(hostname.c_str(), ttl);
+  return ping(hostname.c_str(), ttl);
 }
 
 /* -------------------------------------------------------------------------- */
 int CEthernet::ping(const char* host, uint8_t ttl) {
 /* -------------------------------------------------------------------------- */
-   IPAddress ip;
-   if(CLwipIf::getInstance().getHostByName(host,ip)) {
-      return CLwipIf::getInstance().ping(ip, ttl);
-   }
-   return -1;
+  IPAddress ip;
+  if(CLwipIf::getInstance().getHostByName(host,ip)) {
+    return CLwipIf::getInstance().ping(ip, ttl);
+  }
+  return -1;
 }
 
 CEthernet Ethernet;

libraries/WiFi/src/WiFi.cpp

@@ -335,7 +335,7 @@ int CWifi::ping(IPAddress ip, uint8_t ttl) {
 int CWifi::ping(const String &hostname, uint8_t ttl)
 /* -------------------------------------------------------------------------- */
 {
-	return ping(hostname.c_str(), ttl);
+   return ping(hostname.c_str(), ttl);
 }
 
 /* -------------------------------------------------------------------------- */

libraries/lwIpWrapper/src/CNetIf.cpp

@@ -26,22 +26,24 @@ static u8_t icmp_receive_callback(void *arg, struct raw_pcb *pcb, struct pbuf *p
     LWIP_ASSERT("p != NULL", p != NULL);
 
     recv_callback_data* request = (recv_callback_data*)arg;
+    if ((p->tot_len < (PBUF_IP_HLEN + sizeof(struct icmp_echo_hdr))) ||
+        pbuf_remove_header(p, PBUF_IP_HLEN) != 0) {
+            return 0; /* don't consume the packet */
+    }
 
-    if ((p->tot_len >= (PBUF_IP_HLEN + sizeof(struct icmp_echo_hdr))) &&
-        pbuf_remove_header(p, PBUF_IP_HLEN) == 0) {
-        iecho = (struct icmp_echo_hdr *)p->payload;
+    iecho = (struct icmp_echo_hdr *)p->payload;
 
-        if ((iecho->id == 0xAFAF) && (iecho->seqno == lwip_htons(request->seqNum))) {
-            /* do some ping result processing */
-            request->endMillis = millis();
-            pbuf_free(p);
-            return 1; /* eat the packet */
-        }
+    if(iecho->id != 0xAFAF || iecho->seqno != lwip_htons(request->seqNum)) {
         /* not eaten, restore original packet */
         pbuf_add_header(p, PBUF_IP_HLEN);
+        return 0;
     }
 
-    return 0; /* don't eat the packet */
+    /* do some ping result processing */
+    request->endMillis = millis();
+    pbuf_free(p);
+    return 1; /* consume the packet */
+
 }
 
 ip_addr_t* u8_to_ip_addr(uint8_t* ipu8, ip_addr_t* ipaddr)
@@ -202,12 +204,17 @@ int CLwipIf::ping(IPAddress ip, uint8_t ttl)
     }
     pbuf_free(p);
 
-    bool timeout = false;
-    while (!requestCbkData.endMillis && !timeout) {
-        timeout = (millis() - requestCbkData.startMillis) > 5000;
+    CLwipIf::getInstance().startSyncRequest();
+
+    while (!requestCbkData.endMillis && (millis() - requestCbkData.startMillis) <= 5000) {
+        CLwipIf::getInstance().lwip_task();
     }
 
-    if (timeout) {
+    CLwipIf::getInstance().restartAsyncRequest();
+
+    raw_remove(s);
+
+    if (!requestCbkData.endMillis) {
         return -1;
     }