From 984c573ae62423a4c0f4f14bfba78ee4508b01b1 Mon Sep 17 00:00:00 2001
From: joran2738 <101818067+joran2738@users.noreply.github.com>
Date: Mon, 13 Nov 2023 13:43:15 +0100
Subject: [PATCH] changes to udp code

now working as intended
---
 project/Core/Inc/UDP_broadcast.h | 1 +
 project/Core/Src/UDP_broadcast.c | 7 ++++---
 project/Core/Src/main.c          | 3 +--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/project/Core/Inc/UDP_broadcast.h b/project/Core/Inc/UDP_broadcast.h
index bfbe66d..30cb820 100644
--- a/project/Core/Inc/UDP_broadcast.h
+++ b/project/Core/Inc/UDP_broadcast.h
@@ -16,6 +16,7 @@
 #include "lwip.h"
 #define LOGGER_LEVEL_ALL
 #include "log.h"
+#include "udp.h"
 
 // Defines used by owner details error handler
 #define SOD_NAME "set_owner_details_name"
diff --git a/project/Core/Src/UDP_broadcast.c b/project/Core/Src/UDP_broadcast.c
index fcc699e..9009fbe 100644
--- a/project/Core/Src/UDP_broadcast.c
+++ b/project/Core/Src/UDP_broadcast.c
@@ -282,7 +282,7 @@ static void udp_receive_callback(void *arg, struct udp_pcb *connection, struct p
 		len = p->tot_len;
 		p_data = pbuf_alloc(PBUF_TRANSPORT, sizeof(reply_str), PBUF_RAM);
 		if (p_data == NULL){
-			LOG_WARN(TAG,"udp_receive_callback: unable to allocated data buffer for reply");
+			LOG_WARN(TAG,"udp_receive_callback: unable to allocate data buffer for reply");
 		}
 		else if(len <= MAX_DATA_SIZE){
 			for(i = 0; i < len; i++) {
@@ -291,10 +291,11 @@ static void udp_receive_callback(void *arg, struct udp_pcb *connection, struct p
 
 			LOG_INFO(TAG,"udp_receive_callback: received data from %s at port: %d: %s",source_ip_str,port,data);
 			if(strcmp(data,UDP_QUESTION1) == 0){
-				*((uint32_t*)p_data->payload) = reply_str;
+				p_data->payload = reply_str;
 				p_data->len = sizeof(reply_str);
 				p_data->tot_len = sizeof(reply_str);
-				udp_sendto(connection, p_data, addr, port);
+				udp_sendto(connection, p_data, addr, 64000); /*was using the sending port of the pc,
+				this is not the port that Qt is listening to*/
 				LOG_INFO(TAG,"tried to reply to %s at port: %d: %s",source_ip_str,port,reply_str);
 			}
 
diff --git a/project/Core/Src/main.c b/project/Core/Src/main.c
index 48d20c3..ae71e4c 100644
--- a/project/Core/Src/main.c
+++ b/project/Core/Src/main.c
@@ -25,7 +25,6 @@
 #define LOGGER_LEVEL_ALL
 #include "log.h"
 #include "UDP_broadcast.h"
-#include "udp.h"
 /* USER CODE END Includes */
 
 /* Private typedef -----------------------------------------------------------*/
@@ -114,7 +113,7 @@ int main(void)
     owner_details_t owner;
     init_UDP_server();
 
-  	if(!set_owner_details(&owner, "joran", "vn")){
+  	if(!set_owner_details(&owner, "Joran", "Van Nieuwenhoven")){
   		LOG_DEBUG(TAG,"error");;
   	}
   	LOG_DEBUG(TAG,"%s",get_owner_details_reply(&owner));