Wakaaama

Cleaned up wakaama custom sources

Author: Maksymilian Wojczuk

Inc/communication/lwip_helpers.h

@@ -50,4 +50,6 @@ void connection_free(connection_t * connList);
 
 int connection_send(connection_t *connP, uint8_t * buffer, size_t length);
 
+int createUDPSocket(int port, int addressFamily);
+
 #endif

Middlewares/Third_Party/wakaama/client/connection.h renamed to Inc/communication/wakaama_client/connection.h

@@ -0,0 +1,28 @@
+#ifndef __WAKAAMA_H
+#define __WAKAAMA_H
+
+#include "connection.h"
+#include "objects.h"
+#include "communication_config.h"
+
+typedef struct
+{
+    lwm2m_object_t * securityObjP;
+    int sock;
+    connection_t * connList;
+    int addressFamily;
+} client_data_t;
+
+//WAKAAMA
+static lwm2m_context_t *lwm2mContext = NULL;
+static lwm2m_object_t *objArray[OBJ_COUNT];
+static client_data_t data;
+static int q_reset = 0;
+
+static void print_state(lwm2m_context_t * lwm2mH);
+void taskWakaama(void *socket);
+void * lwm2m_connect_server(uint16_t secObjInstID,
+        void * userData);
+void lwm2m_close_connection(void * sessionH,
+        void * userData);
+#endif

Middlewares/Third_Party/wakaama/client/objects/objects.h renamed to Inc/communication/wakaama_client/objects/objects.h

@@ -13,7 +13,7 @@
 ######################################
 # target
 ######################################
-TARGET = JtagProgrammer
+TARGET = RemoteProgrammer
 
 
 ######################################
@@ -161,7 +161,7 @@ Src/stm32f4xx_it.c \
 Src/stm32f4xx_hal_msp.c \
 Src/communication/dbgu.c \
 Src/communication/term_io.c \
-Src/communication/lwip_helpers.c
+Src/communication/wakaama_client/wakaama.c
 
 # ASM sources
 ASM_SOURCES =  \
@@ -191,19 +191,17 @@ Middlewares/Third_Party/wakaama/block1.c \
 Middlewares/Third_Party/wakaama/er-coap-13/er-coap-13.c
 
 WAKAAMA_CUSTOM = \
-Middlewares/Third_Party/wakaama/platform/platform.c \
-Middlewares/Third_Party/wakaama/client/connection.c \
-Middlewares/Third_Party/wakaama/client/objects/object_device.c \
-Middlewares/Third_Party/wakaama/client/objects/object_security.c \
-Middlewares/Third_Party/wakaama/client/objects/object_server.c \
-Middlewares/Third_Party/wakaama/client/objects/test_object.c
+Src/communication/wakaama_client/platform/platform.c \
+Src/communication/wakaama_client/connection.c \
+Src/communication/wakaama_client/objects/object_device.c \
+Src/communication/wakaama_client/objects/object_security.c \
+Src/communication/wakaama_client/objects/object_server.c \
+Src/communication/wakaama_client/objects/test_object.c
 
 
 WAKAAMA_INC = \
 -IMiddlewares/Third_Party/wakaama \
 -IMiddlewares/Third_Party/wakaama/er-coap-13 \
--IMiddlewares/Third_Party/wakaama/client \
--IMiddlewares/Third_Party/wakaama/client/objects
 
 
 WAKAAMA_SYMBOL = -DLWM2M_LITTLE_ENDIAN
@@ -285,7 +283,10 @@ C_INCLUDES =  \
 -IMiddlewares/Third_Party/LwIP/src/include/posix/sys \
 -IMiddlewares/Third_Party/LwIP/system/arch \
 -IDrivers/CMSIS/Include \
--IInc/communication
+-IInc/communication \
+-IInc/communication/wakaama_client \
+-IInc/communication/wakaama_client/objects \
+-Iconfig
 
 C_INCLUDES += $(WAKAAMA_INC)
 

Inc/communication/wakaama_client/wakaama.h

