blocking OTA Tx and Rx

Reviewed-on: #1

.gitignore

@@ -57,3 +57,6 @@ build/
 test/build/
 
 *.old
+
+*.orig
+

README.md

@@ -1,2 +1,19 @@
 # ESP32-Mesh-OTA
 
+## Work in progress  
+<img src="https://patenschaft.bienenweide.org/img/loading.gif" alt="code_example_output" width="50"/>
+
+## Todo for first release
+
+### Refactoring
+- architecture
+- full error handling through all functions
+- export as a component library
+
+### Features
+- root node: Download new Firmware from HTTPS server instead using newest ota partition
+- add example main app
+
+
+
+

components/mesh_ota/CMakeLists.txt

@@ -1,4 +1,4 @@
-idf_component_register(SRCS "Mesh_network_handler.c" "Mesh_network.c" "Mesh_OTA.c"
+idf_component_register(SRCS "HTTPS_client.c" "Mesh_network_handler.c" "Mesh_network.c" "Mesh_OTA.c"
                     INCLUDE_DIRS "include" 
                     REQUIRES nvs_flash
                     esp_http_client

components/mesh_ota/HTTPS_client.c

@@ -0,0 +1,280 @@
+#include "HTTPS_client.h"
+
+static const char *TAG = "https_client";
+
+static const char *REQUEST = "GET " CONFIG_OTA_HTTPS_URL " HTTP/1.1\r\n"
+                             "Host: "CONFIG_OTA_HTTPS_SERVER_COMMON_NAME"\r\n"
+                             "User-Agent: esp-idf/1.0 esp32\r\n"
+                             "Authorization: Basic " CONFIG_OTA_HTTPS_AUTH "\r\n"
+                             "\r\n";
+
+
+static HTTPS_Client_t sHTTPS_ClientConfig;
+
+https_client_ret_t https_clientInitEmbedTLS();
+https_client_ret_t errHTTPSClientConnectToServer();
+https_client_ret_t errHTTPSClientValidateServer();
+https_client_ret_t errHTTPSClientSendRequest();
+
+https_client_ret_t errHTTPSClientInitialize()
+{
+    https_client_ret_t i32RetHTTPClient = HTTPS_CLIENT_OK;
+
+    i32RetHTTPClient = https_clientInitEmbedTLS();
+
+    if (i32RetHTTPClient == HTTPS_CLIENT_ERROR_INIT_EMBEDTLS)
+        {
+            ESP_LOGE(TAG, "Unable to initialize EmbedTLS");
+            i32RetHTTPClient = HTTPS_CLIENT_ERROR;
+        }
+    return i32RetHTTPClient;
+}
+
+https_client_ret_t errHTTPSClientRetrieveData(char* pu8Data, uint32_t* pu32DataLenght, uint32_t* pu32BytesRead)
+{
+    https_client_ret_t i32RetHTTPClient = HTTPS_CLIENT_OK;
+    int32_t i32RetRetrieveData = ESP_OK;
+    bool bRetriveData = true;
+
+    bzero(pu8Data, *pu32DataLenght);
+    *pu32BytesRead = 0U;
+
+    while (bRetriveData)
+        {
+            mbedtls_ssl_conf_read_timeout(&sHTTPS_ClientConfig.conf, HTTPS_READ_TIMEOUT); //set timeout
+            //Reading HTTP response
+            i32RetRetrieveData = mbedtls_ssl_read(&sHTTPS_ClientConfig.ssl, (unsigned char *)(pu8Data+(*pu32BytesRead)), ((*pu32DataLenght)-(*pu32BytesRead)));
+
+            if(i32RetRetrieveData > 0)
+                {
+                    //Data received
+                    *pu32BytesRead = *pu32BytesRead + i32RetRetrieveData;
+
+                    if(*pu32DataLenght > 0)
+                        {
+                            //buffer not full yet --> read some more
+                            bRetriveData = true;
+                        }
+                    else
+                        {
+                            //buffer full --> stop reading
+                            bRetriveData = false;
+                        }
+                }
+
+            if(i32RetRetrieveData == 0)
+                {
+                    //all data read --> stop reading
+                    bRetriveData = false;
+                    pu32BytesRead = 0;
+                }
+
+            if(i32RetRetrieveData == MBEDTLS_ERR_SSL_TIMEOUT )
+                {
+                    //timeout --> stop reading
+                    bRetriveData = false;
+                }
+
+            if(i32RetRetrieveData == MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY)
+                {
+                    //connection is going to be closed
+                    i32RetHTTPClient = HTTPS_CLIENT_ERROR;
+                    bRetriveData = false;
+                }
+        }
+    return i32RetHTTPClient;
+}
+
+https_client_ret_t errHTTPSClientReset()
+{
+    https_client_ret_t i32RetHTTPClient = HTTPS_CLIENT_OK;
+
+    i32RetHTTPClient = mbedtls_ssl_close_notify(&sHTTPS_ClientConfig.ssl); //close session
+
+    if(i32RetHTTPClient != ESP_OK)
+        {
+            ESP_LOGE(TAG, "mbedtls_ssl_close_notify returned 0x%x", i32RetHTTPClient);
+        }
+
+    mbedtls_ssl_session_reset(&sHTTPS_ClientConfig.ssl); //reset embedssl
+    mbedtls_net_free(&sHTTPS_ClientConfig.server_fd); //free ram
+
+    return i32RetHTTPClient;
+}
+
+https_client_ret_t https_clientInitEmbedTLS()
+{
+
+    https_client_ret_t i32RetHTTPClient = HTTPS_CLIENT_OK;
+    int32_t i32RetEmbedTLS = ESP_OK;
+    static bool bAlreadySetup = false;
+
+    mbedtls_ssl_init(&sHTTPS_ClientConfig.ssl);
+    mbedtls_x509_crt_init(&sHTTPS_ClientConfig.cacert);
+    mbedtls_ctr_drbg_init(&sHTTPS_ClientConfig.ctr_drbg);
+    mbedtls_ssl_config_init(&sHTTPS_ClientConfig.conf);
+    mbedtls_entropy_init(&sHTTPS_ClientConfig.entropy);
+
+    i32RetEmbedTLS = mbedtls_ctr_drbg_seed(&sHTTPS_ClientConfig.ctr_drbg, mbedtls_entropy_func, &sHTTPS_ClientConfig.entropy, NULL, 0);
+
+    if(i32RetEmbedTLS!= ESP_OK)
+        {
+            ESP_LOGE(TAG, "mbedtls_ctr_drbg_seed returned %d", i32RetEmbedTLS);
+        }
+
+    if(i32RetEmbedTLS == ESP_OK)
+        {
+            //Attaching the certificate bundle
+            i32RetEmbedTLS = esp_crt_bundle_attach(&sHTTPS_ClientConfig.conf);
+            if(i32RetEmbedTLS != ESP_OK)
+                {
+                    ESP_LOGE(TAG, "esp_crt_bundle_attach returned 0x%x\n\n", i32RetEmbedTLS);
+                }
+        }
+
+    if(i32RetEmbedTLS == ESP_OK)
+        {
+            //Setting hostname for TLS session.
+            i32RetEmbedTLS = mbedtls_ssl_set_hostname(&sHTTPS_ClientConfig.ssl, CONFIG_OTA_HTTPS_SERVER_COMMON_NAME);
+            // Hostname set here should match CN in server certificate
+            if(i32RetEmbedTLS != ESP_OK)
+                {
+                    ESP_LOGE(TAG, "mbedtls_ssl_set_hostname returned 0x%x", i32RetEmbedTLS);
+                }
+        }
+    if(i32RetEmbedTLS == ESP_OK)
+        {
+            //Setting up the SSL/TLS structure
+            i32RetEmbedTLS = mbedtls_ssl_config_defaults(&sHTTPS_ClientConfig.conf,
+                             MBEDTLS_SSL_IS_CLIENT,
+                             MBEDTLS_SSL_TRANSPORT_STREAM,
+                             MBEDTLS_SSL_PRESET_DEFAULT);
+
+            if(i32RetEmbedTLS != ESP_OK)
+                {
+                    ESP_LOGE(TAG, "mbedtls_ssl_config_defaults returned %d", i32RetEmbedTLS);
+                }
+        }
+
+    if(i32RetEmbedTLS == ESP_OK)
+        {
+            mbedtls_ssl_conf_authmode(&sHTTPS_ClientConfig.conf, MBEDTLS_SSL_VERIFY_REQUIRED);
+            mbedtls_ssl_conf_ca_chain(&sHTTPS_ClientConfig.conf, &sHTTPS_ClientConfig.cacert, NULL);
+            mbedtls_ssl_conf_rng(&sHTTPS_ClientConfig.conf, mbedtls_ctr_drbg_random, &sHTTPS_ClientConfig.ctr_drbg);
+
+            if (bAlreadySetup == false) //check if mbedtls_ssl_setup was called before
+                {
+                    i32RetEmbedTLS = mbedtls_ssl_setup(&sHTTPS_ClientConfig.ssl, &sHTTPS_ClientConfig.conf); //call this only once
+                    if(i32RetEmbedTLS != ESP_OK)
+                        {
+                            ESP_LOGE(TAG, "mbedtls_ssl_setup returned 0x%x\n\n", i32RetEmbedTLS);
+
+                            // uint8_t buffer[20];
+                            //mbedtls_strerror(i32RetEmbedTLS, buffer, 20);
+                            //ESP_LOGE(TAG, "%s", buffer);
+                        }
+                    else
+                        {
+                            bAlreadySetup = true;
+                        }
+
+                }
+
+
+        }
+
+    if(i32RetEmbedTLS == ESP_OK)
+        {
+            mbedtls_net_init(&sHTTPS_ClientConfig.server_fd);
+        }
+
+    if (i32RetEmbedTLS != ESP_OK)
+        {
+            i32RetHTTPClient = HTTPS_CLIENT_ERROR_INIT_EMBEDTLS;
+        }
+
+    return i32RetHTTPClient;
+}
+
+https_client_ret_t errHTTPSClientConnectToServer()
+{
+    https_client_ret_t i32RetHTTPClient = HTTPS_CLIENT_OK;
+    int32_t i32RetServerConnect = ESP_OK;
+
+    //Connecting to server
+    i32RetServerConnect = mbedtls_net_connect(&sHTTPS_ClientConfig.server_fd, CONFIG_OTA_HTTPS_SERVER_COMMON_NAME, CONFIG_OTA_HTTPS_SERVER_PORT, MBEDTLS_NET_PROTO_TCP);
+    if (i32RetServerConnect != ESP_OK)
+        {
+            ESP_LOGE(TAG, "mbedtls_net_connect returned %x", i32RetServerConnect);
+        }
+
+    if(i32RetServerConnect == ESP_OK)
+        {
+            mbedtls_ssl_set_bio(&sHTTPS_ClientConfig.ssl, &sHTTPS_ClientConfig.server_fd, mbedtls_net_send, mbedtls_net_recv, mbedtls_net_recv_timeout);
+
+            //Performing the SSL/TLS handshake
+            while ((i32RetServerConnect = mbedtls_ssl_handshake(&sHTTPS_ClientConfig.ssl)) != 0)
+                {
+                    if ((i32RetServerConnect != MBEDTLS_ERR_SSL_WANT_READ) && (i32RetServerConnect != MBEDTLS_ERR_SSL_WANT_WRITE))
+                        {
+                            ESP_LOGE(TAG, "mbedtls_ssl_handshake returned 0x%x", i32RetServerConnect);
+                        }
+                }
+        }
+
+    if(i32RetServerConnect != ESP_OK)
+        {
+            i32RetHTTPClient = HTTPS_CLIENT_ERROR_INIT_CONNECT_TWO_SERVER;
+        }
+    return i32RetHTTPClient;
+}
+
+https_client_ret_t errHTTPSClientValidateServer()
+{
+    https_client_ret_t i32RetHTTPClient = HTTPS_CLIENT_OK;
+    int32_t i32RetValidateServer = ESP_OK;
+
+    //Verifying peer X.509 certificate
+    if ((i32RetValidateServer = mbedtls_ssl_get_verify_result(&sHTTPS_ClientConfig.ssl)) != 0)
+        {
+            ESP_LOGE(TAG, "Failed to verify peer certificate!");
+        }
+
+    if(i32RetValidateServer != ESP_OK)
+        {
+            i32RetHTTPClient = HTTPS_CLIENT_ERROR_INIT_VALIDATE_SERVER;
+        }
+    return i32RetHTTPClient;
+}
+
+https_client_ret_t errHTTPSClientSendRequest()
+{
+    https_client_ret_t i32RetHTTPClient = HTTPS_CLIENT_OK;
+    int32_t i32RetSendRequest = ESP_OK;
+    uint32_t u32WrittenBytes = 0;
+    bool bWrite = true; //flag to stop loop
+
+    //Writing HTTP request
+    while((u32WrittenBytes < strlen(REQUEST)) && bWrite)
+        {
+            i32RetSendRequest = mbedtls_ssl_write(&sHTTPS_ClientConfig.ssl,
+                                                  (const unsigned char *)REQUEST + u32WrittenBytes,
+                                                  strlen(REQUEST) - u32WrittenBytes);
+            if (i32RetSendRequest >= 0)
+                {
+                    //bytes written
+                    u32WrittenBytes += i32RetSendRequest;
+                }
+            else if (i32RetSendRequest != MBEDTLS_ERR_SSL_WANT_WRITE && i32RetSendRequest != MBEDTLS_ERR_SSL_WANT_READ)
+                {
+                    ESP_LOGE(TAG, "mbedtls_ssl_write returned 0x%x", i32RetSendRequest);
+                    bWrite = false;
+                }
+        }
+
+    if(bWrite == false)
+        {
+            i32RetHTTPClient = HTTPS_CLIENT_ERROR_INIT_SEND_REQUEST;
+        }
+    return i32RetHTTPClient;
+}

components/mesh_ota/Mesh_network.c

@@ -4,11 +4,21 @@
 static const char *LOG_TAG = "mesh_network";
 static uint8_t tx_buf[CONFIG_MESH_MESSAGE_SIZE] = { 0, };
 static uint8_t rx_buf[CONFIG_MESH_MESSAGE_SIZE] = { 0, };
-static uint8_t u8NodeMAC[6];
+uint8_t u8ownMAC[6];
 esp_netif_t* netif_sta;
 bool bIsMeshConnected;
 int32_t i32MeshLayer;
-mesh_addr_t mesh_parent_addr;
+mesh_addr_t meshParentAddr;
+void (*pAppRxHandle)(uint8_t*, uint8_t* );
+void (*pOTAChildConnectHandle)(uint8_t* );
+void (*pOTAMessageHandle)(MESH_PACKET_t* );
+void (*pChangeStateOfServerWorkerHandle)(bool );
+
+void (*pOtaDataHandle)(MESH_PACKET_t* );
+void (*pOtaAckHandle)(MESH_PACKET_t* );
+void (*pOtaCompleteHandle)(MESH_PACKET_t* );
+void (*pOtaAbortHandle)(MESH_PACKET_t* );
+
 
 esp_err_t errMeshNetworkInitialize()
 {
@@ -22,9 +32,9 @@ esp_err_t errMeshNetworkInitialize()
 
 #ifdef ERASE_NVS
     if(err == ESP_ERR_NVS_NO_FREE_PAGES) //check if storage is full
-    {
+        {
-        ERROR_CHECK(nvs_flash_erase());
+            ERROR_CHECK(nvs_flash_erase());
-    }
+        }
 #endif
 
     // tcpip initialization
@@ -74,7 +84,7 @@ esp_err_t errMeshNetworkInitialize()
     /* mesh start */
     ERROR_CHECK(esp_mesh_start());
 
-    ERROR_CHECK(esp_base_mac_addr_get(u8NodeMAC))
+    ERROR_CHECK(esp_base_mac_addr_get(u8ownMAC))
 
     //debug info
     ESP_LOGD(LOG_TAG, "mesh starts successfully, heap:%d, %s<%d>%s, ps:%d\n",  esp_get_minimum_free_heap_size(),
@@ -82,7 +92,7 @@ esp_err_t errMeshNetworkInitialize()
              esp_mesh_get_topology(), esp_mesh_get_topology() ? "(chain)":"(tree)", esp_mesh_is_ps_enabled());
 
 
-    ESP_LOGI(LOG_TAG, "Node MAC: \"%x:%x:%x:%x:%x:%x\" ", u8NodeMAC[0], u8NodeMAC[1], u8NodeMAC[2], u8NodeMAC[3], u8NodeMAC[4], u8NodeMAC[5]);
+    ESP_LOGI(LOG_TAG, "Node MAC: \"%x:%x:%x:%x:%x:%x\" ", u8ownMAC[0], u8ownMAC[1], u8ownMAC[2], u8ownMAC[3], u8ownMAC[4], u8ownMAC[5]);
 
     return ESP_OK;
 }
@@ -97,7 +107,6 @@ esp_err_t errMeshNetworkInitializeWiFi()
     ERROR_CHECK(esp_wifi_set_storage(WIFI_STORAGE_FLASH));
     ERROR_CHECK(esp_wifi_start());
     return err;
-
 }
 
 esp_err_t errMeshNetworkInitializeRouter(mesh_cfg_t* cfg)
@@ -119,13 +128,13 @@ bool bCheckMACEquality(uint8_t* pu8aMAC,  uint8_t* pu8bMAC)
     uint8_t index = 0;
 
     while ((index < 6) && (bRet == true))
-    {
-        if(pu8aMAC[index] != pu8bMAC[index])
         {
-            bRet = false;
+            if(pu8aMAC[index] != pu8bMAC[index])
+                {
+                    bRet = false;
+                }
+            index++;
         }
-        index++;
-    }
     return bRet;
 }
 
