free5gc · tim-ywliu · Nov 18, 2022 · Nov 18, 2022
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,11 @@
 *.mod
 *.mod.c
 Module.symvers
-modules.order
+modules.order
+
+# Ctags
+tags
+
+# VSCode
+.vscode
+
diff --git a/Makefile b/Makefile
@@ -4,8 +4,6 @@ ifneq (,$(findstring 1, $(RHEL8)))
 	RHEL8FLAG := -DRHEL8
 endif
 
-PWD := $(shell pwd) 
-
 CONFIG_MODULE_SIG=n
 MODULE_NAME = gtp5g
 MOD_KERNEL_PATH := kernel/drivers/net
@@ -36,13 +34,45 @@ MY_CFLAGS += -g -DDEBUG $(RHEL8FLAG)
 EXTRA_CFLAGS += -Wno-misleading-indentation -Wuninitialized
 CC += ${MY_CFLAGS}
 
-obj-m := $(MODULE_NAME).o
-gtp5g-y += main.o 
-gtp5g-y += api_version.o
-gtp5g-y += log.o util.o
-gtp5g-y += dev.o genl.o net.o link.o proc.o
-gtp5g-y += gtp.o pktinfo.o hash.o seid.o encap.o
-gtp5g-y += pdr.o far.o qer.o bar.o urr.o genl.o genl_pdr.o genl_far.o genl_qer.o genl_bar.o genl_urr.o genl_version.o genl_report.o
+EXTRA_CFLAGS += -I $(PWD)/include
+
+5G_MOD := src/gtp5g.o
+
+5G_LOG	:= src/log.o 
+
+5G_UTIL	:= src/util.o
+
+5G_GTPU	:= src/gtpu/dev.o \
+			src/gtpu/encap.o \
+			src/gtpu/gtp.o \
+			src/gtpu/hash.o \
+			src/gtpu/link.o \
+			src/gtpu/net.o \
+			src/gtpu/pktinfo.o
+
+5G_GENL := src/genl/genl.o \
+			src/genl/genl_version.o \
+			src/genl/genl_pdr.o \
+			src/genl/genl_far.o \
+			src/genl/genl_qer.o \
+			src/genl/genl_urr.o \
+			src/genl/genl_report.o \
+			src/genl/genl_bar.o
+
+5G_PFCP := src/pfcp/api_version.o \
+			src/pfcp/pdr.o \
+			src/pfcp/far.o \
+			src/pfcp/qer.o \
+			src/pfcp/urr.o \
+			src/pfcp/bar.o \
+			src/pfcp/seid.o
+
+5G_PROC := src/proc.o
+
+# Build files 
+obj-m += $(MODULE_NAME).o
+$(MODULE_NAME)-objs := $(5G_MOD) $(5G_LOG) $(5G_UTIL) $(5G_GTPU) \
+						$(5G_GENL) $(5G_PFCP) $(5G_PROC) 
 
 default: module
 

