Bug fix

Author: avengermsoft

src/compat/Kbuild.include

@@ -101,3 +101,11 @@ endif
 ifneq ($(shell grep -s -F "\#define LINUX_PACKAGE_ID \" Debian " "$(CURDIR)/include/generated/package.h"),)
 ccflags-y += -DISDEBIAN
 endif
+
+ifeq ($(wildcard $(srctree)/include/linux/kstrtox.h),)
+ccflags-y += -I$(kbuild-dir)/compat/kstrtox/include
+endif
+
+ifeq ($(wildcard $(srctree)/include/linux/sprintf.h),)
+ccflags-y += -I$(kbuild-dir)/compat/sprintf/include
+endif

src/compat/kstrtox/include/linux/kstrtox.h

@@ -0,0 +1 @@
+#include <linux/kernel.h>

src/compat/sprintf/include/linux/sprintf.h

@@ -0,0 +1 @@
+#include <linux/kernel.h>

src/device.h

@@ -12,6 +12,7 @@
 #include "peerlookup.h"
 #include "cookie.h"
 #include "magic_header.h"
+#include "messages.h"
 
 #include <linux/types.h>
 #include <linux/netdevice.h>
@@ -75,4 +76,13 @@ int wg_device_init(void);
 void wg_device_uninit(void);
 int wg_device_handle_post_config(struct wg_device *wg);
 
+static inline bool client_id_asc_coexist(struct wg_device *wg)
+{
+	return
+		wg->headers[MSGIDX_HANDSHAKE_INIT].start <= 0xFF &&
+		wg->headers[MSGIDX_HANDSHAKE_RESPONSE].start <= 0xFF &&
+		wg->headers[MSGIDX_HANDSHAKE_COOKIE].start <= 0xFF &&
+		wg->headers[MSGIDX_TRANSPORT].start <= 0xFF;
+}
+
 #endif /* _WG_DEVICE_H */

src/magic_header.h

@@ -13,5 +13,6 @@ int mh_genspec(struct magic_header *mh, char *desc, size_t buflen);
 
 bool mh_validate(__le32 received, struct magic_header* mh);
 u32 mh_genheader(struct magic_header* mh);
+u32 wg_get_random_u32_inclusive(u32 floor, u32 ceil);
 
 #endif

src/messages.h

@@ -6,8 +6,6 @@
 #ifndef _WG_MESSAGES_H
 #define _WG_MESSAGES_H
 
-#include "device.h"
-
 #include <zinc/curve25519.h>
 #include <zinc/chacha20poly1305.h>
 #include <zinc/blake2s.h>
@@ -134,15 +132,6 @@ enum message_size {
 	MESSAGE_MAX_SIZE = 65535
 };
 
-static inline bool client_id_asc_coexist(struct wg_device *wg)
-{
-	return
-		wg->headers[MSGIDX_HANDSHAKE_INIT].start <= 0xFF &&
-		wg->headers[MSGIDX_HANDSHAKE_RESPONSE].start <= 0xFF &&
-		wg->headers[MSGIDX_HANDSHAKE_COOKIE].start <= 0xFF &&
-		wg->headers[MSGIDX_TRANSPORT].start <= 0xFF;
-}
-
 #define SKB_TYPE_LE32(skb, wg) ((((struct message_header *)(skb)->data)->type) & (!client_id_asc_coexist(wg) ? 0xFFFFFFFF : cpu_to_le32(0xFF)))
 #define SKB_CLEAR_TYPE(skb, wg) ((((struct message_header *)(skb)->data)->type) &= (!client_id_asc_coexist(wg) ? 0xFFFFFFFF : cpu_to_le32(0xFF)))
 

src/send.c

@@ -70,7 +70,7 @@ static void wg_packet_send_handshake_initiation(struct wg_peer *peer)
 			buffer = kzalloc(wg->jmax, GFP_KERNEL);
 
 			while (junk_packet_count-- > 0) {
-				junk_packet_size = (u16) get_random_u32_inclusive(wg->jmin, wg->jmax);
+				junk_packet_size = (u16) wg_get_random_u32_inclusive(wg->jmin, wg->jmax);
 
 				get_random_bytes(buffer, junk_packet_size);
 				get_random_bytes(&ds, 1);