@@ -138,21 +147,131 @@ esp_err_t errGetChildren(mesh_addr_t* pChildren, uint16_t* pu16ChildrenSize)
     ERROR_CHECK(esp_mesh_get_routing_table((mesh_addr_t *) &route_table, (CONFIG_MESH_ROUTE_TABLE_SIZE * 6), &route_table_size));
 
     if (err == ESP_OK)
-    {
-        for(uint16_t index = 0; index < esp_mesh_get_routing_table_size(); index++)
         {
-            if(! (bCheckMACEquality(u8NodeMAC, route_table[index].addr))  )
+            for(uint16_t index = 0; index < esp_mesh_get_routing_table_size(); index++)
-            {
+                {
-                //child node
+                    if(! (bCheckMACEquality(u8ownMAC, route_table[index].addr))  )
-                //ESP_LOGI(MESH_TAG, "adding Node: \"0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x\" ", route_table[index].addr[0], route_table[index].addr[1], route_table[index].addr[2], route_table[index].addr[3], route_table[index].addr[4], route_table[index].addr[5]);
+                        {
-                pChildren[*pu16ChildrenSize] = route_table[index];
+                            //child node
-                *pu16ChildrenSize = (*pu16ChildrenSize)+1;
+                            //ESP_LOGI(LOG_TAG, "adding Node: \"0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x\" ", route_table[index].addr[0], route_table[index].addr[1], route_table[index].addr[2], route_table[index].addr[3], route_table[index].addr[4], route_table[index].addr[5]);
-            }
+                            pChildren[*pu16ChildrenSize] = route_table[index];
+                            *pu16ChildrenSize = (*pu16ChildrenSize)+1;
+                        }
+                }
         }
-    }
     return err;
 }
 