@@ -6,7 +6,8 @@
 #include "sockets.h"
 #include "mem.h"
 
-int getUDPSocket(int port, int addressFamily){
+// TODO: 
+int createUDPSocket(int port, int addressFamily){
     /* create a UDP socket */
     int socket;
     socket = lwip_socket(addressFamily, SOCK_DGRAM, 0);

Makefile

@@ -21,29 +21,24 @@
 #include <ctype.h>
 #include "connection.h"
 
-connection_t * connection_find(connection_t * connList, struct sockaddr_storage * addr, size_t addrLen)
-{
+connection_t * connection_find(connection_t * connList, struct sockaddr_storage * addr, size_t addrLen) {
     connection_t * connP;
 
     connP = connList;
-    while (connP != NULL)
-    {
+    while (connP != NULL) {
         if ((connP->addrLen == addrLen)
-         && (memcmp(&(connP->addr), addr, addrLen) == 0))
-        {
+         && (memcmp(&(connP->addr), addr, addrLen) == 0)) {
             return connP;
         }
         connP = connP->next;
     }
-
     return connP;
 }
 
 connection_t * connection_new_incoming(connection_t * connList,
                                        int sock,
                                        struct sockaddr * addr,
-                                       size_t addrLen)
-{
+                                       size_t addrLen) {
     connection_t * connP;
 
     connP = (connection_t *)lwm2m_malloc(sizeof(connection_t));
@@ -62,8 +57,7 @@ connection_t * connection_create(connection_t * connList,
                                  int sock,
                                  char * host,
                                  char * port,
-                                 int addressFamily)
-{
+                                 int addressFamily) {
     struct addrinfo hints;
     struct addrinfo *servinfo = NULL;
     struct addrinfo *p;
@@ -76,28 +70,24 @@ connection_t * connection_create(connection_t * connList,
     hints.ai_family = addressFamily;
     hints.ai_socktype = SOCK_DGRAM;
     int result = lwip_getaddrinfo(host, port, &hints, &servinfo);
-    fprintf(stderr, "lwip_getaddrinfo %d\r\n", result);
     if (result != 0 || servinfo == NULL) {
+        fprintf(stderr, "lwip_getaddrinfo returned: %d\r\n", result);
         return NULL;
     }
     // we test the various addresses
     s = -1;
-    for(p = servinfo ; p != NULL && s == -1 ; p = p->ai_next)
-    {
+    for(p = servinfo ; p != NULL && s == -1 ; p = p->ai_next) {
         s = lwip_socket(p->ai_family, p->ai_socktype, p->ai_protocol);
-        if (s >= 0)
-        {
+        if (s >= 0) {
             sa = p->ai_addr;
             sl = p->ai_addrlen;
-            if (-1 == lwip_connect(s, p->ai_addr, p->ai_addrlen))
-            {
+            if (-1 == lwip_connect(s, p->ai_addr, p->ai_addrlen)) {
                 lwip_close(s);
                 s = -1;
             }
         }
     }
-    if (s >= 0)
-    {   
+    if (s >= 0) {   
         connP = connection_new_incoming(connList, sock, sa, sl);
         lwip_close(s);
     }
@@ -108,10 +98,8 @@ connection_t * connection_create(connection_t * connList,
     return connP;
 }
 
-void connection_free(connection_t * connList)
-{
-    while (connList != NULL)
-    {
+void connection_free(connection_t * connList) {
+    while (connList != NULL) {
         connection_t * nextP;
 
         nextP = connList->next;
@@ -123,8 +111,7 @@ void connection_free(connection_t * connList)
 
 int connection_send(connection_t *connP,
                     uint8_t * buffer,
-                    size_t length)
-{
+                    size_t length) {
     int nbSent;
     size_t offset;
 
@@ -134,14 +121,11 @@ int connection_send(connection_t *connP,
 
     s[0] = 0;
 
-    if (AF_INET == connP->addr.sin6_family)
-    {
+    if (AF_INET == connP->addr.sin6_family) {
         struct sockaddr_in *saddr = (struct sockaddr_in *)&connP->addr;
         inet_ntop(saddr->sin_family, &saddr->sin_addr, s, INET6_ADDRSTRLEN);
-        port = saddr->sin_port;
-    }
-    else if (AF_INET6 == connP->addr.sin6_family)
-    {
+        port = saddr->sin_port; }
+    else if (AF_INET6 == connP->addr.sin6_family) {
         struct sockaddr_in6 *saddr = (struct sockaddr_in6 *)&connP->addr;
         inet_ntop(saddr->sin6_family, &saddr->sin6_addr, s, INET6_ADDRSTRLEN);
         port = saddr->sin6_port;
@@ -153,8 +137,7 @@ int connection_send(connection_t *connP,
 #endif
 
     offset = 0;
-    while (offset != length)
-    {
+    while (offset != length) {
         nbSent = lwip_sendto(connP->sock, buffer + offset, length - offset, 0, (struct sockaddr *)&(connP->addr), connP->addrLen);
         if (nbSent == -1) return -1;
         offset += nbSent;
@@ -165,19 +148,16 @@ int connection_send(connection_t *connP,
 uint8_t lwm2m_buffer_send(void * sessionH,
                           uint8_t * buffer,
                           size_t length,
-                          void * userdata)
-{
+                          void * userdata) {
     connection_t * connP = (connection_t*) sessionH;
 
-    if (connP == NULL)
-    {
-        fprintf(stderr, "#> failed sending %lu bytes, missing connection\r\n", length);
+    if (connP == NULL) {
+        fprintf(stderr, "#> failed sending %u bytes, missing connection\r\n", length);
         return COAP_500_INTERNAL_SERVER_ERROR ;
     }
 
-    if (-1 == connection_send(connP, buffer, length))
-    {
-        fprintf(stderr, "#> failed sending %lu bytes\r\n", length);
+    if (-1 == connection_send(connP, buffer, length)) {
+        fprintf(stderr, "#> failed sending %u bytes\r\n", length);
         return COAP_500_INTERNAL_SERVER_ERROR ;
     }
 
@@ -186,7 +166,32 @@ uint8_t lwm2m_buffer_send(void * sessionH,
 
 bool lwm2m_session_is_equal(void * session1,
                             void * session2,
-                            void * userData)
-{
+                            void * userData) {
     return (session1 == session2);
 }
+
+int createUDPSocket(int port, int addressFamily){
+    /* create a UDP socket */
+    int socket;
+    socket = lwip_socket(addressFamily, SOCK_DGRAM, 0);
+    if (socket < 0 ) {
+        printf("cannot create socket\r\n");
+        return -1;
+    }
+    if(fcntl(socket, F_SETFL, O_NONBLOCK) == -1){
+        printf("cannot set socket O_NONBLOCK\r\n");
+        return -1;
+    }
+    struct sockaddr_in clientAddress;
+    clientAddress.sin_family = addressFamily;
+    clientAddress.sin_port = htons(port);
+    clientAddress.sin_addr.s_addr = INADDR_ANY;
+
+    /* bind */
+    if (lwip_bind(socket, (struct sockaddr *) &clientAddress, sizeof (clientAddress)) < 0) {
+        printf("cannot bind socket\r\n");
+        lwip_close(socket);
+        return -1;
+    }
+    return socket;
+}

Src/communication/lwip_helpers.c

@@ -64,7 +64,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include "client_config.h"
+#include "communication_config.h"
 
 
 // Resource Id's:

Middlewares/Third_Party/wakaama/client/connection.c renamed to Src/communication/wakaama_client/connection.c

@@ -46,7 +46,7 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "client_config.h"
+#include "communication_config.h"
 
 
 typedef struct _security_instance_

Middlewares/Third_Party/wakaama/client/objects/object_device.c renamed to Src/communication/wakaama_client/objects/object_device.c

@@ -496,4 +496,5 @@ void clean_server_object(lwm2m_object_t * object)
         object->instanceList = object->instanceList->next;
         lwm2m_free(serverInstance);
     }
+    lwm2m_free(object);
 }