lwIpWrapper: CNetIf add ping command

Author: pennam

Diff for: libraries/Ethernet/src/Ethernet.cpp

@@ -223,4 +223,27 @@ IPAddress CEthernet::dnsServerIP() {
   return CLwipIf::getInstance().getDns();
 }
 
+/* -------------------------------------------------------------------------- */
+int CEthernet::ping(IPAddress ip, uint8_t ttl) {
+/* -------------------------------------------------------------------------- */
+   return CLwipIf::getInstance().ping(ip, ttl);
+}
+
+/* -------------------------------------------------------------------------- */
+int CEthernet::ping(const String &hostname, uint8_t 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;
+}
+
 CEthernet Ethernet;

Diff for: libraries/Ethernet/src/EthernetC33.h

@@ -69,6 +69,12 @@ class CEthernet {
     IPAddress gatewayIP();
     IPAddress dnsServerIP();
 
+    /*
+     * PING
+     */
+    int ping(IPAddress ip, uint8_t ttl = 128);
+    int ping(const String &hostname, uint8_t ttl = 128);
+    int ping(const char* host, uint8_t ttl = 128);
 
     friend class EthernetClient;
     friend class EthernetServer;

Diff for: libraries/WiFi/src/WiFi.cpp

@@ -321,12 +321,33 @@ unsigned long CWifi::getTime() {
    return 0;
 }
 
-
-
 void CWifi::setTimeout(unsigned long timeout) {
    (void)(timeout);  
 }
 
+/* -------------------------------------------------------------------------- */
+int CWifi::ping(IPAddress ip, uint8_t ttl) {
+/* -------------------------------------------------------------------------- */
+   return CLwipIf::getInstance().ping(ip, ttl);
+}
+
+/* -------------------------------------------------------------------------- */
+int CWifi::ping(const String &hostname, uint8_t ttl)
+/* -------------------------------------------------------------------------- */
+{
+	return ping(hostname.c_str(), ttl);
+}
+
+/* -------------------------------------------------------------------------- */
+int CWifi::ping(const char* host, uint8_t ttl) {
+/* -------------------------------------------------------------------------- */
+   IPAddress ip;
+   if(hostByName(host,ip)) {
+      return CLwipIf::getInstance().ping(ip, ttl);
+   }
+   return -1;
+}
+
 
 CWifi WiFi;
 

Diff for: libraries/WiFi/src/WiFiC3.h

@@ -254,7 +254,12 @@ class CWifi {
 
 
     void setTimeout(unsigned long timeout);
-
+    /*
+     * PING
+     */
+    int ping(IPAddress ip, uint8_t ttl = 128);
+    int ping(const String &hostname, uint8_t ttl = 128);
+    int ping(const char* host, uint8_t ttl = 128);
 
 };
 

Diff for: libraries/lwIpWrapper/src/CNetIf.cpp

@@ -1,5 +1,9 @@
 #include "CNetIf.h"
 #include <functional>
+#include "lwip/include/lwip/raw.h"
+#include "lwip/include/lwip/icmp.h"
+#include "lwip/include/lwip/ip_addr.h"
+#include "lwip/include/lwip/inet_chksum.h"
 
 IPAddress CNetIf::default_ip("192.168.0.10");
 IPAddress CNetIf::default_nm("255.255.255.0");
@@ -14,6 +18,32 @@ bool CLwipIf::pending_eth_rx = false;
 
 FspTimer CLwipIf::timer;
 
+u8_t icmp_receive_callback(void* arg, struct raw_pcb* pcb, struct pbuf* p, const ip_addr_t* addr)
+{
+    struct ping_data *d = (struct ping_data*)arg;
+    struct __attribute__((__packed__)) {
+        struct ip_hdr ipHeader;
+        struct icmp_echo_hdr header;
+    } response;
+
+    if(d->s == pcb) {
+        if(p->len < sizeof(response)) {
+            pbuf_free(p);
+            return 1;
+        }
+
+        pbuf_copy_partial(p, &response, sizeof(response), 0);
+
+        if(response.header.id == d->echo_req.id && response.header.seqno == d->echo_req.seqno) {
+            d->endMillis = millis();
+        }
+        pbuf_free(p);
+        return 1;
+    }
+
+    return 0;
+}
+
 ip_addr_t* u8_to_ip_addr(uint8_t* ipu8, ip_addr_t* ipaddr)
 {
     IP_ADDR4(ipaddr, ipu8[0], ipu8[1], ipu8[2], ipu8[3]);
@@ -120,6 +150,81 @@ void CLwipIf::lwip_task()
     }
 }
 
