Binary download

Fixed some issues with sockets and namings

Author: Maksymilian Wojczuk

Inc/communication/binary_download.h

@@ -1,6 +1,8 @@
 #ifndef _BINARY_DOWNLOAD_H
 #define _BINARY_DOWNLOAD_H
 
+#include "object_target.h"
+
 // Downlaod States
 #define NO_DOWNLOAD_DATA 0
 #define DOWNLOAD_IN_PROGRESS 1
@@ -17,7 +19,5 @@
 #define USB_ERROR -6
 
 
-
-
-int startDownload(char *path, char *filename);
+int startDownload(target_instance_t *targetP);
 #endif

Inc/communication/wakaama_client/objects/object_target.h

@@ -0,0 +1,29 @@
+#ifndef __OBJECT_TARGET_H
+#define __OBJECT_TARGET_H
+
+
+/*
+ * Multiple instance objects can use userdata to store data that will be shared between the different instances.
+ * The lwm2m_object_t object structure - which represent every object of the liblwm2m as seen in the single instance
+ * object - contain a chained list called instanceList with the object specific structure target_instance_t:
+ */
+typedef struct _target_instance_
+{
+    /*
+     * The first two are mandatories and represent the pointer to the next instance and the ID of this one. The rest
+     * is the instance scope user data (uint8_t target in this case)
+     */
+    struct _target_instance_ * next;   // matches lwm2m_list_t::next
+    uint16_t shortID;               // matches lwm2m_list_t::id
+    
+    uint8_t flash_state;
+    uint32_t * target_type;
+    char * firmware_url;
+    uint8_t download_state;
+    int16_t download_error;
+    uint32_t firmware_version;
+    char * binary_filename;
+} target_instance_t;
+
+
+#endif

Src/communication/binary_download.c

@@ -2,13 +2,25 @@
 #include "lwip/sockets.h"
 #include "communication_config.h"
 #include "binary_download.h"
