Added message module.

Author: Stian108

include/common.h

@@ -1,16 +1,3 @@
 #ifndef GLOBAL_LOG_LEVEL
 #define GLOBAL_LOG_LEVEL LOG_LEVEL_INF
-#endif
-
-#define MAX_MESSAGE_SIZE 255
-
-struct message
-{
-    uint8_t src_mac[6];
-    uint8_t original_src_mac[6];
-    uint8_t dst_mac[6];
-    uint8_t msg_number;
-    uint8_t ttl;
-    uint8_t payload_len;
-    uint8_t *payload;
-};
+#endif

mesh_access/src/mesh.c

@@ -21,8 +21,12 @@
 #include <ipc/rpmsg_service.h>
 
 #include <common.h>
+
 #include <mesh.h>
 
+// TODO Remove this and fix packaging
+#define MAX_MESSAGE_SIZE 255
+
 LOG_MODULE_REGISTER(mesh_access, GLOBAL_LOG_LEVEL);
 
 static int endpoint_id;

message/CMakeLists.txt

@@ -0,0 +1,7 @@
+zephyr_library()
+
+zephyr_include_directories(
+    include
+    ../include
+    )
+zephyr_library_sources(src/message.c)

message/Kconfig

@@ -0,0 +1,30 @@
+#include <kernel.h>
+
+#define MAX_MESSAGE_SIZE 255
+
+#define SRC_MAC_POS 0
+#define ORIGINAL_SRC_MAC_POS 6
+#define DST_MAC_POS 12
+#define MSG_NUMBER_POS 18
+#define TTL_POS 20
+#define PAYLOAD_LENGTH_POS 21
+#define DATA_POS 22
+
+#define HEADER_LENGTH 22
+
+#define MAX_PAYLOAD_SIZE (MAX_MESSAGE_SIZE - HEADER_LENGTH)
+
+struct message
+{
+    uint8_t src_mac[6];
+    uint8_t original_src_mac[6];
+    uint8_t dst_mac[6];
+    uint8_t msg_number;
+    uint8_t ttl;
+    uint8_t payload_len;
+    uint8_t *payload;
+};
+
+struct message *message_from_buffer(struct k_heap *heap, uint8_t *data, size_t length);
+
+size_t message_to_buffer(uint8_t *buffer, struct message *msg);

message/include/message.h

@@ -0,0 +1,55 @@
+#include <stdint.h>
+#include <stdio.h>
+
+#include <logging/log.h>
+#include <logging/log_ctrl.h>
+#include <zephyr.h>
+
+#include <common.h>
+#include <message.h>
+
+LOG_MODULE_REGISTER(message, GLOBAL_LOG_LEVEL);
+
+struct message *message_from_buffer(struct k_heap *heap, uint8_t *data, size_t length)
+{
+    if (length < HEADER_LENGTH ||
+        length > MAX_MESSAGE_SIZE ||
+        length != data[PAYLOAD_LENGTH_POS] + HEADER_LENGTH)
+    {
+        LOG_DBG("Invalid packet");
+        return NULL;
+    }
+    struct message *msg = (struct message *)k_heap_alloc(heap, sizeof(struct message), K_NO_WAIT);
+    if (msg == NULL)
+    {
+        LOG_ERR("Cannot allocate heap memory");
+        return NULL;
+    }
+    memcpy(msg->src_mac, data + SRC_MAC_POS, sizeof(uint8_t) * 6);
+    memcpy(msg->original_src_mac, data + ORIGINAL_SRC_MAC_POS, sizeof(uint8_t) * 6);
+    memcpy(msg->dst_mac, data + DST_MAC_POS, sizeof(uint8_t) * 6);
+    msg->msg_number = data[MSG_NUMBER_POS];
+    msg->ttl = data[TTL_POS];
+    msg->payload_len = data[PAYLOAD_LENGTH_POS];
+    msg->payload = (uint8_t *)k_heap_alloc(heap, msg->payload_len, K_NO_WAIT);
+    if (msg->payload == NULL)
+    {
+        LOG_ERR("Cannot allocate heap memory");
+        k_heap_free(heap, msg);
+        return NULL;
+    }
+    memcpy(msg->payload, data + DATA_POS, msg->payload_len);
+    return msg;
+}
+
+size_t message_to_buffer(uint8_t *buffer, struct message *msg)
+{
+    memcpy(buffer + SRC_MAC_POS, msg->src_mac, sizeof(uint8_t) * 6);
+    memcpy(buffer + ORIGINAL_SRC_MAC_POS, msg->original_src_mac, sizeof(uint8_t) * 6);
+    memcpy(buffer + DST_MAC_POS, msg->dst_mac, sizeof(uint8_t) * 6);
+    buffer[MSG_NUMBER_POS] = msg->msg_number;
+    buffer[TTL_POS] = msg->ttl;
+    buffer[PAYLOAD_LENGTH_POS] = msg->payload_len;
+    memcpy(buffer + DATA_POS, msg->payload, msg->payload_len);
+    return msg->payload_len + HEADER_LENGTH;
+}

message/src/message.c

@@ -0,0 +1,4 @@
+name: message
+build:
+    cmake: .
+    kconfig: ./Kconfig

message/zephyr/module.yml

@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.8.2)
 
 set(BOARD nrf5340dk_nrf5340_cpunet)
 
+list(APPEND ZEPHYR_EXTRA_MODULES ${CMAKE_SOURCE_DIR}/../message/)
+
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(NONE)
 

net_core/CMakeLists.txt

@@ -1,13 +1,3 @@
-#define HEADER_LENGTH 22
-
-#define SRC_MAC_POS 0
-#define ORIGINAL_SRC_MAC_POS 6
-#define DST_MAC_POS 12
-#define MSG_NUMBER_POS 18
-#define TTL_POS 20
-#define PAYLOAD_LENGTH_POS 21
-#define DATA_POS 22
-
 #define MAX_HASH_COUNT_LIMIT 100
 
 /**

net_core/include/node.h

@@ -2,6 +2,8 @@
 #include <stdio.h>
 
 #include <common.h>
+#include <message.h>
+
 #include <msg.h>
 #include <node.h>