+esp_err_t errGetParentNode(mesh_addr_t* pMeshParentAddr)
+{
+    esp_err_t err = ESP_OK;
+
+    if((bIsMeshConnected == false) || (esp_mesh_is_root()))
+        {
+            //this node is not connected or is the root --> this node has no parent
+            err = ESP_FAIL;
+        }
+    else
+        {
+            //node has parent
+            memcpy(pMeshParentAddr, &meshParentAddr, sizeof(mesh_addr_t));
+        }
+    return err;
+}
+
+void vGetOwnAddr(mesh_addr_t* pMeshOwnAddr)
+{
+    memcpy(pMeshOwnAddr->addr, u8ownMAC, 6);
+}
+
+bool bIsRootNode()
+{
+    return esp_mesh_is_root();
+}
+
+bool bIsNodeNeighbour(mesh_addr_t* pNode)
+{
+    esp_err_t err = ESP_OK;
+    bool bReturn = false;
+    mesh_addr_t addrParent;  //addr of parent node
+    mesh_addr_t childrenAddr[CONFIG_MESH_ROUTE_TABLE_SIZE]; //array of children attached to this node
+    uint16_t u16ChildrenSize = 0U; //number of children attached to this node
+
+    err = errGetParentNode(&addrParent);
+
+    if(err == ESP_OK)
+        {
+            if(bCheckMACEquality(pNode->addr,  addrParent.addr) == true)
+                {
+                    bReturn = true; //node was found
+                }
+        }
+
+    if(bReturn == false)
+        {
+            err = ESP_OK; //reset error code
+
+            ERROR_CHECK(errGetChildren(childrenAddr, &u16ChildrenSize)); //get all children
+
+            for (uint16_t u16Index = 0; ((u16Index < u16ChildrenSize) && (err == ESP_OK) && (bReturn == false)); u16Index++)
+                {
+                    if(bCheckMACEquality(pNode->addr,  childrenAddr[u16Index].addr) == true)
+                        {
+                            bReturn = true; //node was found
+                        }
+                }
+        }
+    return bReturn;
+}
+
+esp_err_t errMeshNetworkSetAppReceiveHandle(void (*pAppRxHandleTmp)(uint8_t * pu8Data, uint8_t* pu8Sender))
+{
+    pAppRxHandle = pAppRxHandleTmp; //set handle from app as receive handle if an app packet is received
+    return ESP_OK;
+}
+
+esp_err_t errMeshNetworkSetChildConnectedHandle(void (*pChildConnectHandleTmp)(uint8_t * pu8Data))
+{
+    pOTAChildConnectHandle = pChildConnectHandleTmp;
+    return ESP_OK;
+}
+
+esp_err_t errMeshNetworkSetOTAMessageHandle(void (*pOTAMessageHandleTmp)(MESH_PACKET_t* puMeshPacket))
+{
+    pOTAMessageHandle = pOTAMessageHandleTmp;
+    return ESP_OK;
+}
+
+esp_err_t errMeshNetworkSetOtaDataHandle(void (*pOtaDataHandleTmp)(MESH_PACKET_t* puMeshPacket))
+{
+    pOtaDataHandle = pOtaDataHandleTmp;
+    return ESP_OK;
+}
+
+esp_err_t errMeshNetworkSetOtaAckHandle(void (*pOtaAckHandleTmp)(MESH_PACKET_t* puMeshPacket))
+{
+    pOtaAckHandle = pOtaAckHandleTmp;
+    return ESP_OK;
+}
+
+esp_err_t errMeshNetworkSetOtaCompleteHandle(void (*pOtaCompleteHandleTmp)(MESH_PACKET_t* puMeshPacket))
+{
+    pOtaCompleteHandle = pOtaCompleteHandleTmp;
+    return ESP_OK;
+}
+
+esp_err_t errMeshNetworkSetOtaAbortHandle(void (*pOtaAbortHandleTmp)(MESH_PACKET_t* puMeshPacket))
+{
+    pOtaAbortHandle = pOtaAbortHandleTmp;
+    return ESP_OK;
+}
+
+esp_err_t errMeshNetworkSetChangeStateOfServerWorkerHandle(void (*pChangeStateOfServerWorkerHandleTmp)(bool bState))
+{
+    pChangeStateOfServerWorkerHandle = pChangeStateOfServerWorkerHandleTmp;
+    return ESP_OK;
+}
+
 esp_err_t errSendMeshPacket(mesh_addr_t* pAddrDest, MESH_PACKET_t* pPacket)
 {
     esp_err_t err;
@@ -162,11 +281,12 @@ esp_err_t errSendMeshPacket(mesh_addr_t* pAddrDest, MESH_PACKET_t* pPacket)
     data.proto = MESH_PROTO_BIN;
     data.tos = MESH_TOS_P2P;
     memcpy(tx_buf, (uint8_t *)pPacket, sizeof(MESH_PACKET_t));
+
     err = esp_mesh_send(pAddrDest, &data, MESH_DATA_P2P, NULL, 0);
+
     return err;
 }
 
-
 esp_err_t errStartReceiveTask()
 {
     esp_err_t err = ESP_OK;
@@ -175,9 +295,9 @@ esp_err_t errStartReceiveTask()
     xReturned = xTaskCreate(vTaskReceiveMeshData, "ReceiveMeshData", 7000, NULL, 5, NULL);
 
     if(xReturned != pdPASS)
-    {
+        {
-        err = ESP_FAIL;
+            err = ESP_FAIL;
-    }
+        }
     return err;
 }
 
@@ -191,57 +311,66 @@ void vTaskReceiveMeshData(void *arg)
     data.size = CONFIG_MESH_MESSAGE_SIZE;
 
     while (true)
-    {
-        data.size = CONFIG_MESH_MESSAGE_SIZE;
-        err = esp_mesh_recv(&from, &data, portMAX_DELAY, &flag, NULL, 0);
-        if (err != ESP_OK || !data.size)
         {
-            ESP_LOGE(LOG_TAG, "err:0x%x, size:%d", err, data.size);
+            data.size = CONFIG_MESH_MESSAGE_SIZE;
-            continue;
+            err = esp_mesh_recv(&from, &data, portMAX_DELAY, &flag, NULL, 0);
-        }
+            if (err != ESP_OK || !data.size)
+                {
+                    ESP_LOGE(LOG_TAG, "err:0x%x, size:%d", err, data.size);
+                    continue;
+                }
+            MESH_PACKET_t packet;
+            memcpy(&packet, (uint8_t *)rx_buf, sizeof(MESH_PACKET_t)); //parse MESH_PACKET_t
+            memcpy(&packet.meshSenderAddr, &from, sizeof(mesh_addr_t)); //copy sender into packet
 
-        
+            switch (packet.type)
-/*
+                {
-        struct ota_mesh_packet packet;
+                case APP_Data:
-        memcpy(&packet, (uint8_t *)rx_buf, sizeof(struct ota_mesh_packet));
+                    ESP_LOGD(LOG_TAG, "recv: APP_Data");
-
+                    //call the rx handle from app
-        switch (packet.type)
+                    pAppRxHandle(packet.au8Payload, from.addr);  //hand over payload and sender of this mesh packet
-        {
+                    break;
-        case APP_Version_Request:
+                case OTA_Version_Request:
-            ESP_LOGI(LOG_TAG, "recv: APP_Version_Request");
+                case OTA_Version_Response:
-            packet.type=APP_Version_Response;
+                case OTA_Complete:
-            packet.au8Payload[0] = 42; //TODO get current running version
+                case OTA_Abort:
-            // ESP_ERROR_CHECK (esp_mesh_send_packet(&from, &packet)); //send back to parent
+                    //call the rx handle from OTA
-            break;
+                    if(pOTAMessageHandle)
-        case APP_Version_Response:
+                        {
-            ESP_LOGI(LOG_TAG, "recv: APP_Version_Response - App Version %i: ", packet.au8Payload[0]);
+                            pOTAMessageHandle(&packet);
-            //check if node is out-dated
+                        }
-            // esp_mesh_ota_send(&from);
+                    break;
-            break;
+                case OTA_Data:
-        case OTA_Data:
+                    if(pOtaDataHandle)
-            ESP_LOGI(LOG_TAG, "recv: OTA_Data");
+                        {
-            //esp_mesh_ota_receive(&from, &packet);
+                            pOtaDataHandle(&packet);
-            packet.type=OTA_ACK;
+                        }
-            //ESP_ERROR_CHECK (esp_mesh_send_packet(&from, &packet)); //send back to parent
+                    break;
-            break;
+                case OTA_ACK:
-        case OTA_ACK:
+                    if(pOtaAckHandle)
-            ESP_LOGI(LOG_TAG, "recv: OTA_ACK");
+                        {
-            //esp_mesh_ota_send(&from);
+                            pOtaAckHandle(&packet);
-            break;
+                        }
-        case OTA_Complete:
+                    break;
-            ESP_LOGI(LOG_TAG, "recv: OTA_Complete");
+                /* case OTA_Complete:
-            break;
+                     if(pOtaCompleteHandle)
-        default:
+                         {
-            ESP_LOGE(LOG_TAG, "recv: something");
+                             pOtaCompleteHandle(&packet);
-            break;
+                         }
-        }//end switch
+                     break;
-
+                 case OTA_Abort:
-        */
+                     if(pOtaAbortHandle)
-
+                         {
-    } //end while
+                             pOtaAbortHandle(&packet);
+                         }
+                     break;
+                     */
+                default:
+                    ESP_LOGE(LOG_TAG, "recv: something");
+                    break;
+                }//end switch
+        } //end while
 }
 
 
 