+#include "errno.h"
+
+
+static void download_error(target_instance_t *targetP, int err, int socket) {
+	targetP->download_state = DOWNLOAD_ERROR;
+	targetP->download_error = err;
+	if(err != SOCKET_ERROR){
+		lwip_close(socket);
+	}
+	vTaskDelete(NULL);
+}
+
+int startDownload(target_instance_t *targetP) {
 
-int startDownload(char *path, char *filename) {
 	int socket;
     socket = lwip_socket(AF_INET, SOCK_STREAM, 0);
     if (socket < 0 ) {
-        printf("cannot create socket\r\n");
-        return SOCKET_ERROR;
+        printf("cannot create socket: %d\r\n", errno);
+        download_error(targetP, SOCKET_ERROR, socket);
     }
 
 	struct sockaddr_in clientAddress;
@@ -20,15 +32,15 @@ int startDownload(char *path, char *filename) {
     if (result < 0) {
 	    printf("cannot connect to server, err: %d\r\n", result);
         lwip_close(socket);
-        return CONNECTION_ERROR;
+        download_error(targetP,CONNECTION_ERROR, socket);
     }
 
     char message[200];
-    sprintf(message, "GET %s HTTP/1.1\r\nHost: %s\r\n\r\n Connection: keep-alive\r\n\r\n Keep-Alive: 300\r\n", path, SERVER_IP);
+    sprintf(message, "GET %s HTTP/1.1\r\nHost: %s\r\n\r\n Connection: keep-alive\r\n\r\n Keep-Alive: 300\r\n", targetP->firmware_url, SERVER_IP);
 
     if( lwip_send(socket , message , strlen(message) , 0) < 0) {
         printf("Send failed\r\n");
-        return REQUEST_ERROR;
+        download_error(targetP,REQUEST_ERROR, socket);
     }
 
     int server_response_length = 300;
@@ -40,17 +52,19 @@ int startDownload(char *path, char *filename) {
     int received_len = lwip_recv(socket, server_reply , sizeof server_reply - 1, 0);
     if( received_len < 0 ){
         printf("recv failed\r\n");
-        return RECEIVE_ERROR;
+        download_error(targetP,RECEIVE_ERROR, socket);
     }
 
     if(!lwm2m_strncmp(server_reply, "HTTP/1.1 200 OK", 15) == 0){
     	long response_code;
-    	printf("Wrong server_reply\r\n");
-    	if(xatoi(server_reply + 9, &response_code) != 1) {
+    	char *asd;
+    	asd = server_reply + 9;
+    	if(xatoi(&asd, &response_code) != 1) {
     		printf("Error reading Server response code\r\n");
-    		return UNKNOWN_ERROR;
+    		download_error(targetP,UNKNOWN_ERROR, socket);
     	}
-    	return response_code;
+    	printf("Server Response status:%d\r\n", response_code);
+    	download_error(targetP, response_code, socket);
     }
     printf("Server responded with 200!\r\n");
     for(int i = 15 ; i < received_len ; i++) {
@@ -59,7 +73,7 @@ int startDownload(char *path, char *filename) {
 			asd = server_reply + i + 15;
 			if (xatoi(&asd, &payload_len) != 1) {
 				printf("Error reading Content-Length\r\n");
-				return UNKNOWN_ERROR;
+				download_error(targetP, UNKNOWN_ERROR, socket);
 			}
 			break;
 		}
@@ -70,22 +84,26 @@ int startDownload(char *path, char *filename) {
 
         if( received_len < 0 ){
             printf("recv failed\r\n");
-            return RECEIVE_ERROR;
+            download_error(targetP, RECEIVE_ERROR, socket);
         }
 
         total_received_len += received_len;
         server_reply[received_len] = '\0';
 
   		if(get_usb_ready()) {
-  			usb_write(server_reply, filename, received_len);
+  			usb_write(server_reply, targetP->binary_filename, received_len);
   		} else {
-  			return USB_ERROR;
+  			download_error(targetP, USB_ERROR, socket);
   		}
 
         if( total_received_len >= payload_len ){
             break;
         }   
     }
 
-    return NO_ERROR;
+    targetP->download_state = DOWNLOAD_COMPLETED;
+    targetP->download_error = NO_ERROR;	
+    lwip_close(socket);
+    vTaskDelete();
+
 }

Src/communication/wakaama_client/objects/object_target.c

@@ -27,6 +27,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <limits.h>
+#include "object_target.h"
 #include "binary_download.h"
 
 static void prv_output_buffer(uint8_t * buffer,
@@ -66,29 +67,6 @@ static void prv_output_buffer(uint8_t * buffer,
     }
 }
 
-/*
- * Multiple instance objects can use userdata to store data that will be shared between the different instances.
- * The lwm2m_object_t object structure - which represent every object of the liblwm2m as seen in the single instance
- * object - contain a chained list called instanceList with the object specific structure target_instance_t:
- */
-typedef struct _target_instance_
-{
-    /*
-     * The first two are mandatories and represent the pointer to the next instance and the ID of this one. The rest
-     * is the instance scope user data (uint8_t target in this case)
-     */
-    struct _target_instance_ * next;   // matches lwm2m_list_t::next
-    uint16_t shortID;               // matches lwm2m_list_t::id
-    
-    uint8_t flash_state;
-    uint32_t * target_type;
-    char * firmware_url;
-    uint8_t download_state;
-    uint16_t download_error;
-    uint32_t firmware_version;
-    char * binary_filename;
-} target_instance_t;
-
 static uint8_t target_read(uint16_t instanceId,
                         int * numDataP,
                         lwm2m_data_t ** dataArrayP,
@@ -225,22 +203,26 @@ static uint8_t target_write(uint16_t instanceId,
             if (!dataArray[i].type == LWM2M_TYPE_STRING && !dataArray[i].type == LWM2M_TYPE_OPAQUE) {
                 return COAP_400_BAD_REQUEST;  
             } 
-            if (targetP->firmware_url != NULL) {
-                lwm2m_free(targetP->firmware_url);
-            }
+            // if (targetP->firmware_url != NULL) {
+            //     lwm2m_free(targetP->firmware_url);
+            // }
+            dataArray[i].value.asBuffer.buffer[dataArray[i].value.asBuffer.length] = '\0';
             targetP->firmware_url = lwm2m_strdup((char*)dataArray[i].value.asBuffer.buffer);
             targetP->firmware_version = lwm2m_gettime();
             targetP->download_state = DOWNLOAD_IN_PROGRESS;
             sprintf(targetP->binary_filename, "%d", targetP->firmware_version);
 
-            int res = startDownload(targetP->firmware_url, targetP->binary_filename);
-            if (res == NO_ERROR) {
-                targetP->download_state = DOWNLOAD_COMPLETED;
-                targetP->download_error = NO_ERROR;
-            } else {
-                targetP->download_state = DOWNLOAD_ERROR;
-                targetP->download_error = res;
-            }
+
+            xTaskCreate(startDownload, NULL, 2000, targetP, 2, NULL);
+
+            // int res = startDownload(targetP->firmware_url, targetP->binary_filename);
+            // if (res == NO_ERROR) {
+                // targetP->download_state = DOWNLOAD_COMPLETED;
+                // targetP->download_error = NO_ERROR;
+            // } else {
+                // targetP->download_state = DOWNLOAD_ERROR;
+                // targetP->download_error = res;
+            // }
         }
         break;
         case 3:

Src/main.c

@@ -372,8 +372,6 @@ void StartDefaultTask(void const * argument)
     fflush(stdout);
     get_line(usrInput, 2);
     printf("%s\n", usrInput);
-    char *filename;
-    filename = pvPortMalloc(100);
     switch(usrInput[0]) {
       case 'l':
         if (get_usb_ready()) {
@@ -385,13 +383,6 @@ void StartDefaultTask(void const * argument)
           usb_write("asd", "temp", 3);
         }
         break;
-      case 'd':
-        sprintf(filename,"%d", lwm2m_gettime());
-        int res = startDownload("/asd.txt", filename);
-        if(res != NO_ERROR){
-          printf("error downloading file: %d\r\n", res);
-        }
-        break;
     }
   }
   /* USER CODE END 5 */