Merge remote-tracking branch 'origin/aiim' into aiim

EmOne · Sep 12, 2024 · 834215c · 834215c
2 parents 3c72d0d + 62179cb
commit 834215c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/src/csp_io.c b/src/csp_io.c
@@ -98,7 +98,7 @@ void csp_send_direct(csp_id_t* idout, csp_packet_t * packet, csp_iface_t * route
 
 		local_found = 1;
 
-		/* Do not send back to same inteface (split horizon)
+		/* Do not send back to same interface (split horizon)
 		 * This check is is similar to that below, but faster */
 		if (iface == routed_from) {
 			continue;

diff --git a/src/csp_rdp.c b/src/csp_rdp.c
@@ -8,7 +8,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <endian.h>
+#include <portable_endian.h>
 
 #include <csp/csp.h>
 #include <csp/csp_debug.h>

diff --git a/src/csp_service_handler.c b/src/csp_service_handler.c
@@ -218,10 +218,6 @@ void csp_service_handler(csp_packet_t * packet) {
 			}
 			break;
 
-		case CSP_PING:
-			/* A ping means, just echo the packet, so no changes */
-			break;
-
 		case CSP_PS: {
 			packet->length = csp_ps_hook(packet);
 			if (packet->length == 0) {
@@ -275,12 +271,14 @@ void csp_service_handler(csp_packet_t * packet) {
 			break;
 		}
 
+	case CSP_PING:
+		/* A ping means, just echo the packet, so no changes */
 		default:
+		if (packet != NULL)
+		{
+			csp_sendto_reply(packet, packet, CSP_O_SAME);
+		}
 			csp_buffer_free(packet);
 			return;
 	}
-
-	if (packet != NULL) {
-		csp_sendto_reply(packet, packet, CSP_O_SAME);
-	}
 }
diff --git a/src/interfaces/csp_if_eth.c b/src/interfaces/csp_if_eth.c
@@ -3,7 +3,7 @@
 #include <csp/interfaces/csp_if_eth_pbuf.h>
 #include <csp/arch/csp_time.h>
 
-#include <endian.h>
+#include <portable_endian.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>