DNS Support

Added dns support for downloading files

Author: Maksymilian Wojczuk

Inc/communication/binary_download.h

@@ -17,7 +17,8 @@
 #define REQUEST_ERROR -4
 #define RECEIVE_ERROR -5
 #define USB_ERROR -6
-
+#define ERROR_PARSING_URL -7
+#define HOST_UNKNOWN_ERROR -8
 
 int startDownload(target_instance_t *targetP);
 #endif

Inc/communication/yuarel.h

@@ -0,0 +1,115 @@
+/**
+ * Copyright (C) 2016 Jack Engqvist Johansson
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef INC_YUAREL_H
+#define INC_YUAREL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * The struct where the parsed values will be stored:
+ *
+ * scheme ":" [ "//" ] [ username ":" password "@" ] host [ ":" port ] [ "/" ] [ path ] [ "?" query ]
+ *
+ * Note: to make sure that no strings are copied, the first slash "/" in the
+ * path will be used to null terminate the hostname if no port is supplied.
+ */
+struct yuarel {
+	char *scheme; /* scheme, without ":" and "//" */
+	char *username; /* username, default: NULL */
+	char *password; /* password, default: NULL */
+	char *host; /* hostname or IP address */
+	int port; /* port, default: 0 */
+	char *path; /* path, without leading "/", default: NULL */
+	char *query; /* query, default: NULL */
+	char *fragment; /* fragment, default: NULL */
+};
+
+/* A struct to hold the query string parameter values. */
+struct yuarel_param {
+	char *key;
+	char *val;
+};
+
+/**
+ * Parse a URL to a struct.
+ *
+ * The URL string should be in one of the following formats:
+ *
+ * Absolute URL:
+ * scheme ":" [ "//" ] [ username ":" password "@" ] host [ ":" port ] [ "/" ] [ path ] [ "?" query ] [ "#" fragment ]
+ *
+ * Relative URL:
+ * path [ "?" query ] [ "#" fragment ]
+ *
+ * The following parts will be parsed to the corresponding struct member.
+ *
+ * *url:     a pointer to the struct where to store the parsed values.
+ * *url_str: a pointer to the url to be parsed (null terminated). The string
+ *           will be modified.
+ *
+ * Returns 0 on success, otherwise -1.
+ */
+extern int yuarel_parse(struct yuarel *url, char *url_str);
+
+/**
+ * Split a path into several strings.
+ *
+ * No data is copied, the slashed are used as null terminators and then
+ * pointers to each path part will be stored in **parts. Double slashes will be
+ * treated as one.
+ *
+ * *path:     the path to split. The string will be modified.
+ * **parts:   a pointer to an array of (char *) where to store the result.
+ * max_parts: max number of parts to parse.
+ *
+ * Returns the number of parsed items. -1 on error.
+ */
+extern int yuarel_split_path(char *path, char **parts, int max_parts);
+
+/**
+ * Parse a query string into a key/value struct.
+ *
+ * The query string should be a null terminated string of parameters separated by
+ * a delimiter. Each parameter are checked for the equal sign character. If it
+ * appears in the parameter, it will be used as a null terminator and the part
+ * that comes after it will be the value of the parameter.
+ *
+ * No data are copied, the equal sign and delimiters are used as null
+ * terminators and then pointers to each parameter key and value will be stored
+ * in the yuarel_param struct.
+ *
+ * *query:     the query string to parse. The string will be modified.
+ * delimiter:  the character that separates the key/value pairs from eachother.
+ * *params:    an array of (struct yuarel_param) where to store the result.
+ * max_values: max number of parameters to parse.
+ *
+ * Returns the number of parsed items. -1 on error.
+ */
+extern int yuarel_parse_query(char *query, char delimiter, struct yuarel_param *params, int max_params);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* INC_YUAREL_H */

Makefile

@@ -162,7 +162,8 @@ Src/stm32f4xx_hal_msp.c \
 Src/communication/dbgu.c \
 Src/communication/term_io.c \
 Src/communication/binary_download.c \
-Src/communication/wakaama_client/wakaama.c
+Src/communication/wakaama_client/wakaama.c \
+Src/communication/yuarel.c 
 
 # ASM sources
 ASM_SOURCES =  \

Src/communication/binary_download.c

@@ -3,44 +3,59 @@
 #include "communication_config.h"
 #include "binary_download.h"
 #include "errno.h"