diff --git a/api_version.h → include/api_version.h b/api_version.h → include/api_version.h
diff --git a/bar.h → include/bar.h b/bar.h → include/bar.h
diff --git a/common.h → include/common.h b/common.h → include/common.h
diff --git a/dev.h → include/dev.h b/dev.h → include/dev.h
diff --git a/encap.h → include/encap.h b/encap.h → include/encap.h
diff --git a/far.h → include/far.h b/far.h → include/far.h
diff --git a/genl.h → include/genl.h b/genl.h → include/genl.h
diff --git a/genl_bar.h → include/genl_bar.h b/genl_bar.h → include/genl_bar.h
diff --git a/genl_far.h → include/genl_far.h b/genl_far.h → include/genl_far.h
diff --git a/genl_pdr.h → include/genl_pdr.h b/genl_pdr.h → include/genl_pdr.h
diff --git a/genl_qer.h → include/genl_qer.h b/genl_qer.h → include/genl_qer.h
diff --git a/genl_report.h → include/genl_report.h b/genl_report.h → include/genl_report.h
diff --git a/genl_urr.h → include/genl_urr.h b/genl_urr.h → include/genl_urr.h
diff --git a/genl_version.h → include/genl_version.h b/genl_version.h → include/genl_version.h
diff --git a/gtp.h → include/gtp.h b/gtp.h → include/gtp.h
diff --git a/hash.h → include/hash.h b/hash.h → include/hash.h
diff --git a/link.h → include/link.h b/link.h → include/link.h
diff --git a/log.h → include/log.h b/log.h → include/log.h
diff --git a/net.h → include/net.h b/net.h → include/net.h
diff --git a/pdr.h → include/pdr.h b/pdr.h → include/pdr.h
diff --git a/pktinfo.h → include/pktinfo.h b/pktinfo.h → include/pktinfo.h
diff --git a/proc.h → include/proc.h b/proc.h → include/proc.h
diff --git a/qer.h → include/qer.h b/qer.h → include/qer.h
diff --git a/report.h → include/report.h b/report.h → include/report.h
diff --git a/seid.h → include/seid.h b/seid.h → include/seid.h
diff --git a/urr.h → include/urr.h b/urr.h → include/urr.h
diff --git a/util.h → include/util.h b/util.h → include/util.h
diff --git a/genl.c → src/genl/genl.c b/genl.c → src/genl/genl.c
diff --git a/genl_bar.c → src/genl/genl_bar.c b/genl_bar.c → src/genl/genl_bar.c
diff --git a/genl_far.c → src/genl/genl_far.c b/genl_far.c → src/genl/genl_far.c
diff --git a/genl_pdr.c → src/genl/genl_pdr.c b/genl_pdr.c → src/genl/genl_pdr.c
diff --git a/genl_qer.c → src/genl/genl_qer.c b/genl_qer.c → src/genl/genl_qer.c
diff --git a/genl_report.c → src/genl/genl_report.c b/genl_report.c → src/genl/genl_report.c
diff --git a/genl_urr.c → src/genl/genl_urr.c b/genl_urr.c → src/genl/genl_urr.c
diff --git a/genl_version.c → src/genl/genl_version.c b/genl_version.c → src/genl/genl_version.c
diff --git a/main.c → src/gtp5g.c b/main.c → src/gtp5g.c
diff --git a/dev.c → src/gtpu/dev.c b/dev.c → src/gtpu/dev.c
diff --git a/encap.c → src/gtpu/encap.c b/encap.c → src/gtpu/encap.c
diff --git a/gtp.c → src/gtpu/gtp.c b/gtp.c → src/gtpu/gtp.c
diff --git a/hash.c → src/gtpu/hash.c b/hash.c → src/gtpu/hash.c
diff --git a/link.c → src/gtpu/link.c b/link.c → src/gtpu/link.c
diff --git a/net.c → src/gtpu/net.c b/net.c → src/gtpu/net.c
diff --git a/pktinfo.c → src/gtpu/pktinfo.c b/pktinfo.c → src/gtpu/pktinfo.c
diff --git a/log.c → src/log.c b/log.c → src/log.c
diff --git a/api_version.c → src/pfcp/api_version.c b/api_version.c → src/pfcp/api_version.c
diff --git a/bar.c → src/pfcp/bar.c b/bar.c → src/pfcp/bar.c
diff --git a/far.c → src/pfcp/far.c b/far.c → src/pfcp/far.c
diff --git a/pdr.c → src/pfcp/pdr.c b/pdr.c → src/pfcp/pdr.c
diff --git a/qer.c → src/pfcp/qer.c b/qer.c → src/pfcp/qer.c
diff --git a/seid.c → src/pfcp/seid.c b/seid.c → src/pfcp/seid.c
diff --git a/urr.c → src/pfcp/urr.c b/urr.c → src/pfcp/urr.c
diff --git a/proc.c → src/proc.c b/proc.c → src/proc.c
@@ -691,6 +691,7 @@ int create_proc(void)
 
 void remove_proc()
 {
+    remove_proc_entry("urr", proc_gtp5g);
     remove_proc_entry("qer", proc_gtp5g);
     remove_proc_entry("far", proc_gtp5g);
     remove_proc_entry("pdr", proc_gtp5g);

diff --git a/util.c → src/util.c b/util.c → src/util.c