mesh: add fields for acknowledged access messages, register for transport sent

src/mesh/mesh_network.h

@@ -74,6 +74,12 @@ typedef struct mesh_pdu {
     btstack_linked_item_t item;
     // type
     mesh_pdu_type_t pdu_type;
+
+    // access acknowledged message
+    uint16_t retransmit_count;
+    uint32_t retransmit_timeout_ms;
+    uint32_t ack_opcode;
+
 } mesh_pdu_t;
 
 // 

src/mesh/mesh_upper_transport.h

@@ -49,7 +49,7 @@ extern "C"
 #include <stdint.h>
 #include "mesh/mesh_network.h"
 #include "mesh/mesh_lower_transport.h"
-	
+
 void mesh_upper_transport_init();
 
 void mesh_upper_transport_set_primary_element_address(uint16_t primary_element_address);
@@ -81,6 +81,8 @@ uint8_t mesh_upper_transport_setup_access_pdu(mesh_pdu_t * pdu, uint16_t netkey_
 
 void mesh_upper_transport_send_access_pdu(mesh_pdu_t * pdu);
 
+void mesh_upper_transport_pdu_free(mesh_pdu_t * pdu);
+
 // allocator
 mesh_transport_pdu_t * mesh_transport_pdu_get(void);
 void mesh_transport_pdu_free(mesh_transport_pdu_t * transport_pdu);

test/mesh/mesh_access.c

@@ -52,6 +52,7 @@
 
 static void mesh_access_message_process_handler(mesh_pdu_t * pdu);
 static void mesh_access_secure_network_beacon_handler(uint8_t packet_type, uint16_t channel, uint8_t * packet, uint16_t size);
+static void mesh_access_upper_transport_handler(mesh_transport_callback_type_t callback_type, mesh_transport_status_t status, mesh_pdu_t * pdu);
 
 static uint16_t primary_element_address;
 
@@ -82,6 +83,7 @@ void mesh_access_init(void){
 
     // register with upper transport
     mesh_upper_transport_register_access_message_handler(&mesh_access_message_process_handler);
+    mesh_upper_transport_set_higher_layer_handler(&mesh_access_upper_transport_handler);
 
     // register for secure network beacons
     beacon_register_for_secure_network_beacons(&mesh_access_secure_network_beacon_handler);
@@ -118,20 +120,45 @@ void mesh_access_emit_state_update_int16(btstack_packet_handler_t * event_handle
     (*event_handler)(HCI_EVENT_PACKET, 0, event, sizeof(event));
 }
 
-uint8_t mesh_access_retransmissions_get(void){
+uint8_t mesh_access_retransmission_get(void){
     return 3;
 }
 
+uint32_t mesh_access_retransmission_period(void){
+    return 30000;
+}
+
+#define MESH_ACCESS_OPCODE_INVALID 0xFFFFFFFFu
+
 void mesh_access_send_unacknowledged_pdu(mesh_pdu_t * pdu){
+    pdu->ack_opcode = MESH_ACCESS_OPCODE_INVALID;;
     mesh_upper_transport_send_access_pdu(pdu);
 }
 
 void mesh_access_send_acknowledged_pdu(mesh_pdu_t * pdu, uint8_t retransmissions, uint32_t ack_opcode){
-    UNUSED(retransmissions);
-    UNUSED(ack_opcode);
+    pdu->retransmit_count = retransmissions;
+    pdu->retransmit_timeout_ms = btstack_run_loop_get_time_ms() + mesh_access_retransmission_period();
+    pdu->ack_opcode = ack_opcode;
+
     mesh_upper_transport_send_access_pdu(pdu);
 }
 
+static void mesh_access_upper_transport_handler(mesh_transport_callback_type_t callback_type, mesh_transport_status_t status, mesh_pdu_t * pdu){
+    switch (callback_type){
+        case MESH_TRANSPORT_PDU_SENT:
+            // unacknowledged -> free
+            if (pdu->ack_opcode == MESH_ACCESS_OPCODE_INVALID){
+                mesh_upper_transport_pdu_free(pdu);
+                break;
+            }
+            // free acknowledged for now, too
+            mesh_upper_transport_pdu_free(pdu);
+            break;
+        default:
+            break;
+    }
+}
+
 // Mesh Model Transitions
 
 void mesh_access_transitions_setup_transaction(mesh_transition_t * transition, uint8_t transaction_identifier, uint16_t src_address, uint16_t dst_address){

test/mesh/mesh_access.h

@@ -236,7 +236,12 @@ void mesh_access_message_processed(mesh_pdu_t * pdu);
 /**
  * @brief Get number of retransmissions used by default
  */
-uint8_t mesh_access_retransmissions_get(void);
+uint8_t mesh_access_retransmission_count_get(void);
+
+/**
+ * @brief Get retransmission timeout
+ */
+uint8_t mesh_access_retransmission_period_get(void);
 
 /**
  * @brief Send unacknowledged message