-
-

components/mesh_ota/Mesh_network_handler.c

@@ -7,6 +7,10 @@ void vIPEventHandler(void *arg, esp_event_base_t event_base, int32_t i32EventID,
 {
     ip_event_got_ip_t *event = (ip_event_got_ip_t *) vpEventData;
     ESP_LOGI(LOG_TAG, "<IP_EVENT_STA_GOT_IP>IP:" IPSTR, IP2STR(&event->ip_info.ip));
+    if(pChangeStateOfServerWorkerHandle)
+        {
+            pChangeStateOfServerWorkerHandle(true);   //signal that this node (root node) has access to internet
+        }
 }
 
 void vMeshEventHandler(void *arg, esp_event_base_t event_base, int32_t i32EventID, void* vpEventData)
@@ -20,200 +24,205 @@ void vMeshEventHandler(void *arg, esp_event_base_t event_base, int32_t i32EventI
         {
             esp_mesh_get_id(&id);
             ESP_LOGI(LOG_TAG, "<MESH_EVENT_MESH_STARTED>ID:"MACSTR"", MAC2STR(id.addr));
-            bIsMeshConnected = false;
+bIsMeshConnected = false;
-            i32MeshLayer = esp_mesh_get_layer();
+i32MeshLayer = esp_mesh_get_layer();
-        }
+}
-        break;
+break;
         case MESH_EVENT_STOPPED: 
-        {
+{
-            ESP_LOGI(LOG_TAG, "<MESH_EVENT_STOPPED>");
+ESP_LOGI(LOG_TAG, "<MESH_EVENT_STOPPED>");
-            bIsMeshConnected = false;
+bIsMeshConnected = false;
-            i32MeshLayer = esp_mesh_get_layer();
+i32MeshLayer = esp_mesh_get_layer();
-        }
+}
-        break;
+break;
         case MESH_EVENT_CHILD_CONNECTED: 
-        {
+{
-            mesh_event_child_connected_t *child_connected = (mesh_event_child_connected_t *)vpEventData;
+mesh_event_child_connected_t *child_connected = (mesh_event_child_connected_t *)vpEventData;
-            ESP_LOGI(LOG_TAG, "<MESH_EVENT_CHILD_CONNECTED>aid:%d, "MACSTR"",
+ESP_LOGI(LOG_TAG, "<MESH_EVENT_CHILD_CONNECTED>aid:%d, "MACSTR"", child_connected->aid, MAC2STR(child_connected->mac));
-            child_connected->aid,
+
-            MAC2STR(child_connected->mac));
+if(pOTAChildConnectHandle){pOTAChildConnectHandle(child_connected->mac);}//add this child to queue using handle
-        }
+
-        break;
+}
+break;
         case MESH_EVENT_CHILD_DISCONNECTED: 
-        {
+{
-            mesh_event_child_disconnected_t *child_disconnected = (mesh_event_child_disconnected_t *)vpEventData;
+mesh_event_child_disconnected_t *child_disconnected = (mesh_event_child_disconnected_t *)vpEventData;
-            ESP_LOGI(LOG_TAG, "<MESH_EVENT_CHILD_DISCONNECTED>aid:%d, "MACSTR"",
+ESP_LOGI(LOG_TAG, "<MESH_EVENT_CHILD_DISCONNECTED>aid:%d, "MACSTR"",
-            child_disconnected->aid,
+child_disconnected->aid,
-            MAC2STR(child_disconnected->mac));
+MAC2STR(child_disconnected->mac));
-        }
+}
-        break;
+break;
         case MESH_EVENT_ROUTING_TABLE_ADD: 
-        {
+{
-            mesh_event_routing_table_change_t *routing_table = (mesh_event_routing_table_change_t *)vpEventData;
+mesh_event_routing_table_change_t *routing_table = (mesh_event_routing_table_change_t *)vpEventData;
-            ESP_LOGW(LOG_TAG, "<MESH_EVENT_ROUTING_TABLE_ADD>add %d, new:%d, layer:%d",
+ESP_LOGW(LOG_TAG, "<MESH_EVENT_ROUTING_TABLE_ADD>add %d, new:%d, layer:%d",
-            routing_table->rt_size_change,
+routing_table->rt_size_change,
-            routing_table->rt_size_new, i32MeshLayer);
+routing_table->rt_size_new, i32MeshLayer);
-        }
+}
-        break;
+break;
         case MESH_EVENT_ROUTING_TABLE_REMOVE: 
-        {   
+{   
-            mesh_event_routing_table_change_t *routing_table = (mesh_event_routing_table_change_t *)vpEventData;
+mesh_event_routing_table_change_t *routing_table = (mesh_event_routing_table_change_t *)vpEventData;
-            ESP_LOGW(LOG_TAG, "<MESH_EVENT_ROUTING_TABLE_REMOVE>remove %d, new:%d, layer:%d",
+ESP_LOGW(LOG_TAG, "<MESH_EVENT_ROUTING_TABLE_REMOVE>remove %d, new:%d, layer:%d",
-            routing_table->rt_size_change,
+routing_table->rt_size_change,
-            routing_table->rt_size_new, i32MeshLayer);
+routing_table->rt_size_new, i32MeshLayer);
-        }
+}
-        break;
+break;
         case MESH_EVENT_NO_PARENT_FOUND: 
-        {
+{
-            mesh_event_no_parent_found_t *no_parent = (mesh_event_no_parent_found_t *)vpEventData;
+mesh_event_no_parent_found_t *no_parent = (mesh_event_no_parent_found_t *)vpEventData;
-            ESP_LOGI(LOG_TAG, "<MESH_EVENT_NO_PARENT_FOUND>scan times:%d",
+ESP_LOGI(LOG_TAG, "<MESH_EVENT_NO_PARENT_FOUND>scan times:%d",
-            no_parent->scan_times);
+no_parent->scan_times);
-            /* TODO handler for the failure, maybe nominate themselves */
+/* TODO handler for the failure, maybe nominate themselves */
-        }
+}
-        break;
+break;
         case MESH_EVENT_PARENT_CONNECTED: 
-        {
+{
-            mesh_event_connected_t *connected = (mesh_event_connected_t *)vpEventData;
+mesh_event_connected_t *connected = (mesh_event_connected_t *)vpEventData;
-            esp_mesh_get_id(&id);
+esp_mesh_get_id(&id);
-            i32MeshLayer = connected->self_layer;
+i32MeshLayer = connected->self_layer;
-            memcpy(&mesh_parent_addr.addr, connected->connected.bssid, 6); 
+memcpy(&meshParentAddr.addr, connected->connected.bssid, 6); 
-            ESP_LOGI(LOG_TAG, "<MESH_EVENT_PARENT_CONNECTED>layer:%d-->%d, parent:"MACSTR"%s, ID:"MACSTR", duty:%d",
+ESP_LOGI(LOG_TAG, "<MESH_EVENT_PARENT_CONNECTED>layer:%d-->%d, parent:"MACSTR"%s, ID:"MACSTR", duty:%d",
-            last_layer, i32MeshLayer, MAC2STR(mesh_parent_addr.addr),
+last_layer, i32MeshLayer, MAC2STR(meshParentAddr.addr),
-            esp_mesh_is_root() ? "<ROOT>" : (i32MeshLayer == 2) ? "<layer2>" : "", //print own node title
+esp_mesh_is_root() ? "<ROOT>" : (i32MeshLayer == 2) ? "<layer2>" : "", //print own node title
-            MAC2STR(id.addr), connected->duty);
+MAC2STR(id.addr), connected->duty);
-            last_layer = i32MeshLayer;
+last_layer = i32MeshLayer;
-            bIsMeshConnected = true;
+bIsMeshConnected = true;
-            if (esp_mesh_is_root()) 
+if (esp_mesh_is_root()) 
-            {
+{
-                ESP_ERROR_CHECK(esp_netif_dhcpc_start(netif_sta)); //get a IP from router
+if(esp_netif_dhcpc_start(netif_sta) == ESP_ERR_ESP_NETIF_DHCP_ALREADY_STARTED) //get a IP from router
-            }
+{
-            errStartReceiveTask();//start receiving
+if(pChangeStateOfServerWorkerHandle){pChangeStateOfServerWorkerHandle(true);}// signal reconnect
-        }
+} 
-        break;
+}
+errStartReceiveTask();//start receiving
+}
+break;
         case MESH_EVENT_PARENT_DISCONNECTED: 
-        {
+{
-            mesh_event_disconnected_t *disconnected = (mesh_event_disconnected_t *)vpEventData;
+mesh_event_disconnected_t *disconnected = (mesh_event_disconnected_t *)vpEventData;
-            ESP_LOGI(LOG_TAG, "<MESH_EVENT_PARENT_DISCONNECTED>reason:%d", disconnected->reason);
+ESP_LOGI(LOG_TAG, "<MESH_EVENT_PARENT_DISCONNECTED>reason:%d", disconnected->reason);
-            bIsMeshConnected = false;
+bIsMeshConnected = false;
-            i32MeshLayer = esp_mesh_get_layer();
+if(pChangeStateOfServerWorkerHandle){pChangeStateOfServerWorkerHandle(false);}
-        }
+i32MeshLayer = esp_mesh_get_layer();
-        break;
+}
+break;
         case MESH_EVENT_LAYER_CHANGE: 
-        {
+{
-            mesh_event_layer_change_t *layer_change = (mesh_event_layer_change_t *)vpEventData;
+mesh_event_layer_change_t *layer_change = (mesh_event_layer_change_t *)vpEventData;
-            i32MeshLayer = layer_change->new_layer;
+i32MeshLayer = layer_change->new_layer;
-            ESP_LOGI(LOG_TAG, "<MESH_EVENT_LAYER_CHANGE>layer:%d-->%d%s",
+ESP_LOGI(LOG_TAG, "<MESH_EVENT_LAYER_CHANGE>layer:%d-->%d%s",
-            last_layer, i32MeshLayer,
+last_layer, i32MeshLayer,
-            esp_mesh_is_root() ? "<ROOT>" : (i32MeshLayer == 2) ? "<layer2>" : "");
+esp_mesh_is_root() ? "<ROOT>" : (i32MeshLayer == 2) ? "<layer2>" : "");
-            last_layer = i32MeshLayer;
+last_layer = i32MeshLayer;
-        }
+}
-        break;
+break;
         case MESH_EVENT_ROOT_ADDRESS: 
-        {
+{
-            mesh_event_root_address_t *root_addr = (mesh_event_root_address_t *)vpEventData;
+mesh_event_root_address_t *root_addr = (mesh_event_root_address_t *)vpEventData;
-            ESP_LOGI(LOG_TAG, "<MESH_EVENT_ROOT_ADDRESS>root address:"MACSTR"",
+ESP_LOGI(LOG_TAG, "<MESH_EVENT_ROOT_ADDRESS>root address:"MACSTR"",
-            MAC2STR(root_addr->addr));
+MAC2STR(root_addr->addr));
-        }
+}
-        break;
+break;
         case MESH_EVENT_VOTE_STARTED: 
-        {
+{
-            mesh_event_vote_started_t *vote_started = (mesh_event_vote_started_t *)vpEventData;
+mesh_event_vote_started_t *vote_started = (mesh_event_vote_started_t *)vpEventData;
-            ESP_LOGI(LOG_TAG, "<MESH_EVENT_VOTE_STARTED>attempts:%d, reason:%d, rc_addr:"MACSTR"",
+ESP_LOGI(LOG_TAG, "<MESH_EVENT_VOTE_STARTED>attempts:%d, reason:%d, rc_addr:"MACSTR"",
-            vote_started->attempts,
+vote_started->attempts,
-            vote_started->reason,
+vote_started->reason,
-            MAC2STR(vote_started->rc_addr.addr));
+MAC2STR(vote_started->rc_addr.addr));
-        }
+}
-        break;
+break;
         case MESH_EVENT_VOTE_STOPPED: 
-        {
+{
-            ESP_LOGI(LOG_TAG, "<MESH_EVENT_VOTE_STOPPED>");
+ESP_LOGI(LOG_TAG, "<MESH_EVENT_VOTE_STOPPED>");
-        }
+}
-        break;
+break;
         case MESH_EVENT_ROOT_SWITCH_REQ: 
-        {
+{
-            mesh_event_root_switch_req_t *switch_req = (mesh_event_root_switch_req_t *)vpEventData;
+mesh_event_root_switch_req_t *switch_req = (mesh_event_root_switch_req_t *)vpEventData;
-            ESP_LOGI(LOG_TAG, "<MESH_EVENT_ROOT_SWITCH_REQ>reason:%d, rc_addr:"MACSTR"", switch_req->reason,
+ESP_LOGI(LOG_TAG, "<MESH_EVENT_ROOT_SWITCH_REQ>reason:%d, rc_addr:"MACSTR"", switch_req->reason,
-            MAC2STR( switch_req->rc_addr.addr));
+MAC2STR( switch_req->rc_addr.addr));
-        }
+}
-        break;
+break;
         case MESH_EVENT_ROOT_SWITCH_ACK: 
-        {
+{
-            //new root
+//new root
-            i32MeshLayer = esp_mesh_get_layer();
+i32MeshLayer = esp_mesh_get_layer();
-            esp_mesh_get_parent_bssid(&mesh_parent_addr);
+esp_mesh_get_parent_bssid(&meshParentAddr);
-            ESP_LOGI(LOG_TAG, "<MESH_EVENT_ROOT_SWITCH_ACK>layer:%d, parent:"MACSTR"", i32MeshLayer, MAC2STR(mesh_parent_addr.addr));
+ESP_LOGI(LOG_TAG, "<MESH_EVENT_ROOT_SWITCH_ACK>layer:%d, parent:"MACSTR"", i32MeshLayer, MAC2STR(meshParentAddr.addr));
-        }
+}
-        break;
+break;
         case MESH_EVENT_TODS_STATE: 
-        {
+{
-            mesh_event_toDS_state_t *toDs_state = (mesh_event_toDS_state_t *)vpEventData;
+mesh_event_toDS_state_t *toDs_state = (mesh_event_toDS_state_t *)vpEventData;
-            ESP_LOGI(LOG_TAG, "<MESH_EVENT_TODS_REACHABLE>state:%d", *toDs_state);
+ESP_LOGI(LOG_TAG, "<MESH_EVENT_TODS_REACHABLE>state:%d", *toDs_state);
-        }
+}
-        break;
+break;
         case MESH_EVENT_ROOT_FIXED: 
-        {
+{
-            mesh_event_root_fixed_t *root_fixed = (mesh_event_root_fixed_t *)vpEventData;
+mesh_event_root_fixed_t *root_fixed = (mesh_event_root_fixed_t *)vpEventData;
-            ESP_LOGI(LOG_TAG, "<MESH_EVENT_ROOT_FIXED>%s",
+ESP_LOGI(LOG_TAG, "<MESH_EVENT_ROOT_FIXED>%s",
-            root_fixed->is_fixed ? "fixed" : "not fixed");
+root_fixed->is_fixed ? "fixed" : "not fixed");
-        }
+}
-        break;
+break;
         case MESH_EVENT_ROOT_ASKED_YIELD: 
-        {
+{
-            mesh_event_root_conflict_t *root_conflict = (mesh_event_root_conflict_t *)vpEventData;
+mesh_event_root_conflict_t *root_conflict = (mesh_event_root_conflict_t *)vpEventData;
-            ESP_LOGI(LOG_TAG, "<MESH_EVENT_ROOT_ASKED_YIELD>"MACSTR", rssi:%d, capacity:%d",
+ESP_LOGI(LOG_TAG, "<MESH_EVENT_ROOT_ASKED_YIELD>"MACSTR", rssi:%d, capacity:%d",
-            MAC2STR(root_conflict->addr), root_conflict->rssi, root_conflict->capacity);
+MAC2STR(root_conflict->addr), root_conflict->rssi, root_conflict->capacity);
-        }
+}
-        break;
+break;
         case MESH_EVENT_CHANNEL_SWITCH: 
-        {
+{
-            mesh_event_channel_switch_t *channel_switch = (mesh_event_channel_switch_t *)vpEventData;
+mesh_event_channel_switch_t *channel_switch = (mesh_event_channel_switch_t *)vpEventData;
-            ESP_LOGI(LOG_TAG, "<MESH_EVENT_CHANNEL_SWITCH>new channel:%d", channel_switch->channel);
+ESP_LOGI(LOG_TAG, "<MESH_EVENT_CHANNEL_SWITCH>new channel:%d", channel_switch->channel);
-        }
+}
-        break;
+break;
         case MESH_EVENT_SCAN_DONE: 
-        {
+{
-        mesh_event_scan_done_t *scan_done = (mesh_event_scan_done_t *)vpEventData;
+mesh_event_scan_done_t *scan_done = (mesh_event_scan_done_t *)vpEventData;
-        ESP_LOGI(LOG_TAG, "<MESH_EVENT_SCAN_DONE>number:%d", scan_done->number);
+ESP_LOGI(LOG_TAG, "<MESH_EVENT_SCAN_DONE>number:%d", scan_done->number);
-        }
+}
-        break;
+break;
         case MESH_EVENT_NETWORK_STATE: 
-        {
+{
-            mesh_event_network_state_t *network_state = (mesh_event_network_state_t *)vpEventData;
+mesh_event_network_state_t *network_state = (mesh_event_network_state_t *)vpEventData;
-            ESP_LOGI(LOG_TAG, "<MESH_EVENT_NETWORK_STATE>is_rootless:%d", network_state->is_rootless);
+ESP_LOGI(LOG_TAG, "<MESH_EVENT_NETWORK_STATE>is_rootless:%d", network_state->is_rootless);
-        }
+}
-        break;
+break;
         case MESH_EVENT_STOP_RECONNECTION: 
-        {
+{
-            ESP_LOGI(LOG_TAG, "<MESH_EVENT_STOP_RECONNECTION>");    
+ESP_LOGI(LOG_TAG, "<MESH_EVENT_STOP_RECONNECTION>");    
-        }
+}
-        break;
+break;
         case MESH_EVENT_FIND_NETWORK: 
-        {
+{
-            mesh_event_find_network_t *find_network = (mesh_event_find_network_t *)vpEventData;
+mesh_event_find_network_t *find_network = (mesh_event_find_network_t *)vpEventData;
-            ESP_LOGI(LOG_TAG, "<MESH_EVENT_FIND_NETWORK>new channel:%d, router BSSID:"MACSTR"",
+ESP_LOGI(LOG_TAG, "<MESH_EVENT_FIND_NETWORK>new channel:%d, router BSSID:"MACSTR"",
-            find_network->channel, MAC2STR(find_network->router_bssid));
+find_network->channel, MAC2STR(find_network->router_bssid));
-        }
+}
-        break;
+break;
         case MESH_EVENT_ROUTER_SWITCH: 
-        {
+{
-            mesh_event_router_switch_t *router_switch = (mesh_event_router_switch_t *)vpEventData;
+mesh_event_router_switch_t *router_switch = (mesh_event_router_switch_t *)vpEventData;
-            ESP_LOGI(LOG_TAG, "<MESH_EVENT_ROUTER_SWITCH>new router:%s, channel:%d, "MACSTR"",
+ESP_LOGI(LOG_TAG, "<MESH_EVENT_ROUTER_SWITCH>new router:%s, channel:%d, "MACSTR"",
-            router_switch->ssid, router_switch->channel, MAC2STR(router_switch->bssid));
+router_switch->ssid, router_switch->channel, MAC2STR(router_switch->bssid));
-        }
+}
-        break;
+break;
         case MESH_EVENT_PS_PARENT_DUTY: 
-        {
+{
-            mesh_event_ps_duty_t *ps_duty = (mesh_event_ps_duty_t *)vpEventData;
+mesh_event_ps_duty_t *ps_duty = (mesh_event_ps_duty_t *)vpEventData;
-            ESP_LOGI(LOG_TAG, "<MESH_EVENT_PS_PARENT_DUTY>duty:%d", ps_duty->duty);
+ESP_LOGI(LOG_TAG, "<MESH_EVENT_PS_PARENT_DUTY>duty:%d", ps_duty->duty);
-        }
+}
-        break;
+break;
         case MESH_EVENT_PS_CHILD_DUTY: 
-        {
+{
-            mesh_event_ps_duty_t *ps_duty = (mesh_event_ps_duty_t *)vpEventData;
+mesh_event_ps_duty_t *ps_duty = (mesh_event_ps_duty_t *)vpEventData;
-            ESP_LOGI(LOG_TAG, "<MESH_EVENT_PS_CHILD_DUTY>cidx:%d, "MACSTR", duty:%d", ps_duty->child_connected.aid-1,
+ESP_LOGI(LOG_TAG, "<MESH_EVENT_PS_CHILD_DUTY>cidx:%d, "MACSTR", duty:%d", ps_duty->child_connected.aid-1,
-            MAC2STR(ps_duty->child_connected.mac), ps_duty->duty);
+MAC2STR(ps_duty->child_connected.mac), ps_duty->duty);
-        }
+}
-        break;
+break;
         default:
             ESP_LOGI(LOG_TAG, "unknown id:%d", i32EventID);
         break;

components/mesh_ota/include/HTTPS_client.h

@@ -0,0 +1,80 @@
+#ifndef H_HTTPS_CLIENT
+#define H_HTTPS_CLIENT
+
+#include <string.h>
+#include <stdlib.h>
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "esp_wifi.h"
+#include "esp_event.h"
+#include "esp_log.h"
+#include "esp_system.h"
+#include "nvs_flash.h"
+#include "esp_netif.h"
+
+#include "lwip/err.h"
+#include "lwip/sockets.h"
+#include "lwip/sys.h"
+#include "lwip/netdb.h"
+#include "lwip/dns.h"
+
+#include "mbedtls/platform.h"
+#include "mbedtls/net_sockets.h"
+#include "mbedtls/esp_debug.h"
+#include "mbedtls/ssl.h"
+#include "mbedtls/entropy.h"
+#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/error.h"
+#include "mbedtls/certs.h"
+#include "esp_crt_bundle.h"
+
+#ifndef CONFIG_OTA_HTTPS_URL
+#define CONFIG_OTA_HTTPS_URL "https://exmaple.com/theImage.bin"
+#endif
+
+#ifndef CONFIG_OTA_HTTPS_SERVER_PORT
+#define CONFIG_OTA_HTTPS_SERVER_PORT "443"
+#endif
+
+#ifndef CONFIG_OTA_HTTPS_AUTH
+#define CONFIG_OTA_HTTPS_AUTH "base64(user:password)"
+#endif
+
+#ifndef CONFIG_OTA_HTTPS_SERVER_COMMON_NAME
+#define CONFIG_OTA_HTTPS_SERVER_COMMON_NAME "exmaple.com"
+#endif
+
+#define HTTPS_CLIENT_OK 0
+#define HTTPS_CLIENT_ERROR -1
+#define HTTPS_CLIENT_ERROR_INIT_EMBEDTLS -2
+#define HTTPS_CLIENT_ERROR_INIT_CONNECT_TWO_SERVER -3
+#define HTTPS_CLIENT_ERROR_INIT_VALIDATE_SERVER -4
+#define HTTPS_CLIENT_ERROR_INIT_SEND_REQUEST -5
+
+#define HTTPS_READ_TIMEOUT 1000 //ms
+
+struct HTTPS_Client
+{
+    mbedtls_entropy_context entropy;
+    mbedtls_ctr_drbg_context ctr_drbg;
+    mbedtls_ssl_context ssl;
+    mbedtls_x509_crt cacert;
+    mbedtls_ssl_config conf;
+    mbedtls_net_context server_fd;
+};
+
+typedef int32_t https_client_ret_t;
+typedef struct HTTPS_Client HTTPS_Client_t;
+
+https_client_ret_t errHTTPSClientInitialize();
+https_client_ret_t errHTTPSClientConnectToServer();
+https_client_ret_t errHTTPSClientValidateServer();
+https_client_ret_t errHTTPSClientSendRequest();
+https_client_ret_t errHTTPSClientRetrieveData(char* pu8Data, uint32_t* pu32DataLenght, uint32_t* pu32BytesRead);
+https_client_ret_t errHTTPSClientReset();
+
+#endif /* H_HTTPS_CLIENT */
+
+
+
+

components/mesh_ota/include/Mesh_OTA.h

@@ -14,32 +14,66 @@
 #include "esp_partition.h"
 
 #include "Mesh_network.h"
+#include "HTTPS_client.h"
 
 #define ERASE_NVS //erase non volatile storage if full
-
+#define QUEUE_NODES_SIZE 10
-/*
+#define QUEUE_MESSAGE_OTA_SIZE 10
-enum ota_packet_type
+#define SERVER_CHECK_INTERVAL 30 //in seconds
-    {
+#define OTA_HTTPS_SEGMENT_SIZE 2048U
-        APP_Version_Request,
+#define OTA_PROGRESS_LOG_INTERVAL 7U
-        APP_Version_Response,
+#define OTA_MESH_SEGMENT_SIZE MESH_NETWORK_PAYLOAD_SIZE
-        OTA_Data,
+#define OTA_MESH_TIMEOUT 100U //in ms
-        OTA_ACK,
-        OTA_Complete
-    };
-*/
 
 #define ERROR_CHECK(x) if (err == ESP_OK)                                                               \
     {                                                                                                   \
         err = (x);                                                                                      \
         if (err != ESP_OK)                                                                              \
             {                                                                                           \
-                ESP_LOGE(LOG_TAG,  "%s failed with error: %d -> %s", #x,  err, esp_err_to_name(err));   \
+                ESP_LOGE(LOG_TAG,  "%s failed with error: 0x%x -> %s", #x,  err, esp_err_to_name(err)); \
             }                                                                                           \
     }                                                                                                   \
-                                                
 
+enum otaMeshRole
+{
+    Transmitter,
+    Receiver
+};
+
+typedef  enum otaMeshRole OTA_MESH_ROLE_t;
+
+esp_err_t errMeshOTAInitialize();
+
+esp_err_t errOTAHTTPS(bool* pbNewOTAImage);
+esp_err_t errOTAMeshSlave(bool* pbNewOTAImage);
+esp_err_t errOTAMeshMaster(bool* pbNewOTAImage, mesh_addr_t* pMeshNodeAddr);
+esp_err_t errOTAMeshTransmit(mesh_addr_t* pMeshNodeAddr);
+esp_err_t errOTAMeshReceive(bool* pbNewOTAImage, mesh_addr_t* pMeshNodeAddr);
+
+
+//helper functions
 bool bNewerVersion(const char* pu8Local, const char* pu8Remote);
 esp_err_t errExtractVersionNumber(const  char* pu8Data, uint32_t* pu32DataLenght, char* pc8RemoteVersionNumber);
 esp_err_t errFindImageStart(const  char* pu8Data, uint32_t* pu32DataLenght, uint32_t* pu32StartOffset);
+void vPrintOTAProgress(const uint32_t* const pu32TotalImageSize, const uint32_t* const pu32BytesWritten, OTA_MESH_ROLE_t eRole);
+void vAddAllNeighboursToQueue(void);
+esp_err_t errSendOTAVersionResponse(mesh_addr_t* meshReceiverAddr);
+esp_err_t errSendOTAVersionRequest(mesh_addr_t* meshReceiverAddr);
+
+//Handler
+void vAddNodeToPossibleUpdatableQueue(uint8_t* pu8MAC);
+void vAddOTAControllMessageToQueue(MESH_PACKET_t* puMeshPacket);
+void vChangeStateOfServerWorker(bool state);
+
+void vRecOtaDataHandler(MESH_PACKET_t* puMeshPacket);
+void vRecOtaAckHandler(MESH_PACKET_t* puMeshPacket);
+//void vRecOtaCompleteHandler(MESH_PACKET_t* puMeshPacket);
+//void vRecOtaAbortHandler(MESH_PACKET_t* puMeshPacket);
+
+//Tasks
+void vTaskServerWorker(void *arg);
+void vTaskOTAWorker(void *arg);
+
+
 
 #endif /* H_MESH_OTA */

components/mesh_ota/include/Mesh_network.h

@@ -46,38 +46,65 @@
 #define CONFIG_MESH_ROUTE_TABLE_SIZE 50
 #endif
 
+#define MESH_NETWORK_PAYLOAD_SIZE 1024U
 
-struct mesh_packet
+struct meshPacket
 {
-    enum ota_mesh_packet_type {
+    enum otaMeshPacketType
-        APP_Data,            //data for application 
+    {
+        APP_Data,            //data for application
         OTA_Version_Request, //send own version in payload
-        OTA_Version_Respone, //send own version in payload
+        OTA_Version_Response, //send own version in payload
         OTA_Data,            //send image segment
         OTA_ACK,             //ack image segment
-        OTA_Complete         //signal end of image
+        OTA_Complete,         //signal end of image
+        OTA_Abort             //abort OTA process
     } type;
-    uint8_t au8Payload[1024];
+    uint8_t au8Payload[MESH_NETWORK_PAYLOAD_SIZE];
+    mesh_addr_t meshSenderAddr;
 };
 
-typedef struct mesh_packet MESH_PACKET_t;
+typedef struct meshPacket MESH_PACKET_t;
 
 extern bool bIsMeshConnected;
 extern int32_t i32MeshLayer;
-extern mesh_addr_t mesh_parent_addr;
+extern mesh_addr_t meshParentAddr;
 extern esp_netif_t* netif_sta;
+extern uint8_t u8ownMAC[6];
+extern void (*pOTAChildConnectHandle)(uint8_t* );
+extern void (*pChangeStateOfServerWorkerHandle)(bool );
 
 esp_err_t errMeshNetworkInitialize();
 esp_err_t errMeshNetworkInitializeWiFi();
 esp_err_t errMeshNetworkInitializeRouter(mesh_cfg_t* cfg);
 
+esp_err_t errMeshNetworkSetAppReceiveHandle(void (*pAppRxHandleTmp)(uint8_t * pu8Data, uint8_t* pu8Sender));
+esp_err_t errMeshNetworkSetChildConnectedHandle(void (*pChildConnectHandleTmp)(uint8_t * pu8Data));
+esp_err_t errMeshNetworkSetOTAMessageHandle(void (*pOTAMessageHandleTmp)(MESH_PACKET_t* puMeshPacket));
+
+esp_err_t errMeshNetworkSetOtaDataHandle(void (*pOtaDataHandleTmp)(MESH_PACKET_t* puMeshPacket));
+esp_err_t errMeshNetworkSetOtaAckHandle(void (*pOtaAckHandleTmp)(MESH_PACKET_t* puMeshPacket));
+esp_err_t errMeshNetworkSetOtaCompleteHandle(void (*pOtaCompleteHandleTmp)(MESH_PACKET_t* puMeshPacket));
+esp_err_t errMeshNetworkSetOtaAbortHandle(void (*pOtaAbortHandleTmp)(MESH_PACKET_t* puMeshPacket));
+
+esp_err_t errMeshNetworkSetChangeStateOfServerWorkerHandle(void (*pChangeStateOfServerWorkerHandleTmp)(bool bState));
+
 bool bCheckMACEquality(uint8_t* pu8aMAC,  uint8_t* pu8bMAC);
+void vGetOwnAddr(mesh_addr_t* pMeshOwnAddr);
+esp_err_t errGetParentNode(mesh_addr_t* pMeshParentAddr);
 esp_err_t errGetChildren(mesh_addr_t* pChildren, uint16_t* pu16ChildrenSize);
-void vMeshEventHandler(void *arg, esp_event_base_t event_base, int32_t i32EventID, void* vpEventData);
+bool bIsRootNode();
-void vIPEventHandler(void *arg, esp_event_base_t event_base, int32_t i32EventID, void *event_data);
+bool bIsNodeNeighbour(mesh_addr_t* pNode);
+
 esp_err_t errStartReceiveTask();
 void vTaskReceiveMeshData(void *arg);
+void vMeshEventHandler(void *arg, esp_event_base_t event_base, int32_t i32EventID, void* vpEventData);
+void vIPEventHandler(void *arg, esp_event_base_t event_base, int32_t i32EventID, void *event_data);
+
 esp_err_t errSendMeshPacket(mesh_addr_t* pAddrDest, MESH_PACKET_t* pPacket);
 
+
+
+
 #endif /* H_MESH_NETWORK */
- 
+

main/Blinky_LED.c

@@ -0,0 +1,186 @@
+#include "Blinky_LED.h"
+
+static const char *LOG_TAG = "blinky_led";
+static bool bLEDisOn = false; //set led default off
+static mesh_addr_t addrParent;  //addr of parent node
+static mesh_addr_t childrenAddr[CONFIG_MESH_ROUTE_TABLE_SIZE]; //array of children attached to this node
+static uint16_t u16ChildrenSize; //number of children attached to this node
+xQueueHandle queueBlinkyLEDPackets; //handle for led action queue
+
+esp_err_t errBlinkyLEDInitialize()
+{
+    esp_err_t err = ESP_OK;
+    BaseType_t xReturned;
+
+    vGPIOInitialize();
+
+    //create queue to store led action created from BTN and mesh network events
+    queueBlinkyLEDPackets = xQueueCreate(5, sizeof(BLINKY_PACKET_t));
+    if (queueBlinkyLEDPackets == 0)  // Queue not created
+        {
+            ESP_LOGE(LOG_TAG, "Unable to create Queue for Application Packets");
+            err = ESP_FAIL;
+        }
+
+    //register the receiver handle in mesh network
+    ERROR_CHECK(errMeshNetworkSetAppReceiveHandle(rxHandle));
+
+    if(err == ESP_OK)
+        {
+            xReturned = xTaskCreate(vTaskReadUserInput, "vTaskReadUserInput", 4096, NULL, 5, NULL);
+            if(xReturned != pdPASS)
+                {
+                    err = ESP_FAIL;
+                }
+        }
+
+    if(err == ESP_OK)
+        {
+            xReturned = xTaskCreate(vTaskReceiveData, "vTaskReceiveData", 4096, NULL, 5, NULL);
+            if(xReturned != pdPASS)
+                {
+                    err = ESP_FAIL;
+                }
+        }
+    return err;
+}
+
+void vGPIOInitialize()
+{
+    gpio_config_t gpioConf;
+
+    //LED as Output
+    gpio_reset_pin(GPIO_LED);
+    gpio_set_direction(GPIO_LED, GPIO_MODE_OUTPUT);
+
+    //BTN as Input
+    gpioConf.intr_type = GPIO_INTR_DISABLE;
+    gpioConf.mode = GPIO_MODE_INPUT;
+    gpioConf.pin_bit_mask = GPIO_INPUT_PIN_SEL;
+    gpioConf.pull_down_en = 0;
+    gpioConf.pull_up_en = 1;
+    gpio_config(&gpioConf);
+}
+
+void rxHandle(uint8_t* pu8Data, uint8_t* pu8Sender)
+{
+    //send payload to app queue
+    BLINKY_PACKET_t bTmpPacket;
+    memcpy(&bTmpPacket, (uint8_t *)pu8Data, sizeof(BLINKY_PACKET_t));
+    memcpy(&bTmpPacket.meshSenderAddr, (uint8_t *)pu8Sender, 6); //copy MAC from sender into app packet
+    if (xQueueSend(queueBlinkyLEDPackets, &bTmpPacket, portMAX_DELAY) != pdPASS)
+        {
+            ESP_LOGE(LOG_TAG, "Unable to push packet from mesh into Queue");
+        }
+}
+
+void vTaskReadUserInput(void *arg)
+{
+    esp_err_t err = ESP_OK;
+    BLINKY_PACKET_t bTmpPacket;
+    MESH_PACKET_t meshPacket;
+
+    bTmpPacket.type = LED_OFF; //default off
+    meshPacket.type = APP_Data; //this is a app packet
+
+    while(true)
+        {
+            //check for BTN press
+            if(gpio_get_level(GPIO_BOOT_BTN) == 0)
+                {
+                    err = ESP_OK;
+
+                    if(bLEDisOn == false)
+                        {
+                            bTmpPacket.type = LED_ON;
+                        }
+                    else
+                        {
+                            bTmpPacket.type = LED_OFF;
+                        }
+
+                    //push led action into queue
+                    if (xQueueSend(queueBlinkyLEDPackets, &bTmpPacket, portMAX_DELAY) != pdPASS)
+                        {
+                            ESP_LOGE(LOG_TAG, "Unable to push packet into queue");
+                        }
+
+                    memcpy(meshPacket.au8Payload, &bTmpPacket, sizeof(BLINKY_PACKET_t));
+
+                    if(bIsRootNode() == false)
+                        {
+                            //this node is not root --> send led action to parent
+                            ERROR_CHECK(errGetParentNode(&addrParent));
+                            ERROR_CHECK(errSendMeshPacket(&addrParent, &meshPacket));
+                        }
+                    else
+                        {
+                            //this node is root --> send led action to children
+                            ERROR_CHECK(errGetChildren(childrenAddr, &u16ChildrenSize));
+
+                            for (uint16_t u16Index = 0; u16Index < u16ChildrenSize; u16Index++)
+                                {
+                                    ERROR_CHECK (errSendMeshPacket(&childrenAddr[u16Index], &meshPacket));
+                                }
+                        }
+                    vTaskDelay(200 / portTICK_PERIOD_MS);
+                }
+            vTaskDelay(50 / portTICK_PERIOD_MS);
+        }
+}
+
+void vTaskReceiveData(void *arg)
+{
+    esp_err_t err = ESP_OK;
+    MESH_PACKET_t meshPacket;
+    BLINKY_PACKET_t bTmpPacket;
+
+    bTmpPacket.type = LED_OFF; //default off
+    meshPacket.type = APP_Data; //this is a app packet
+
+    while (1)
+        {
+            if (xQueueReceive(queueBlinkyLEDPackets, &bTmpPacket, portMAX_DELAY) != pdTRUE)
+                {
+                    ESP_LOGE(LOG_TAG, "Unable to receive packet from Queue");
+                }
+            else
+                {
+                    err = ESP_OK;
+                    //Successfully RECEIVED the packet
+                    switch (bTmpPacket.type)
+                        {
+                        case LED_ON:
+                            bLEDisOn = true;
+                            gpio_set_level(GPIO_LED, 1); //switch on
+                            ESP_LOGI(LOG_TAG,"switch LED ON");
+                            break;
+
+                        case LED_OFF:
+                            bLEDisOn = false;
+                            gpio_set_level(GPIO_LED, 0); //switch off
+                            ESP_LOGI(LOG_TAG,"switch LED OFF");
+                            break;
+
+                        default:
+                            bLEDisOn = false;
+                            gpio_set_level(GPIO_LED, 0); //switch off
+                            ESP_LOGI(LOG_TAG,"switch LED OFF");
+                            break;
+                        }
+                }
+
+            ERROR_CHECK(errGetChildren(childrenAddr, &u16ChildrenSize)); //get all children attached to this node
+            memcpy(meshPacket.au8Payload, &bTmpPacket, sizeof(BLINKY_PACKET_t)); //copy led action in mesh packet payload
+
+            for (uint16_t u16Index = 0; u16Index < u16ChildrenSize; u16Index++)
+                {
+                    //loop through children
+                    if(bCheckMACEquality(bTmpPacket.meshSenderAddr.addr,  childrenAddr[u16Index].addr) == false) //exclude the sender node
+                        {
+                            ERROR_CHECK (errSendMeshPacket(&childrenAddr[u16Index], &meshPacket)); //send to child
+                        }
+                }
+            vTaskDelay(200 / portTICK_PERIOD_MS);
+        }
+}

main/Blinky_LED.h

@@ -0,0 +1,39 @@
+#ifndef H_BLINKY_LED
+#define H_BLINKY_LED
+
+#include <string.h>
+#include "esp_wifi.h"
+#include "esp_system.h"
+#include "esp_log.h"
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "driver/gpio.h"
+
+#include "Mesh_OTA.h"
+
+#define GPIO_BOOT_BTN   0 //GPIO0 (Boot BTN)
+#define GPIO_LED        2 //GPIO2 (internal blue LED in DevKit V1.0)
+
+#define GPIO_INPUT_PIN_SEL  (1ULL<<GPIO_BOOT_BTN)
+
+struct blinky_packet
+{
+    enum blinky_packet_type
+    {
+        LED_OFF,
+        LED_ON,
+    } type;
+    mesh_addr_t meshSenderAddr; //stores addr of sender of this packet
+};
+
+typedef struct blinky_packet BLINKY_PACKET_t;
+
+esp_err_t errBlinkyLEDInitialize();
+void vGPIOInitialize();
+void rxHandle(uint8_t* pu8Data, uint8_t* pu8Sender);
+void vTaskReadUserInput(void *arg);
+void vTaskReceiveData(void *arg);
+
+#endif /* H_BLINKY_LED */
+
+

main/CMakeLists.txt

@@ -1,2 +1,2 @@
-idf_component_register(SRCS "Main.c"
+idf_component_register(SRCS "Blinky_LED.c" "Main.c"
                     INCLUDE_DIRS ".")

main/Main.c

@@ -12,20 +12,26 @@
 #include "esp_partition.h"
 
 #include "Mesh_OTA.h"
+#include "Blinky_LED.h"
 
 static const char *LOG_TAG = "esp_main";
 
 void app_main(void)
 {
     esp_err_t err = ESP_OK;
-    ESP_LOGI(LOG_TAG, "hardcoded: 0.0.1"); 
+    ESP_LOGI(LOG_TAG, "hardcoded: 0.0.1");
+
+    ESP_LOGI(LOG_TAG, "start mesh network");
     err = errMeshNetworkInitialize();
     ESP_ERROR_CHECK(err);
 
-    //start ota
+    ESP_LOGI(LOG_TAG, "start ota");
-
+    err = errMeshOTAInitialize();
-    //start app 
+    ESP_ERROR_CHECK(err);
 
+    ESP_LOGI(LOG_TAG, "start app");
+    err = errBlinkyLEDInitialize();
+    ESP_ERROR_CHECK(err);
 }
 
 

sdkconfig

@@ -159,7 +159,7 @@ CONFIG_MESH_AP_AUTHMODE=3
 CONFIG_MESH_AP_PASSWD="qaws1234"
 CONFIG_MESH_AP_CONNECTIONS=6
 CONFIG_MESH_ROUTE_TABLE_SIZE=50
-CONFIG_MESH_MESSAGE_SIZE=1500
+CONFIG_MESH_MESSAGE_SIZE=1234
 CONFIG_OTA_HTTPS_SERVER_COMMON_NAME="ota.hendrikschutter.com"
 CONFIG_OTA_HTTPS_SERVER_PORT="443"
 CONFIG_OTA_HTTPS_URL="https://ota.hendrikschutter.com/mesh_ota.bin"

style_code.sh

@@ -0,0 +1,15 @@
+#! /bin/bash
+
+cd main
+astyle --style=gnu *.c
+astyle --style=gnu *.h
+
+cd ..
+
+cd components/mesh_ota
+astyle --style=gnu *.c
+cd include
+astyle --style=gnu *.h
+
+
+