修复CI编译错误.

.gitlab-ci.yml

@@ -7,6 +7,22 @@ variables:
 
 stages:
 - build
+- test
+
+google_test:
+  stage: test
+  script:
+    - cp -r test/sample_pcap /tmp
+    - ulimit -c 0
+    - cp /builds/MESA_framework/mesa_jump_layer/build/test/gtest_jump_layer /tmp/
+    - mkdir -p /opt/MESA/lib
+    - cp /builds/MESA_framework/mesa_jump_layer/build/src/libMESA_jump_layer.so /opt/MESA/lib/
+    - echo "/opt/MESA/lib" >> /etc/ld.so.conf
+    - ldconfig    
+    - cd /tmp 
+    - ./gtest_jump_layer
+  tags:
+  - share    
 
 .build_by_travis:
   before_script:
@@ -26,6 +42,10 @@ branch_build_debug:
   extends: .build_by_travis
   variables:
     BUILD_TYPE: Debug
+  artifacts:
+    paths:
+    - /builds/MESA_framework/mesa_jump_layer/build/test/gtest_jump_layer
+    - /builds/MESA_framework/mesa_jump_layer/build/src/libMESA_jump_layer.so
   except:
     - /^develop.*$/i
     - /^master.*$/i
@@ -36,6 +56,10 @@ branch_build_release:
   variables:
     BUILD_TYPE: RelWithDebInfo
   extends: .build_by_travis
+  artifacts:
+    paths:
+    - /builds/MESA_framework/mesa_jump_layer/build/test/gtest_jump_layer
+    - /builds/MESA_framework/mesa_jump_layer/build/src/libMESA_jump_layer.so  
   except:
     - /^develop.*$/i
     - /^master.*$/i
@@ -55,6 +79,8 @@ develop_build_debug:
   artifacts:
     name: MESA_jump_layer-$CI_COMMIT_REF_NAME-debug"
     paths:
