Browse Source

comments int

aidmar.wainakh 6 years ago
parent
commit
77dd814f3c

+ 2 - 2
.gitignore

@@ -17,8 +17,8 @@ captures/*
 tures/*
 code/*.pcap
 code/*.xml
-code_boost/src/SQLiteCpp
-code_boost/src/SQLiteCpp/*
+code_boost/src/SQLiteCpp/
+code_boost/src/cmake-build-debug/
 test.py
 dbs/
 *.csv

+ 0 - 1
code_boost/src/cmake-build-debug/CMakeFiles/Makefile.cmake

@@ -54,7 +54,6 @@ set(CMAKE_MAKEFILE_PRODUCTS
 
 # Dependency information for all targets:
 set(CMAKE_DEPEND_INFO_FILES
-  "CMakeFiles/cpp-pcapreader.dir/DependInfo.cmake"
   "CMakeFiles/pcapreader.dir/DependInfo.cmake"
   "SQLiteCpp/CMakeFiles/SQLiteCpp.dir/DependInfo.cmake"
   "SQLiteCpp/sqlite3/CMakeFiles/sqlite3.dir/DependInfo.cmake"

+ 3 - 41
code_boost/src/cmake-build-debug/CMakeFiles/Makefile2

@@ -59,44 +59,6 @@ CMAKE_SOURCE_DIR = /home/anonymous/Downloads/ID2T-toolkit/code_boost/src
 # The top-level build directory on which CMake was run.
 CMAKE_BINARY_DIR = /home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug
 
-#=============================================================================
-# Target rules for target CMakeFiles/cpp-pcapreader.dir
-
-# All Build rule for target.
-CMakeFiles/cpp-pcapreader.dir/all: SQLiteCpp/CMakeFiles/SQLiteCpp.dir/all
-CMakeFiles/cpp-pcapreader.dir/all: SQLiteCpp/sqlite3/CMakeFiles/sqlite3.dir/all
-	$(MAKE) -f CMakeFiles/cpp-pcapreader.dir/build.make CMakeFiles/cpp-pcapreader.dir/depend
-	$(MAKE) -f CMakeFiles/cpp-pcapreader.dir/build.make CMakeFiles/cpp-pcapreader.dir/build
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/CMakeFiles --progress-num=8,9,10,11,12,13 "Built target cpp-pcapreader"
-.PHONY : CMakeFiles/cpp-pcapreader.dir/all
-
-# Include target in all.
-all: CMakeFiles/cpp-pcapreader.dir/all
-
-.PHONY : all
-
-# Build rule for subdir invocation for target.
-CMakeFiles/cpp-pcapreader.dir/rule: cmake_check_build_system
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/CMakeFiles 15
-	$(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/cpp-pcapreader.dir/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/CMakeFiles 0
-.PHONY : CMakeFiles/cpp-pcapreader.dir/rule
-
-# Convenience name for target.
-cpp-pcapreader: CMakeFiles/cpp-pcapreader.dir/rule
-
-.PHONY : cpp-pcapreader
-
-# clean rule for target.
-CMakeFiles/cpp-pcapreader.dir/clean:
-	$(MAKE) -f CMakeFiles/cpp-pcapreader.dir/build.make CMakeFiles/cpp-pcapreader.dir/clean
-.PHONY : CMakeFiles/cpp-pcapreader.dir/clean
-
-# clean rule for target.
-clean: CMakeFiles/cpp-pcapreader.dir/clean
-
-.PHONY : clean
-
 #=============================================================================
 # Target rules for target CMakeFiles/pcapreader.dir
 
@@ -105,7 +67,7 @@ CMakeFiles/pcapreader.dir/all: SQLiteCpp/CMakeFiles/SQLiteCpp.dir/all
 CMakeFiles/pcapreader.dir/all: SQLiteCpp/sqlite3/CMakeFiles/sqlite3.dir/all
 	$(MAKE) -f CMakeFiles/pcapreader.dir/build.make CMakeFiles/pcapreader.dir/depend
 	$(MAKE) -f CMakeFiles/pcapreader.dir/build.make CMakeFiles/pcapreader.dir/build
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/CMakeFiles --progress-num=14,15,16,17,18,19 "Built target pcapreader"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/CMakeFiles --progress-num=8,9,10,11,12 "Built target pcapreader"
 .PHONY : CMakeFiles/pcapreader.dir/all
 
 # Include target in all.
@@ -115,7 +77,7 @@ all: CMakeFiles/pcapreader.dir/all
 
 # Build rule for subdir invocation for target.
 CMakeFiles/pcapreader.dir/rule: cmake_check_build_system
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/CMakeFiles 15
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/CMakeFiles 14
 	$(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/pcapreader.dir/all
 	$(CMAKE_COMMAND) -E cmake_progress_start /home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/CMakeFiles 0
 .PHONY : CMakeFiles/pcapreader.dir/rule
@@ -217,7 +179,7 @@ SQLiteCpp/sqlite3/preinstall:
 SQLiteCpp/sqlite3/CMakeFiles/sqlite3.dir/all:
 	$(MAKE) -f SQLiteCpp/sqlite3/CMakeFiles/sqlite3.dir/build.make SQLiteCpp/sqlite3/CMakeFiles/sqlite3.dir/depend
 	$(MAKE) -f SQLiteCpp/sqlite3/CMakeFiles/sqlite3.dir/build.make SQLiteCpp/sqlite3/CMakeFiles/sqlite3.dir/build
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/CMakeFiles --progress-num=20,21 "Built target sqlite3"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/CMakeFiles --progress-num=13,14 "Built target sqlite3"
 .PHONY : SQLiteCpp/sqlite3/CMakeFiles/sqlite3.dir/all
 
 # Include target in all.

+ 0 - 1
code_boost/src/cmake-build-debug/CMakeFiles/TargetDirectories.txt

@@ -4,7 +4,6 @@
 /home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/CMakeFiles/list_install_components.dir
 /home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/CMakeFiles/rebuild_cache.dir
 /home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/CMakeFiles/edit_cache.dir
-/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/CMakeFiles/cpp-pcapreader.dir
 /home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/CMakeFiles/pcapreader.dir
 /home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/SQLiteCpp/CMakeFiles/install/strip.dir
 /home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/SQLiteCpp/CMakeFiles/install/local.dir

+ 0 - 1
code_boost/src/cmake-build-debug/CMakeFiles/pcapreader.dir/DependInfo.cmake

@@ -4,7 +4,6 @@ set(CMAKE_DEPENDS_LANGUAGES
   )
 # The set of files for implicit dependencies of each language:
 set(CMAKE_DEPENDS_CHECK_CXX
-  "/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cxx/artifacts_tests.cpp" "/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/CMakeFiles/pcapreader.dir/cxx/artifacts_tests.cpp.o"
   "/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cxx/pcap_processor.cpp" "/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/CMakeFiles/pcapreader.dir/cxx/pcap_processor.cpp.o"
   "/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cxx/statistics.cpp" "/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/CMakeFiles/pcapreader.dir/cxx/statistics.cpp.o"
   "/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cxx/statistics_db.cpp" "/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/CMakeFiles/pcapreader.dir/cxx/statistics_db.cpp.o"

+ 2 - 29
code_boost/src/cmake-build-debug/CMakeFiles/pcapreader.dir/build.make

@@ -129,33 +129,9 @@ CMakeFiles/pcapreader.dir/cxx/statistics_db.cpp.o.provides: CMakeFiles/pcapreade
 CMakeFiles/pcapreader.dir/cxx/statistics_db.cpp.o.provides.build: CMakeFiles/pcapreader.dir/cxx/statistics_db.cpp.o
 
 
-CMakeFiles/pcapreader.dir/cxx/artifacts_tests.cpp.o: CMakeFiles/pcapreader.dir/flags.make
-CMakeFiles/pcapreader.dir/cxx/artifacts_tests.cpp.o: ../cxx/artifacts_tests.cpp
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Building CXX object CMakeFiles/pcapreader.dir/cxx/artifacts_tests.cpp.o"
-	/usr/bin/c++  $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/pcapreader.dir/cxx/artifacts_tests.cpp.o -c /home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cxx/artifacts_tests.cpp
-
-CMakeFiles/pcapreader.dir/cxx/artifacts_tests.cpp.i: cmake_force
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/pcapreader.dir/cxx/artifacts_tests.cpp.i"
-	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cxx/artifacts_tests.cpp > CMakeFiles/pcapreader.dir/cxx/artifacts_tests.cpp.i
-
-CMakeFiles/pcapreader.dir/cxx/artifacts_tests.cpp.s: cmake_force
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/pcapreader.dir/cxx/artifacts_tests.cpp.s"
-	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cxx/artifacts_tests.cpp -o CMakeFiles/pcapreader.dir/cxx/artifacts_tests.cpp.s
-
-CMakeFiles/pcapreader.dir/cxx/artifacts_tests.cpp.o.requires:
-
-.PHONY : CMakeFiles/pcapreader.dir/cxx/artifacts_tests.cpp.o.requires
-
-CMakeFiles/pcapreader.dir/cxx/artifacts_tests.cpp.o.provides: CMakeFiles/pcapreader.dir/cxx/artifacts_tests.cpp.o.requires
-	$(MAKE) -f CMakeFiles/pcapreader.dir/build.make CMakeFiles/pcapreader.dir/cxx/artifacts_tests.cpp.o.provides.build
-.PHONY : CMakeFiles/pcapreader.dir/cxx/artifacts_tests.cpp.o.provides
-
-CMakeFiles/pcapreader.dir/cxx/artifacts_tests.cpp.o.provides.build: CMakeFiles/pcapreader.dir/cxx/artifacts_tests.cpp.o
-
-
 CMakeFiles/pcapreader.dir/cxx/utilities.cpp.o: CMakeFiles/pcapreader.dir/flags.make
 CMakeFiles/pcapreader.dir/cxx/utilities.cpp.o: ../cxx/utilities.cpp
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_5) "Building CXX object CMakeFiles/pcapreader.dir/cxx/utilities.cpp.o"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Building CXX object CMakeFiles/pcapreader.dir/cxx/utilities.cpp.o"
 	/usr/bin/c++  $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/pcapreader.dir/cxx/utilities.cpp.o -c /home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cxx/utilities.cpp
 
 CMakeFiles/pcapreader.dir/cxx/utilities.cpp.i: cmake_force
@@ -182,7 +158,6 @@ pcapreader_OBJECTS = \
 "CMakeFiles/pcapreader.dir/cxx/pcap_processor.cpp.o" \
 "CMakeFiles/pcapreader.dir/cxx/statistics.cpp.o" \
 "CMakeFiles/pcapreader.dir/cxx/statistics_db.cpp.o" \
-"CMakeFiles/pcapreader.dir/cxx/artifacts_tests.cpp.o" \
 "CMakeFiles/pcapreader.dir/cxx/utilities.cpp.o"
 
 # External object files for target pcapreader
@@ -191,7 +166,6 @@ pcapreader_EXTERNAL_OBJECTS =
 libpcapreader.so: CMakeFiles/pcapreader.dir/cxx/pcap_processor.cpp.o
 libpcapreader.so: CMakeFiles/pcapreader.dir/cxx/statistics.cpp.o
 libpcapreader.so: CMakeFiles/pcapreader.dir/cxx/statistics_db.cpp.o
-libpcapreader.so: CMakeFiles/pcapreader.dir/cxx/artifacts_tests.cpp.o
 libpcapreader.so: CMakeFiles/pcapreader.dir/cxx/utilities.cpp.o
 libpcapreader.so: CMakeFiles/pcapreader.dir/build.make
 libpcapreader.so: /usr/lib/x86_64-linux-gnu/libboost_python-py35.so
@@ -199,7 +173,7 @@ libpcapreader.so: /usr/local/lib/libtins.so
 libpcapreader.so: SQLiteCpp/libSQLiteCpp.a
 libpcapreader.so: SQLiteCpp/sqlite3/libsqlite3.a
 libpcapreader.so: CMakeFiles/pcapreader.dir/link.txt
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_6) "Linking CXX shared library libpcapreader.so"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_5) "Linking CXX shared library libpcapreader.so"
 	$(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/pcapreader.dir/link.txt --verbose=$(VERBOSE)
 
 # Rule to build all files generated by this target.
@@ -210,7 +184,6 @@ CMakeFiles/pcapreader.dir/build: libpcapreader.so
 CMakeFiles/pcapreader.dir/requires: CMakeFiles/pcapreader.dir/cxx/pcap_processor.cpp.o.requires
 CMakeFiles/pcapreader.dir/requires: CMakeFiles/pcapreader.dir/cxx/statistics.cpp.o.requires
 CMakeFiles/pcapreader.dir/requires: CMakeFiles/pcapreader.dir/cxx/statistics_db.cpp.o.requires
-CMakeFiles/pcapreader.dir/requires: CMakeFiles/pcapreader.dir/cxx/artifacts_tests.cpp.o.requires
 CMakeFiles/pcapreader.dir/requires: CMakeFiles/pcapreader.dir/cxx/utilities.cpp.o.requires
 
 .PHONY : CMakeFiles/pcapreader.dir/requires

+ 0 - 1
code_boost/src/cmake-build-debug/CMakeFiles/pcapreader.dir/cmake_clean.cmake

@@ -2,7 +2,6 @@ file(REMOVE_RECURSE
   "CMakeFiles/pcapreader.dir/cxx/pcap_processor.cpp.o"
   "CMakeFiles/pcapreader.dir/cxx/statistics.cpp.o"
   "CMakeFiles/pcapreader.dir/cxx/statistics_db.cpp.o"
-  "CMakeFiles/pcapreader.dir/cxx/artifacts_tests.cpp.o"
   "CMakeFiles/pcapreader.dir/cxx/utilities.cpp.o"
   "libpcapreader.pdb"
   "libpcapreader.so"

+ 1 - 1
code_boost/src/cmake-build-debug/CMakeFiles/pcapreader.dir/link.txt

@@ -1 +1 @@
-/usr/bin/c++ -fPIC -g -Wall  -shared -Wl,-soname,libpcapreader.so -o libpcapreader.so CMakeFiles/pcapreader.dir/cxx/pcap_processor.cpp.o CMakeFiles/pcapreader.dir/cxx/statistics.cpp.o CMakeFiles/pcapreader.dir/cxx/statistics_db.cpp.o CMakeFiles/pcapreader.dir/cxx/artifacts_tests.cpp.o CMakeFiles/pcapreader.dir/cxx/utilities.cpp.o -Wl,-rpath,/usr/local/lib -lboost_python-py35 /usr/local/lib/libtins.so SQLiteCpp/libSQLiteCpp.a SQLiteCpp/sqlite3/libsqlite3.a -lpthread -ldl 
+/usr/bin/c++ -fPIC -g -Wall  -shared -Wl,-soname,libpcapreader.so -o libpcapreader.so CMakeFiles/pcapreader.dir/cxx/pcap_processor.cpp.o CMakeFiles/pcapreader.dir/cxx/statistics.cpp.o CMakeFiles/pcapreader.dir/cxx/statistics_db.cpp.o CMakeFiles/pcapreader.dir/cxx/utilities.cpp.o -Wl,-rpath,/usr/local/lib -lboost_python-py35 /usr/local/lib/libtins.so SQLiteCpp/libSQLiteCpp.a SQLiteCpp/sqlite3/libsqlite3.a -lpthread -ldl 

+ 5 - 6
code_boost/src/cmake-build-debug/CMakeFiles/pcapreader.dir/progress.make

@@ -1,7 +1,6 @@
-CMAKE_PROGRESS_1 = 14
-CMAKE_PROGRESS_2 = 15
-CMAKE_PROGRESS_3 = 16
-CMAKE_PROGRESS_4 = 17
-CMAKE_PROGRESS_5 = 18
-CMAKE_PROGRESS_6 = 19
+CMAKE_PROGRESS_1 = 8
+CMAKE_PROGRESS_2 = 9
+CMAKE_PROGRESS_3 = 10
+CMAKE_PROGRESS_4 = 11
+CMAKE_PROGRESS_5 = 12
 

+ 1 - 1
code_boost/src/cmake-build-debug/CMakeFiles/progress.marks

@@ -1 +1 @@
-21
+14

+ 0 - 59
code_boost/src/cmake-build-debug/Makefile

@@ -156,19 +156,6 @@ depend:
 	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
-#=============================================================================
-# Target rules for targets named cpp-pcapreader
-
-# Build rule for target.
-cpp-pcapreader: cmake_check_build_system
-	$(MAKE) -f CMakeFiles/Makefile2 cpp-pcapreader
-.PHONY : cpp-pcapreader
-
-# fast build rule for target.
-cpp-pcapreader/fast:
-	$(MAKE) -f CMakeFiles/cpp-pcapreader.dir/build.make CMakeFiles/cpp-pcapreader.dir/build
-.PHONY : cpp-pcapreader/fast
-
 #=============================================================================
 # Target rules for targets named pcapreader
 
@@ -208,43 +195,12 @@ sqlite3/fast:
 	$(MAKE) -f SQLiteCpp/sqlite3/CMakeFiles/sqlite3.dir/build.make SQLiteCpp/sqlite3/CMakeFiles/sqlite3.dir/build
 .PHONY : sqlite3/fast
 
-cxx/artifacts_tests.o: cxx/artifacts_tests.cpp.o
-
-.PHONY : cxx/artifacts_tests.o
-
-# target to build an object file
-cxx/artifacts_tests.cpp.o:
-	$(MAKE) -f CMakeFiles/cpp-pcapreader.dir/build.make CMakeFiles/cpp-pcapreader.dir/cxx/artifacts_tests.cpp.o
-	$(MAKE) -f CMakeFiles/pcapreader.dir/build.make CMakeFiles/pcapreader.dir/cxx/artifacts_tests.cpp.o
-.PHONY : cxx/artifacts_tests.cpp.o
-
-cxx/artifacts_tests.i: cxx/artifacts_tests.cpp.i
-
-.PHONY : cxx/artifacts_tests.i
-
-# target to preprocess a source file
-cxx/artifacts_tests.cpp.i:
-	$(MAKE) -f CMakeFiles/cpp-pcapreader.dir/build.make CMakeFiles/cpp-pcapreader.dir/cxx/artifacts_tests.cpp.i
-	$(MAKE) -f CMakeFiles/pcapreader.dir/build.make CMakeFiles/pcapreader.dir/cxx/artifacts_tests.cpp.i
-.PHONY : cxx/artifacts_tests.cpp.i
-
-cxx/artifacts_tests.s: cxx/artifacts_tests.cpp.s
-
-.PHONY : cxx/artifacts_tests.s
-
-# target to generate assembly for a file
-cxx/artifacts_tests.cpp.s:
-	$(MAKE) -f CMakeFiles/cpp-pcapreader.dir/build.make CMakeFiles/cpp-pcapreader.dir/cxx/artifacts_tests.cpp.s
-	$(MAKE) -f CMakeFiles/pcapreader.dir/build.make CMakeFiles/pcapreader.dir/cxx/artifacts_tests.cpp.s
-.PHONY : cxx/artifacts_tests.cpp.s
-
 cxx/pcap_processor.o: cxx/pcap_processor.cpp.o
 
 .PHONY : cxx/pcap_processor.o
 
 # target to build an object file
 cxx/pcap_processor.cpp.o:
-	$(MAKE) -f CMakeFiles/cpp-pcapreader.dir/build.make CMakeFiles/cpp-pcapreader.dir/cxx/pcap_processor.cpp.o
 	$(MAKE) -f CMakeFiles/pcapreader.dir/build.make CMakeFiles/pcapreader.dir/cxx/pcap_processor.cpp.o
 .PHONY : cxx/pcap_processor.cpp.o
 
@@ -254,7 +210,6 @@ cxx/pcap_processor.i: cxx/pcap_processor.cpp.i
 
 # target to preprocess a source file
 cxx/pcap_processor.cpp.i:
-	$(MAKE) -f CMakeFiles/cpp-pcapreader.dir/build.make CMakeFiles/cpp-pcapreader.dir/cxx/pcap_processor.cpp.i
 	$(MAKE) -f CMakeFiles/pcapreader.dir/build.make CMakeFiles/pcapreader.dir/cxx/pcap_processor.cpp.i
 .PHONY : cxx/pcap_processor.cpp.i
 
@@ -264,7 +219,6 @@ cxx/pcap_processor.s: cxx/pcap_processor.cpp.s
 
 # target to generate assembly for a file
 cxx/pcap_processor.cpp.s:
-	$(MAKE) -f CMakeFiles/cpp-pcapreader.dir/build.make CMakeFiles/cpp-pcapreader.dir/cxx/pcap_processor.cpp.s
 	$(MAKE) -f CMakeFiles/pcapreader.dir/build.make CMakeFiles/pcapreader.dir/cxx/pcap_processor.cpp.s
 .PHONY : cxx/pcap_processor.cpp.s
 
@@ -274,7 +228,6 @@ cxx/statistics.o: cxx/statistics.cpp.o
 
 # target to build an object file
 cxx/statistics.cpp.o:
-	$(MAKE) -f CMakeFiles/cpp-pcapreader.dir/build.make CMakeFiles/cpp-pcapreader.dir/cxx/statistics.cpp.o
 	$(MAKE) -f CMakeFiles/pcapreader.dir/build.make CMakeFiles/pcapreader.dir/cxx/statistics.cpp.o
 .PHONY : cxx/statistics.cpp.o
 
@@ -284,7 +237,6 @@ cxx/statistics.i: cxx/statistics.cpp.i
 
 # target to preprocess a source file
 cxx/statistics.cpp.i:
-	$(MAKE) -f CMakeFiles/cpp-pcapreader.dir/build.make CMakeFiles/cpp-pcapreader.dir/cxx/statistics.cpp.i
 	$(MAKE) -f CMakeFiles/pcapreader.dir/build.make CMakeFiles/pcapreader.dir/cxx/statistics.cpp.i
 .PHONY : cxx/statistics.cpp.i
 
@@ -294,7 +246,6 @@ cxx/statistics.s: cxx/statistics.cpp.s
 
 # target to generate assembly for a file
 cxx/statistics.cpp.s:
-	$(MAKE) -f CMakeFiles/cpp-pcapreader.dir/build.make CMakeFiles/cpp-pcapreader.dir/cxx/statistics.cpp.s
 	$(MAKE) -f CMakeFiles/pcapreader.dir/build.make CMakeFiles/pcapreader.dir/cxx/statistics.cpp.s
 .PHONY : cxx/statistics.cpp.s
 
@@ -304,7 +255,6 @@ cxx/statistics_db.o: cxx/statistics_db.cpp.o
 
 # target to build an object file
 cxx/statistics_db.cpp.o:
-	$(MAKE) -f CMakeFiles/cpp-pcapreader.dir/build.make CMakeFiles/cpp-pcapreader.dir/cxx/statistics_db.cpp.o
 	$(MAKE) -f CMakeFiles/pcapreader.dir/build.make CMakeFiles/pcapreader.dir/cxx/statistics_db.cpp.o
 .PHONY : cxx/statistics_db.cpp.o
 
@@ -314,7 +264,6 @@ cxx/statistics_db.i: cxx/statistics_db.cpp.i
 
 # target to preprocess a source file
 cxx/statistics_db.cpp.i:
-	$(MAKE) -f CMakeFiles/cpp-pcapreader.dir/build.make CMakeFiles/cpp-pcapreader.dir/cxx/statistics_db.cpp.i
 	$(MAKE) -f CMakeFiles/pcapreader.dir/build.make CMakeFiles/pcapreader.dir/cxx/statistics_db.cpp.i
 .PHONY : cxx/statistics_db.cpp.i
 
@@ -324,7 +273,6 @@ cxx/statistics_db.s: cxx/statistics_db.cpp.s
 
 # target to generate assembly for a file
 cxx/statistics_db.cpp.s:
-	$(MAKE) -f CMakeFiles/cpp-pcapreader.dir/build.make CMakeFiles/cpp-pcapreader.dir/cxx/statistics_db.cpp.s
 	$(MAKE) -f CMakeFiles/pcapreader.dir/build.make CMakeFiles/pcapreader.dir/cxx/statistics_db.cpp.s
 .PHONY : cxx/statistics_db.cpp.s
 
@@ -334,7 +282,6 @@ cxx/utilities.o: cxx/utilities.cpp.o
 
 # target to build an object file
 cxx/utilities.cpp.o:
-	$(MAKE) -f CMakeFiles/cpp-pcapreader.dir/build.make CMakeFiles/cpp-pcapreader.dir/cxx/utilities.cpp.o
 	$(MAKE) -f CMakeFiles/pcapreader.dir/build.make CMakeFiles/pcapreader.dir/cxx/utilities.cpp.o
 .PHONY : cxx/utilities.cpp.o
 
@@ -344,7 +291,6 @@ cxx/utilities.i: cxx/utilities.cpp.i
 
 # target to preprocess a source file
 cxx/utilities.cpp.i:
-	$(MAKE) -f CMakeFiles/cpp-pcapreader.dir/build.make CMakeFiles/cpp-pcapreader.dir/cxx/utilities.cpp.i
 	$(MAKE) -f CMakeFiles/pcapreader.dir/build.make CMakeFiles/pcapreader.dir/cxx/utilities.cpp.i
 .PHONY : cxx/utilities.cpp.i
 
@@ -354,7 +300,6 @@ cxx/utilities.s: cxx/utilities.cpp.s
 
 # target to generate assembly for a file
 cxx/utilities.cpp.s:
-	$(MAKE) -f CMakeFiles/cpp-pcapreader.dir/build.make CMakeFiles/cpp-pcapreader.dir/cxx/utilities.cpp.s
 	$(MAKE) -f CMakeFiles/pcapreader.dir/build.make CMakeFiles/pcapreader.dir/cxx/utilities.cpp.s
 .PHONY : cxx/utilities.cpp.s
 
@@ -370,13 +315,9 @@ help:
 	@echo "... list_install_components"
 	@echo "... rebuild_cache"
 	@echo "... edit_cache"
-	@echo "... cpp-pcapreader"
 	@echo "... pcapreader"
 	@echo "... SQLiteCpp"
 	@echo "... sqlite3"
-	@echo "... cxx/artifacts_tests.o"
-	@echo "... cxx/artifacts_tests.i"
-	@echo "... cxx/artifacts_tests.s"
 	@echo "... cxx/pcap_processor.o"
 	@echo "... cxx/pcap_processor.i"
 	@echo "... cxx/pcap_processor.s"

+ 2 - 2
code_boost/src/cmake-build-debug/SQLiteCpp/sqlite3/CMakeFiles/sqlite3.dir/progress.make

@@ -1,3 +1,3 @@
-CMAKE_PROGRESS_1 = 20
-CMAKE_PROGRESS_2 = 21
+CMAKE_PROGRESS_1 = 13
+CMAKE_PROGRESS_2 = 14
 

+ 0 - 68
code_boost/src/cmake-build-debug/cpp-pcapreader.cbp

@@ -77,58 +77,6 @@
 					<DistClean command="/usr/bin/make -j4 -f &quot;/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/Makefile&quot;  VERBOSE=1 clean"/>
 				</MakeCommands>
 			</Target>
-			<Target title="cpp-pcapreader">
-				<Option output="/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/cpp-pcapreader" prefix_auto="0" extension_auto="0"/>
-				<Option working_dir="/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug"/>
-				<Option object_output="./"/>
-				<Option type="1"/>
-				<Option compiler="gcc"/>
-				<Compiler>
-					<Add directory="/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/SQLiteCpp/include"/>
-					<Add directory="/usr/include/python3.5m"/>
-					<Add directory="/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/SQLiteCpp/sqlite3"/>
-					<Add directory="/usr/include/c++/5"/>
-					<Add directory="/usr/include/x86_64-linux-gnu/c++/5"/>
-					<Add directory="/usr/include/c++/5/backward"/>
-					<Add directory="/usr/lib/gcc/x86_64-linux-gnu/5/include"/>
-					<Add directory="/usr/local/include"/>
-					<Add directory="/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed"/>
-					<Add directory="/usr/include/x86_64-linux-gnu"/>
-					<Add directory="/usr/include"/>
-				</Compiler>
-				<MakeCommands>
-					<Build command="/usr/bin/make -j4 -f &quot;/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/Makefile&quot;  VERBOSE=1 cpp-pcapreader"/>
-					<CompileFile command="/usr/bin/make -j4 -f &quot;/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/Makefile&quot;  VERBOSE=1 &quot;$file&quot;"/>
-					<Clean command="/usr/bin/make -j4 -f &quot;/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/Makefile&quot;  VERBOSE=1 clean"/>
-					<DistClean command="/usr/bin/make -j4 -f &quot;/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/Makefile&quot;  VERBOSE=1 clean"/>
-				</MakeCommands>
-			</Target>
-			<Target title="cpp-pcapreader/fast">
-				<Option output="/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/cpp-pcapreader" prefix_auto="0" extension_auto="0"/>
-				<Option working_dir="/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug"/>
-				<Option object_output="./"/>
-				<Option type="1"/>
-				<Option compiler="gcc"/>
-				<Compiler>
-					<Add directory="/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/SQLiteCpp/include"/>
-					<Add directory="/usr/include/python3.5m"/>
-					<Add directory="/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/SQLiteCpp/sqlite3"/>
-					<Add directory="/usr/include/c++/5"/>
-					<Add directory="/usr/include/x86_64-linux-gnu/c++/5"/>
-					<Add directory="/usr/include/c++/5/backward"/>
-					<Add directory="/usr/lib/gcc/x86_64-linux-gnu/5/include"/>
-					<Add directory="/usr/local/include"/>
-					<Add directory="/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed"/>
-					<Add directory="/usr/include/x86_64-linux-gnu"/>
-					<Add directory="/usr/include"/>
-				</Compiler>
-				<MakeCommands>
-					<Build command="/usr/bin/make -j4 -f &quot;/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/Makefile&quot;  VERBOSE=1 cpp-pcapreader/fast"/>
-					<CompileFile command="/usr/bin/make -j4 -f &quot;/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/Makefile&quot;  VERBOSE=1 &quot;$file&quot;"/>
-					<Clean command="/usr/bin/make -j4 -f &quot;/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/Makefile&quot;  VERBOSE=1 clean"/>
-					<DistClean command="/usr/bin/make -j4 -f &quot;/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/Makefile&quot;  VERBOSE=1 clean"/>
-				</MakeCommands>
-			</Target>
 			<Target title="pcapreader">
 				<Option output="/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug/libpcapreader.so" prefix_auto="0" extension_auto="0"/>
 				<Option working_dir="/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cmake-build-debug"/>
@@ -370,44 +318,28 @@
 		<Unit filename="/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/SQLiteCpp/src/Transaction.cpp">
 			<Option target="SQLiteCpp"/>
 		</Unit>
-		<Unit filename="/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cxx/artifacts_tests.cpp">
-			<Option target="cpp-pcapreader"/>
-			<Option target="pcapreader"/>
-		</Unit>
-		<Unit filename="/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cxx/artifacts_tests.h">
-			<Option target="cpp-pcapreader"/>
-			<Option target="pcapreader"/>
-		</Unit>
 		<Unit filename="/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cxx/pcap_processor.cpp">
-			<Option target="cpp-pcapreader"/>
 			<Option target="pcapreader"/>
 		</Unit>
 		<Unit filename="/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cxx/pcap_processor.h">
-			<Option target="cpp-pcapreader"/>
 			<Option target="pcapreader"/>
 		</Unit>
 		<Unit filename="/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cxx/statistics.cpp">
-			<Option target="cpp-pcapreader"/>
 			<Option target="pcapreader"/>
 		</Unit>
 		<Unit filename="/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cxx/statistics.h">
-			<Option target="cpp-pcapreader"/>
 			<Option target="pcapreader"/>
 		</Unit>
 		<Unit filename="/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cxx/statistics_db.cpp">
-			<Option target="cpp-pcapreader"/>
 			<Option target="pcapreader"/>
 		</Unit>
 		<Unit filename="/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cxx/statistics_db.h">
-			<Option target="cpp-pcapreader"/>
 			<Option target="pcapreader"/>
 		</Unit>
 		<Unit filename="/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cxx/utilities.cpp">
-			<Option target="cpp-pcapreader"/>
 			<Option target="pcapreader"/>
 		</Unit>
 		<Unit filename="/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/cxx/utilities.h">
-			<Option target="cpp-pcapreader"/>
 			<Option target="pcapreader"/>
 		</Unit>
 		<Unit filename="/home/anonymous/Downloads/ID2T-toolkit/code_boost/src/CMakeLists.txt">

+ 3 - 3
code_boost/src/cxx/pcap_processor.cpp

@@ -167,9 +167,9 @@ void pcap_processor::collect_statistics() {
         stats.setTimestampLastPacket(lastProcessedPacket);
 
         // TO-DO: to delete
-        //for (auto it = stats.dscp_distribution.begin(); it != stats.dscp_distribution.end(); ++it) {
-          //  std::cout<<it->first<<","<<it->second<<"\n";
-        //}
+        for (auto it = stats.dscp_distribution.begin(); it != stats.dscp_distribution.end(); ++it) {
+            std::cout<<it->first<<","<<it->second<<"\n";
+        }
     }
 }
 

+ 2 - 2
code_boost/src/cxx/statistics.cpp

@@ -35,8 +35,8 @@ void statistics::checkToS(uint8_t ToS) {
 //            std::bitset<6> ipPrecedenceBit(ipPrecStream.str());
 //            int ipPrecedenceInt = (int)(ipPrecedenceBit.to_ulong());
 
-            // Commonly Used DSCP Values according to RFC2472
-            int validValues[] = {0,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,46,48,56};
+            // Commonly Used DSCP Values according to RFC2472. The value 2 was added because it is massively used.
+            int validValues[] = {0,2,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,46,48,56};
             bool exists = std::find(std::begin(validValues), std::end(validValues), dscpInt) != std::end(validValues);
 
             // According to RFC791 ipPrecedenceInt <= 7 && tosBit[0] must be 0