support enable_icmp

Author: yubo

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.0)
 
-PROJECT(ip_vs_ca C)
+project(ip_vs_ca C)
 
 execute_process(COMMAND uname -r
 	OUTPUT_VARIABLE KERNEL_RELEASE
@@ -13,8 +13,7 @@ find_path(KERNEL_SRCDIR Makefile PATHS
 message(STATUS "Kernel release: ${KERNEL_RELEASE}")
 message(STATUS "Kernel source: ${KERNEL_SRCDIR}")
 
-#set(CPACK_GENERATOR "RPM;DEB")
-set(CPACK_GENERATOR "RPM")
+set(CPACK_GENERATOR "RPM;DEB")
 set(CPACK_PACKAGE_NAME "ip_vs_ca")
 set(CPACK_PACKAGE_CONTACT "[email protected]")
 set(CPACK_PACKAGE_VENDOR "yubo.org")
@@ -35,11 +34,10 @@ set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
 set(CPACK_PACKAGE_RELOCATABLE "")
 include(CPack)
 
-
-ADD_CUSTOM_COMMAND(OUTPUT ChangeLog
+add_custom_command(OUTPUT ChangeLog
 	COMMAND git log --format='* %cd %aN%n- (%h) %s%d%n' --date=local | sed -r 's/[0-9]+:[0-9]+:[0-9]+ //' >> ${CMAKE_CURRENT_BINARY_DIR}/ChangeLog
 	COMMENT "export git log to ChangeLog")
 
-ADD_CUSTOM_TARGET(PKGFILES ALL DEPENDS ChangeLog)
+add_custom_target(PKGFILES ALL DEPENDS ChangeLog)
 
 add_subdirectory(src)

Makefile

@@ -38,7 +38,7 @@ insmod ./ip_vs_ca.ko
 ### build rpm/deb 
 ```shell
 cd build
-cmake ..
+cmake .. #or cmake -DENABLE_ICMP=1 ..
 make package
 rpm -ivh ip_vs_ca-`uname -r`-0.1.0.x86_64.rpm
 #or

README.md

@@ -1,19 +1,33 @@
 cmake_minimum_required(VERSION 3.0)
 
-ADD_DEFINITIONS(-g -O2 -fsigned-char -freg-struct-return -Wall -W -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Winline -Werror)
+add_definitions(-g -O2 -fsigned-char -freg-struct-return -Wall -W -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Winline -Werror)
+
+
+if(DEFINED ENABLE_ICMP)
+	message(STATUS "DEFINED ENABLE_ICMP=${ENABLE_ICMP}")
+	set(KBUILDFILE "${CMAKE_CURRENT_SOURCE_DIR}/Kbuild.icmp")
+else()
+	set(KBUILDFILE "${CMAKE_CURRENT_SOURCE_DIR}/Kbuild.default")
+endif()
+
+
+add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/Kbuild
+	COMMAND cp -f ${KBUILDFILE} "${CMAKE_CURRENT_SOURCE_DIR}/Kbuild"
+	DEPENDS ${KBUILDFILE}
+	COMMENT "Create Kbuild")
 
 # Build the module
 
-ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/ip_vs_ca.ko
-	COMMAND make -C ${KERNEL_SRCDIR} M=${CMAKE_CURRENT_SOURCE_DIR}
-	DEPENDS ca_core.c ca_conn.c ca_ctl.c ca_proto.c utils.c
+add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/ip_vs_ca.ko
+	COMMAND make -C ${KERNEL_SRCDIR} ${CMAKE_C_FLAGS} M=${CMAKE_CURRENT_SOURCE_DIR} modules
+	DEPENDS ca_core.c ca_conn.c ca_ctl.c ca_proto.c utils.c Kbuild
 	COMMENT "Building ip_vs_ca.ko")
 
-ADD_CUSTOM_TARGET(KMODFILES ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/ip_vs_ca.ko)
+add_custom_target(KMODFILES ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/ip_vs_ca.ko)
 
 
 # Installation of the module
-SET(module_install_path /lib/modules/${KERNEL_RELEASE}/kernel/extra/ip_vs_ca)
+set(module_install_path /lib/modules/${KERNEL_RELEASE}/kernel/extra/ip_vs_ca)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ip_vs_ca.ko
         DESTINATION ${module_install_path}
         PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)

src/CMakeLists.txt

@@ -1,6 +1,7 @@
 ip_vs_ca-objs := ca_core.o ca_conn.o ca_ctl.o ca_proto.o utils.o
 obj-m += ip_vs_ca.o
+ccflags-y := -DIP_VS_CA_ICMP
 
 #hostprogs-y := udpd
 #always := $(hostprogs-y)
-HOSTCFLAGS_udpd.o += -I$(objtree)/usr/include
+#HOSTCFLAGS_udpd.o += -I$(objtree)/usr/include

src/Kbuild

@@ -0,0 +1,7 @@
+ip_vs_ca-objs := ca_core.o ca_conn.o ca_ctl.o ca_proto.o utils.o
+obj-m += ip_vs_ca.o
+ccflags-y := 
+
+#hostprogs-y := udpd
+#always := $(hostprogs-y)
+#HOSTCFLAGS_udpd.o += -I$(objtree)/usr/include

src/Kbuild.default

@@ -0,0 +1,7 @@
+ip_vs_ca-objs := ca_core.o ca_conn.o ca_ctl.o ca_proto.o utils.o
+obj-m += ip_vs_ca.o
+ccflags-y := -DIP_VS_CA_ICMP
+
+#hostprogs-y := udpd
+#always := $(hostprogs-y)
+#HOSTCFLAGS_udpd.o += -I$(objtree)/usr/include

src/Kbuild.icmp

@@ -199,13 +199,15 @@ struct ip_vs_ca_stat_mib {
 
 struct syscall_links {
 	asmlinkage int (*getpeername) (int, struct sockaddr *, int *);
+#ifdef IP_VS_CA_ICMP
 	asmlinkage int (*accept4) (int, struct sockaddr *, int *, int);
 	asmlinkage int (*recvfrom) (int fd, void *ubuf, size_t size,
 			unsigned flags, struct sockaddr *addr, int *addr_len);
 	asmlinkage int (*recvmsg) (int fd, struct msghdr *msg,
 			unsigned int flags);
 	asmlinkage int (*recvmmsg) (int fd, struct mmsghdr *mmsg,
 			unsigned int vlen, unsigned int flags, struct timespec *timeout);
+#endif
 };
 
 struct ip_vs_ca_protocol {