+      - /builds/MESA_framework/mesa_jump_layer/build/test/gtest_jump_layer
+      - /builds/MESA_framework/mesa_jump_layer/build/src/libMESA_jump_layer.so      
       - build/*.rpm
   only:
     - /^develop.*$/i
@@ -75,6 +101,8 @@ develop_build_release:
     name: MESA_jump_layer-$CI_COMMIT_REF_NAME-release"
     paths:
       - build/*.rpm
+      - /builds/MESA_framework/mesa_jump_layer/build/test/gtest_jump_layer
+      - /builds/MESA_framework/mesa_jump_layer/build/src/libMESA_jump_layer.so        
   only:
     - /^develop.*$/i
     - /^master.*$/i
@@ -89,9 +117,11 @@ release_build_debug:
     PULP3_DIST_NAME: framework-stable-x86_64.el7
   extends: .build_by_travis
   artifacts:
-    name: MESA_jump_layer-$CI_COMMIT_REF_NAME-release"
+    name: MESA_jump_layer-$CI_COMMIT_REF_NAME-debug"
     paths:
       - build/*.rpm
+      - /builds/MESA_framework/mesa_jump_layer/build/test/gtest_jump_layer
+      - /builds/MESA_framework/mesa_jump_layer/build/src/libMESA_jump_layer.so        
   only:
     - tags
 
@@ -110,5 +140,7 @@ release_build_release:
     name: MESA_jump_layer-$CI_COMMIT_REF_NAME-release"
     paths:
       - build/*.rpm
+      - /builds/MESA_framework/mesa_jump_layer/build/test/gtest_jump_layer
+      - /builds/MESA_framework/mesa_jump_layer/build/src/libMESA_jump_layer.so        
   only:
     - tags

CMakeLists.txt

@@ -34,23 +34,12 @@ elseif(ASAN_OPTION MATCHES "THREAD")
 endif()
 # end of for ASAN
 
-include_directories(${PROJECT_SOURCE_DIR}/include/)
+add_subdirectory(./vendor)
+add_subdirectory(./src)
+add_subdirectory(./test)
 
-file(GLOB SRC
-    "src/*.c"
-    "src/*.cpp"
-)
+#install(TARGETS ${lib_name}_shared LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib COMPONENT LIBRARY)
 
-# Shared Library Output
-add_library(${lib_name}_shared SHARED ${SRC})
-target_link_libraries(${lib_name}_shared m)
-if(DEFINED MESA_SHARED_INSTALL_DIR)
-	set_target_properties(${lib_name}_shared PROPERTIES OUTPUT_NAME ${lib_name} LIBRARY_OUTPUT_DIRECTORY ${MESA_SHARED_INSTALL_DIR})
-else()
-	set_target_properties(${lib_name}_shared PROPERTIES OUTPUT_NAME ${lib_name})
-endif()
-
-install(TARGETS ${lib_name}_shared LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib COMPONENT LIBRARY)
 install(FILES inc/MESA_jump_layer.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/MESA COMPONENT HEADER)
 
 include(Package)

inc/MESA_jump_layer.h

@@ -13,18 +13,45 @@ extern "C" {
 
 const char *MESA_jump_layer_get_last_error(void);
 
+
 /*
-	The raw_layer_type and expect_layer_type refer to sapp_base.h->enum addr_type_t
+	CHN : <20><><EFBFBD>ݰ<EFBFBD>ͷ<EFBFBD><CDB7>ƫ<EFBFBD>ƺ<EFBFBD><C6BA><EFBFBD>.
+
+	<09><><EFBFBD><EFBFBD>:
+		raw_data: <20><>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD>ͷ<EFBFBD><CDB7>ָ<EFBFBD><D6B8>;
+		raw_layer_type: <20><>ǰ<EFBFBD><C7B0><EFBFBD>ĵ<EFBFBD>ַ<EFBFBD><D6B7><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD>: enum addr_type_t ;
+		expect_layer_type: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ת<EFBFBD><D7AA><EFBFBD>ĵ<EFBFBD>ַ<EFBFBD><D6B7><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD>:  enum addr_type_t ;
+
+	<09><><EFBFBD><EFBFBD>ֵ:
+		NULL: <20>޴˵<DEB4>ַ;
+		NON-NULL: <20><>Ӧ<EFBFBD><D3A6><EFBFBD><EFBFBD>ͷ<EFBFBD><CDB7><EFBFBD><EFBFBD>ַ.
+
+	<09><><EFBFBD><EFBFBD>:
+		<09><><EFBFBD>赱ǰ<E8B5B1><C7B0>ΪEthernet, <20><>ʼ<EFBFBD><CABC>ͷ<EFBFBD><CDB7>ַΪthis_layer_hdr, <20><><EFBFBD><EFBFBD>ת<EFBFBD><D7AA>IPv6<76><36>ͷ<EFBFBD><CDB7>:
+		struct ip6_hdr *ip6_header;
+		ip6_header = MESA_net_jump_to_layer(this_layer_hdr, ADDR_TYPE_MAC, ADDR_TYPE_IPV6);
 */
 const void *MESA_jump_layer(const void *raw_data,  int raw_layer_type, int expect_layer_type);
 
+/*
+	MESA_jump_layer_greedy<64><79>MESA_jump_layer<65><72><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
+	   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƕ<EFBFBD><C7B6>Э<EFBFBD><D0AD><EFBFBD><EFBFBD>˵,
+	       MESA_jump_layer<65><72>ת<EFBFBD><D7AA><EFBFBD><EFBFBD>һ<EFBFBD><D2BB>expect_layer_type;
+	       MESA_jump_layer_greedy<64><79>ת<EFBFBD><D7AA><EFBFBD><EFBFBD><EFBFBD>ڲ<EFBFBD><DAB2><EFBFBD>expect_layer_type; 
+*/
 const void *MESA_jump_layer_greedy(const void *raw_data, int raw_layer_type, int expect_layer_type);
 
 
-const char *MESA_jump_layer_ipv4_ntop(const struct ip *ip4_hdr, char *out_buf, int buf_len );
 
+/* <20><>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǰ<EFBFBD>Ľӿ<C4BD><D3BF><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD>ͬ<EFBFBD><CDAC> */
+const void *MESA_net_jump_to_layer(const void *raw_data,  int raw_layer_type, int expect_layer_type);
+const void *MESA_net_jump_to_layer_greedy(const void *raw_data, int raw_layer_type, int expect_layer_type);
+
+
+
+const char *MESA_jump_layer_ipv4_ntop(const struct ip *ip4_hdr, char *out_buf, int buf_len );
 const char *MESA_jump_layer_ipv6_ntop(const struct ip6_hdr *ip6_hdr, char *out_buf, int buf_len);
 
 #ifdef __cplusplus
 }
