From 75fdf912a570eaa0e605317e9d6092936fb3fabe Mon Sep 17 00:00:00 2001
From: chn <897331845@qq.com>
Date: Fri, 31 Jul 2020 20:21:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E8=A6=81=E6=98=AF=E6=94=B9=E4=BA=86Ma?=
 =?UTF-8?q?kefile=E9=80=82=E9=85=8D=E6=96=B0=E7=9A=84=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=EF=BC=8C=E6=AC=A1=E8=A6=81=E6=98=AF=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E4=BA=86=E4=B8=80=E4=B8=A2=E4=B8=A2=E5=86=99=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile       | 23 +++++++++++++----------
 src/common.h   |  4 +++-
 src/xmurp-ua.c |  6 ++----
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index a821b4e..c201414 100644
--- a/Makefile
+++ b/Makefile
@@ -6,16 +6,6 @@ PKG_RELEASE:=99
  
 include $(INCLUDE_DIR)/package.mk
 
-EXTRA_CFLAGS:= \
-	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(EXTRA_KCONFIG)))) \
-	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(EXTRA_KCONFIG)))) \
-	-DVERSION="\"\\\"$(PKG_RELEASE)\\\"\"" --verbose
-
-MAKE_OPTS:=$(KERNEL_MAKE_FLAGS) \
-	SUBDIRS="$(PKG_BUILD_DIR)" \
-	EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
-	CONFIG_XMURP_UA=m
-
 define KernelPackage/xmurp-ua
 	SUBMENU:=Other modules
 	TITLE:=xmurp-ua
@@ -24,6 +14,19 @@ define KernelPackage/xmurp-ua
 	KCONFIG:=
 endef
 
+EXTRA_KCONFIG:= \
+	CONFIG_XMURP_UA=m
+
+EXTRA_CFLAGS:= \
+	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(EXTRA_KCONFIG)))) \
+	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(EXTRA_KCONFIG)))) \
+	-DVERSION=$(PKG_RELEASE) --verbose
+
+MAKE_OPTS:=$(KERNEL_MAKE_FLAGS) \
+	M="$(PKG_BUILD_DIR)" \
+	EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
+	$(EXTRA_KCONFIG)
+
 define Build/Compile
 	$(MAKE) -C "$(LINUX_DIR)" $(MAKE_OPTS) modules
 endef
diff --git a/src/common.h b/src/common.h
index b816e09..6ed4df9 100644
--- a/src/common.h
+++ b/src/common.h
@@ -16,7 +16,9 @@
 #include <linux/mutex.h>
 
 typedef _Bool bool;
-#define static_assert _Static_assert
+#ifndef static_assert
+    #define static_assert _Static_assert
+#endif
 
 const static unsigned char* str_uaBegin = "User-Agent: ";
 const static unsigned char* str_uaEnd = "\r\n";
diff --git a/src/xmurp-ua.c b/src/xmurp-ua.c
index 079beb5..dd03b9f 100644
--- a/src/xmurp-ua.c
+++ b/src/xmurp-ua.c
@@ -30,9 +30,7 @@ static int __init hook_init(void)
 
 	rkpm = rkpManager_new();
 
-	memcpy(str_uaRkp, "RKP/", 4);
-	memcpy(str_uaRkp + 4, VERSION, 2);
-	memcpy(str_uaRkp + 6, ".0", 3);
+	sprintf(str_uaRkp, "RKP/%d.0", VERSION);
 
 	nfho[0].hooknum = NF_INET_LOCAL_IN;
 	nfho[1].hooknum = NF_INET_LOCAL_OUT;
@@ -49,7 +47,7 @@ static int __init hook_init(void)
     	ret = nf_register_hooks(nfho, 3);
 #endif
 
-	printk("rkp-ua: Started, version %s\n", VERSION);
+	printk("rkp-ua: Started, version %d\n", VERSION);
 	printk("rkp-ua: nf_register_hook returnd %d.\n", ret);
 	printk("rkp-ua: autocapture=%c, mark_capture=0x%x, mark_ack=0x%x\n",
 			'n' + autocapture * ('y' - 'n'), mark_capture, mark_ack);