+#include "yuarel.h"
+#include "FreeRTOS.h"
 
 
-static void download_error(target_instance_t *targetP, int err, int socket) {
+
+static void download_error(target_instance_t *targetP, int err, int socket, char *url_str) {
 	targetP->download_state = DOWNLOAD_ERROR;
 	targetP->download_error = err;
-	if(err != SOCKET_ERROR){
+	if(err != SOCKET_ERROR && err != ERROR_PARSING_URL){
 		lwip_close(socket);
 	}
+    lwm2m_free(url_str);
 	vTaskDelete(NULL);
 }
 
 int startDownload(target_instance_t *targetP) {
-
+    struct yuarel url;
+    char *url_str = lwm2m_strdup(targetP->firmware_url);
+    if(yuarel_parse(&url, url_str) != 0) {
+        printf("Error parsing URL\r\n");
+        download_error(targetP, ERROR_PARSING_URL, 0, url_str);
+    }
 	int socket;
     socket = lwip_socket(AF_INET, SOCK_STREAM, 0);
     if (socket < 0 ) {
         printf("cannot create socket: %d\r\n", errno);
-        download_error(targetP, SOCKET_ERROR, socket);
+        download_error(targetP, SOCKET_ERROR, socket, url_str);
+    }
+
+    ip_addr_t *addr = NULL;
+    if (netconn_gethostbyname(url.host, &addr) != ERR_OK) {
+        printf("cannot resolve hostname\r\n");
+        download_error(targetP, HOST_UNKNOWN_ERROR, socket, url_str);
     }
 
-	struct sockaddr_in clientAddress;
-    clientAddress.sin_family = AF_INET;
-    clientAddress.sin_port = htons(80);
-    clientAddress.sin_addr.s_addr = inet_addr(SERVER_IP);
+    struct sockaddr_in clientAddressv4;
+    clientAddressv4.sin_family = AF_INET;
+    clientAddressv4.sin_port = htons(80);
+    clientAddressv4.sin_addr.s_addr = addr;
 
-    int result = lwip_connect(socket, (struct sockaddr *) &clientAddress, sizeof (clientAddress));
+    int result = lwip_connect(socket, (struct sockaddr *) &clientAddressv4, sizeof (struct sockaddr_in));
     if (result < 0) {
 	    printf("cannot connect to server, err: %d\r\n", result);
         lwip_close(socket);
-        download_error(targetP,CONNECTION_ERROR, socket);
+        download_error(targetP,CONNECTION_ERROR, socket, url_str);
     }
 
     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", targetP->firmware_url, 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", url.path, url.host);
 
     if( lwip_send(socket , message , strlen(message) , 0) < 0) {
         printf("Send failed\r\n");
-        download_error(targetP,REQUEST_ERROR, socket);
+        download_error(targetP,REQUEST_ERROR, socket, url_str);
     }
 
     int server_response_length = 300;
@@ -52,7 +67,7 @@ int startDownload(target_instance_t *targetP) {
     int received_len = lwip_recv(socket, server_reply , sizeof server_reply - 1, 0);
     if( received_len < 0 ){
         printf("recv failed\r\n");
-        download_error(targetP,RECEIVE_ERROR, socket);
+        download_error(targetP,RECEIVE_ERROR, socket, url_str);
     }
 
     if(!lwm2m_strncmp(server_reply, "HTTP/1.1 200 OK", 15) == 0){
@@ -61,10 +76,10 @@ int startDownload(target_instance_t *targetP) {
     	asd = server_reply + 9;
     	if(xatoi(&asd, &response_code) != 1) {
     		printf("Error reading Server response code\r\n");
-    		download_error(targetP,UNKNOWN_ERROR, socket);
+    		download_error(targetP,UNKNOWN_ERROR, socket, url_str);
     	}
-    	printf("Server Response status:%d\r\n", response_code);
-    	download_error(targetP, response_code, socket);
+    	printf("Server Response status:%ld\r\n", response_code);
+    	download_error(targetP, response_code, socket, url_str);
     }
     printf("Server responded with 200!\r\n");
     for(int i = 15 ; i < received_len ; i++) {
@@ -73,7 +88,7 @@ int startDownload(target_instance_t *targetP) {
 			asd = server_reply + i + 15;
 			if (xatoi(&asd, &payload_len) != 1) {
 				printf("Error reading Content-Length\r\n");
-				download_error(targetP, UNKNOWN_ERROR, socket);
+				download_error(targetP, UNKNOWN_ERROR, socket, url_str);
 			}
 			break;
 		}
@@ -84,7 +99,7 @@ int startDownload(target_instance_t *targetP) {
 
         if( received_len < 0 ){
             printf("recv failed\r\n");
-            download_error(targetP, RECEIVE_ERROR, socket);
+            download_error(targetP, RECEIVE_ERROR, socket, url_str);
         }
 
 
@@ -96,7 +111,7 @@ int startDownload(target_instance_t *targetP) {
   		if(get_usb_ready()) {
   			usb_write(server_reply, targetP->binary_filename, received_len);
   		} else {
-  			download_error(targetP, USB_ERROR, socket);
+  			download_error(targetP, USB_ERROR, socket, url_str);
   		}
 
         if( total_received_len >= payload_len ){
@@ -108,6 +123,7 @@ int startDownload(target_instance_t *targetP) {
     targetP->download_progress = 100;
     targetP->download_error = NO_ERROR;	
     lwip_close(socket);
+    lwm2m_free(url_str);
     vTaskDelete();
 
 }