-#endif
+#endif

src/CMakeLists.txt

@@ -0,0 +1,25 @@
+cmake_minimum_required(VERSION 2.8)
+
+set(MESA_SDK_PREFIX "/opt/MESA" CACHE STRING "MESA Framework Prefix")
+
+include_directories(${MESA_SDK_PREFIX}/include)
+include_directories(${MESA_SDK_PREFIX}/include/MESA)
+include_directories(${MESA_SDK_PREFIX}/include/MESA/include)
+include_directories(${MESA_SDK_PREFIX}/include/MESA/stream_inc)
+
+include_directories(${PROJECT_SOURCE_DIR}/include/)
+
+LINK_DIRECTORIES(/opt/MESA/lib)
+
+add_definitions(-D_BSD_SOURCE -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H)
+add_definitions(-DSAPP_V4=1)
+
+add_definitions(-fPIC)
+add_definitions(-std=c++11)
+
+add_library(${lib_name} SHARED MESA_jump_layer.cpp)		
+target_link_libraries(${lib_name} m)
+
+
+install(FILES ${CMAKE_BINARY_DIR}/src/libMESA_jump_layer.so DESTINATION ${CMAKE_INSTALL_PREFIX}/lib COMPONENT LIBRARY)
+

src/MESA_jump_layer.cpp

@@ -290,6 +290,10 @@ static int gtp_jump_to_layer(const char *raw_data,  int raw_layer_type, int expe
 		return -1;
 	}
 
+	if(skip_len < 0){
+		return -1;
+	}
+
 	return gtp_hdr_len + skip_len;
 }
 
@@ -425,6 +429,10 @@ static int l2tp_jump_to_layer(const char *raw_data,  int raw_layer_type, int exp
 			skip_len = ipv6_jump_to_layer((char *)next_layer_hdr, __ADDR_TYPE_IP_PAIR_V6, expect_layer_type);		
 		}
 	}
+
+	if(skip_len < 0){
+		return -1;
+	}
 	
 	return l2tp_hdr_len + skip_len;
 }
@@ -1020,6 +1028,10 @@ static int mpls_jump_to_layer(const char *raw_data,  int raw_layer_type, int exp
 		}
 	}
 
+	if(skip_len < 0){
+		return -1;
+	}
+
 	return skip_len + mpls_layer_len;
 }
 
@@ -1332,6 +1344,11 @@ const void *MESA_jump_layer(const void *raw_data,  int raw_layer_type, int expec
 	return ((const char *)raw_data + ret);
 }
 
+const void *MESA_net_jump_to_layer(const void *raw_data,  int raw_layer_type, int expect_layer_type)
+{
+	return MESA_jump_layer(raw_data, raw_layer_type, expect_layer_type);
+}
+
 /*
 	<09><>MESA_jump_layer()<29><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
 		MESA_jump_layer()<29><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>㿪ʼ, <20>ҵ<EFBFBD><D2B5><EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>IJ<EFBFBD><C4B2><EFBFBD><EFBFBD>˳<EFBFBD>;
@@ -1425,6 +1442,11 @@ done:
 	return success_layer;
 }
 
+const void *MESA_net_jump_to_layer_greedy(const void *raw_data, int raw_layer_type, int expect_layer_type)
+{
+	return MESA_jump_layer_greedy(raw_data, raw_layer_type, expect_layer_type);
+}
+
 /* ģ<><C4A3>tcpdump<6D><70>ʽ:   192.168.40.137.22 > 192.168.36.40.49429  */
 const char *MESA_jump_layer_ipv4_ntop(const struct ip *ip4_hdr, char *out_buf, int buf_len )
 {

test/CMakeLists.txt

@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 2.8)
+
+include_directories(${CMAKE_SOURCE_DIR}/inc)
+include_directories(${MESA_SDK_PREFIX}/include)
+include_directories(${MESA_SDK_PREFIX}/include/MESA)
+
+
+add_definitions(-D_BSD_SOURCE -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H)
+add_definitions(-fPIC -std=c++11)
+LINK_DIRECTORIES(/opt/MESA/lib)
+LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/src)
+
+add_executable(gtest_jump_layer gtest_jump_layer.cpp)
+target_link_libraries(gtest_jump_layer pcap gtest-static MESA_jump_layer)
+
+