+int CLwipIf::ping(IPAddress ip, uint8_t ttl)
+{
+    uint32_t result = -1;
+    uint32_t timeout = 5000;
+    uint32_t sendTime = 0;
+    uint32_t startWait = 0;
+    struct pbuf *p;
+    struct raw_pcb* s;
+    struct ping_data *d = new ping_data;
+    if (!d){
+        goto exit;
+    }
+
+    //Create a raw socket
+    s = raw_new(IP_PROTO_ICMP);
+    if(!s) {
+        goto exit;
+    }    
+
+    struct __attribute__((__packed__)) {
+        struct icmp_echo_hdr header;
+        uint8_t data[32];
+    } request;
+
+    ICMPH_TYPE_SET(&request.header, ICMP_ECHO);
+    ICMPH_CODE_SET(&request.header, 0);
+    request.header.chksum = 0;
+    request.header.id = 0xAFAF;
+    request.header.seqno = random(0xffff);
+    
+    d->echo_req = request.header;
+
+    for (size_t i = 0; i < sizeof(request.data); i++) {
+        request.data[i] = i;
+    }
+
+    request.header.chksum = inet_chksum(&request, sizeof(request));
+
+    ip_addr_t addr;
+    addr.addr = ip;
+
+    d->endMillis = 0;
+
+    raw_recv(s, icmp_receive_callback, d);
+
+    // Build the packet
+    p = pbuf_alloc(PBUF_IP, sizeof(request), PBUF_RAM);
+    if (!p) {
+        goto exit;
+    }
+
+    //Load payload into buffer
+    pbuf_take(p, &request, sizeof(request));
+
+    // Send the echo request
+    sendTime = millis();
+    raw_sendto(s, p, &addr);    
+
+    // Wait for response
+    startWait = millis();
+    do {
+        lwip_task();
+    } while (d->endMillis == 0 && (millis() - startWait) < timeout);  
+    
+    if (d->endMillis != 0) {
+        result = d->endMillis - sendTime;
+    }
+
+exit:
+    pbuf_free(p);    
+    delete d;
+    raw_remove(s);
+    return result;
+}
+
 /* -------------------------------------------------------------------------- */
 /* GET INSTANCE SINGLETONE FUNCTION */
 /* -------------------------------------------------------------------------- */

Diff for: libraries/lwIpWrapper/src/CNetIf.h

@@ -131,6 +131,12 @@ ip_addr_t* u8_to_ip_addr(uint8_t* ipu8, ip_addr_t* ipaddr);
 
 uint32_t ip_addr_to_u32(ip_addr_t* ipaddr);
 
+struct ping_data{
+    uint32_t endMillis;
+    icmp_echo_hdr echo_req;
+    struct raw_pcb* s;
+};
+
 /* Base class implements DHCP, derived class will switch it on or off */
 /* -------------------------------------------------------------------------- */
 class CNetIf {
@@ -436,6 +442,10 @@ class CLwipIf {
     int setWifiMode(WifiMode_t mode);
 
     void lwip_task();
+    /*
+     * PING
+     */
+    int ping(IPAddress ip, uint8_t ttl = 128);
 };
 
 #endif