test/Makefile

@@ -1,2 +1,9 @@
+all: test_jump_layer gtest_jump_layer 
+
+CFLAGS = -g -Wall -fPIC -std=c++11 -DSAPP_V4=1 -D_XOPEN_SOURCE
+
 test_jump_layer:test_jump_layer.c
 	gcc -g -o $@ test_jump_layer.c -D_GNU_SOURCE -L/opt/MESA/lib -lMESA_jump_layer -I ../inc -I/opt/MESA/include/MESA -l pcap
+
+gtest_jump_layer:gtest_jump_layer.cpp
+	g++ -g -o $@ $^ $(CFLAGS) -D_GNU_SOURCE -L/opt/MESA/lib -lMESA_jump_layer -I ../inc -I/opt/MESA/include/MESA -lpcap -lgtest -lpthread

test/test_jump_layer.c

@@ -11,6 +11,9 @@ static char *g_input_pcap_name;
 static char *g_input_bpf_string;
 static struct bpf_program g_bpf_filter;
 
+static int g_raw_input_layer_type = (int )ADDR_TYPE_MAC;
+static int g_expect_layer_type = (int )ADDR_TYPE_IPV4;
+
 static void usage(const char *prog)
 {
 	printf("Usage:\n");
@@ -59,39 +62,109 @@ static int pcap_init(void)
 	return 0;
 }
 
-static void _pcap_pkt_handle(u_char *user, const struct pcap_pkthdr *hdr, const u_char *data)
+static void _jump_from_udp(const void *uhdr)
+{
+	const void *next_hdr;
+	
+	next_hdr = MESA_jump_layer(uhdr, ADDR_TYPE_UDP, ADDR_TYPE_GPRS_TUNNEL);
+	if(next_hdr){
+		printf("bingo! jump to gtp from udp succ!\n");
+	}	
+
+	next_hdr = MESA_jump_layer(uhdr, ADDR_TYPE_UDP, ADDR_TYPE_L2TP);
+	if(next_hdr){
+		printf("bingo! jump to l2tp from udp succ!\n");
+	}		
+}
+
+
+static void _jump_from_ipv4(const void *ip4_hdr)
+{
+	const void *next_hdr;
+	
+	next_hdr = MESA_jump_layer(ip4_hdr, ADDR_TYPE_IPV4, ADDR_TYPE_TCP);
+	if(next_hdr){
+		printf("bingo! jump to tcp from ipv4 succ!\n");
+	}	
+
+	next_hdr = MESA_jump_layer(ip4_hdr, ADDR_TYPE_IPV4, ADDR_TYPE_UDP);
+	if(next_hdr){
+		printf("bingo! jump to udp from ipv4 succ!\n");
+		_jump_from_udp(next_hdr);
+	}		
+}
+
+static void _jump_from_ipv6(const void *ip4_hdr)
+{
+	
+}
+
+
+
+static void _jump_from_ethernet(const void *ehdr)
+{
+	const void *next_hdr;
+	
+	next_hdr = MESA_jump_layer(ehdr, ADDR_TYPE_MAC, ADDR_TYPE_IPV4);
+	if(next_hdr){
+		printf("bingo! jump to ipv4 from ethernet succ!\n");
+		_jump_from_ipv4(next_hdr);
+	}
+
+	next_hdr = MESA_jump_layer(ehdr, ADDR_TYPE_MAC, ADDR_TYPE_IPV6);
+	if(next_hdr){
+		printf("bingo! jump to ipv6 from ethernet succ!\n");
+		_jump_from_ipv6(next_hdr);
+	}
+
+}
+
+
+static void _jump_greedy(const struct pcap_pkthdr *hdr, const u_char *data)
 {
 	const void *ip4_hdr, *ip6_h;
+
 	char print_buf[128];
 	int offset_to_eth;
 	static int pkt_index = 0;
 	
 	ip4_hdr = MESA_jump_layer_greedy(data, ADDR_TYPE_MAC, ADDR_TYPE_IPV4);
 	ip6_h = MESA_jump_layer_greedy(data, ADDR_TYPE_MAC, ADDR_TYPE_IPV6);
+	
 
-	printf("-----------------------------packet index:%d------------------------------------------\n", pkt_index++);
-	if(ip4_hdr){
-		offset_to_eth = (u_char *)ip4_hdr-data;
-		if(g_input_bpf_string 
-		 && (0 == bpf_filter(g_bpf_filter.bf_insns, (const unsigned char *)ip4_hdr, hdr->caplen-offset_to_eth, hdr->caplen-offset_to_eth))){
-			goto done;
+		printf("-----------------------------packet index:%d------------------------------------------\n", pkt_index++);
+		if(ip4_hdr){
+			offset_to_eth = (u_char *)ip4_hdr-data;
+			if(g_input_bpf_string 
+			 && (0 == bpf_filter(g_bpf_filter.bf_insns, (const unsigned char *)ip4_hdr, hdr->caplen-offset_to_eth, hdr->caplen-offset_to_eth))){
+				goto done;
+			}
+			printf("Innermost layer ipv4 offset:%d, addr: %s\n", offset_to_eth, MESA_jump_layer_ipv4_ntop((struct ip *)ip4_hdr, print_buf, sizeof(print_buf)));
 		}
-		printf("Innermost layer ipv4 offset:%d, addr: %s\n", offset_to_eth, MESA_jump_layer_ipv4_ntop((struct ip *)ip4_hdr, print_buf, sizeof(print_buf)));
-	}
-
-	if(ip6_h){
-		offset_to_eth = (u_char *)ip6_h-data;
-		if(g_input_bpf_string 
-		 && (0 == bpf_filter(g_bpf_filter.bf_insns, (const unsigned char *)ip6_h, hdr->caplen-offset_to_eth, hdr->caplen-offset_to_eth))){
-			goto done;
+	
+		if(ip6_h){
+			offset_to_eth = (u_char *)ip6_h-data;
+			if(g_input_bpf_string 
+			 && (0 == bpf_filter(g_bpf_filter.bf_insns, (const unsigned char *)ip6_h, hdr->caplen-offset_to_eth, hdr->caplen-offset_to_eth))){
+				goto done;
+			}
+	
+			printf("Innermost layer ipv6 offset:%d, addr: %s\n", offset_to_eth, MESA_jump_layer_ipv6_ntop((struct ip6_hdr *)ip6_h, print_buf, sizeof(print_buf)));
 		}
+	
+	done:
+	
+		printf("--------------------------------------------------------------------------------------\n\n");
 
-		printf("Innermost layer ipv6 offset:%d, addr: %s\n", offset_to_eth, MESA_jump_layer_ipv6_ntop((struct ip6_hdr *)ip6_h, print_buf, sizeof(print_buf)));
-	}
+}
 
-done:
+static void _pcap_pkt_handle(u_char *user, const struct pcap_pkthdr *hdr, const u_char *data)
+{
+
+	_jump_from_ethernet(data);
+	
+	_jump_greedy(hdr, data);
 
-	printf("--------------------------------------------------------------------------------------\n\n");
 }
 
 static void pcap_run(void)

vendor/CMakeLists.txt

@@ -0,0 +1,21 @@
+# CMakeFiles for 3rd vendor library
+
+include(ExternalProject)
+# libgtest
+ExternalProject_Add(libgtest PREFIX libgtest
+        URL ${CMAKE_SOURCE_DIR}/vendor/googletest-release-1.10.0.tar.gz
+        URL_MD5 ecd1fa65e7de707cd5c00bdac56022cd
+        #CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
+        CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DCMAKE_BUILD_TYPE=RELWITHDEBINFO)
+ExternalProject_Get_Property(libgtest INSTALL_DIR)
+file(MAKE_DIRECTORY ${INSTALL_DIR}/include)
+add_library(gtest-static STATIC IMPORTED GLOBAL)
+add_dependencies(gtest-static libgtest)
+set_property(TARGET gtest-static PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib64/libgtest.a)
+set_property(TARGET gtest-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include)
+set_property(TARGET gtest-static PROPERTY INTERFACE_LINK_LIBRARIES pthread)
+
+
+
+
+