Switch to built-in FEC in Botan3

Author: cnbatch

CMakeLists.txt

@@ -10,14 +10,14 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "^DragonFly?" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
 	include_directories("/usr/local/include")
-	include_directories("/usr/local/include/botan-2")
+	include_directories("/usr/local/include/botan-3")
 endif()
 if(${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
 	include_directories("/usr/pkg/include")
-	include_directories("/usr/pkg/include/botan-2")
+	include_directories("/usr/pkg/include/botan-3")
 endif()
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-	include_directories("/usr/include/botan-2")
+	include_directories("/usr/include/botan-3")
 endif()
 
 find_package(Threads REQUIRED)
@@ -35,6 +35,8 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 	add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
 endif()
 
+add_compile_options("$<$<CXX_COMPILER_ID:AppleClang,Clang>:-fexperimental-library>")
+
 add_executable(${PROJECT_NAME} src/main.cpp)
 
 add_subdirectory(src)

README.md

@@ -521,10 +521,6 @@ root      soft    nofile       300000
 ### 线程池
 udphop 使用的线程池来自于 [task-thread-pool](https://github.com/alugowski/task-thread-pool)，用于多连接时的并行加解密处理。
 
-### FEC
-
-UDPHop 所用的 FEC 采用 Reed-Solomon 编码， FEC 代码库来自于 [fecpp](https://github.com/randombit/fecpp)，并作了些许修改。
-
 ### 版面
 代码写得很随意，想到哪写到哪，因此版面混乱。
 

README_EN.md

@@ -519,10 +519,6 @@ root      soft    nofile       300000
 ### Thread Pool
 The thread pool used by UDPHop comes from [task-thread-pool](https://github.com/alugowski/task-thread-pool), uses for parallel encryption and decryption processing in multiple connections.
 
-### FEC
-
-The FEC used by UDPHop uses Reed-Solomon coding, and the FEC code library comes from [fecpp](https://github.com/randombit/fecpp) with some modifications.
-
 ### Layout
 The code is written very casually, wherever I think of writing, so the layout is messy.
 

sln/udphop/udphop.vcxproj

@@ -19,8 +19,6 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\3rd_party\fecpp.cpp" />
-    <ClCompile Include="..\..\src\3rd_party\fecpp_ssse3.cpp" />
     <ClCompile Include="..\..\src\main.cpp" />
     <ClCompile Include="..\..\src\modes\client.cpp" />
     <ClCompile Include="..\..\src\networks\connections.cpp" />
@@ -33,7 +31,6 @@
     <ClCompile Include="..\..\src\shares\share_defines.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\src\3rd_party\fecpp.hpp" />
     <ClInclude Include="..\..\src\3rd_party\task_thread_pool.hpp" />
     <ClInclude Include="..\..\src\modes\client.hpp" />
     <ClInclude Include="..\..\src\networks\connections.hpp" />

sln/udphop/udphop.vcxproj.filters

@@ -57,12 +57,6 @@
     <ClCompile Include="..\..\src\shares\configurations.cpp">
       <Filter>Source Files\shares</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\3rd_party\fecpp.cpp">
-      <Filter>Source Files\3rd_party</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\3rd_party\fecpp_ssse3.cpp">
-      <Filter>Source Files\3rd_party</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\modes\server.cpp">
       <Filter>Source Files\modes</Filter>
     </ClCompile>
@@ -101,9 +95,6 @@
     <ClInclude Include="..\..\src\shares\configurations.hpp">
       <Filter>Header Files\shares</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\3rd_party\fecpp.hpp">
-      <Filter>Header Files\3rd_party</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\3rd_party\task_thread_pool.hpp">
       <Filter>Header Files\3rd_party</Filter>
     </ClInclude>

src/3rd_party/CMakeLists.txt

@@ -1,13 +1,13 @@
-set(THISLIB_NAME THRID_PARTIES)
+#set(THISLIB_NAME THRID_PARTIES)
 
-add_library(${THISLIB_NAME} STATIC "fecpp.cpp" "fecpp_ssse3.cpp")
-string( TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" cmake_system_processor_lower )
-if (cmake_system_processor_lower MATCHES "x86" OR cmake_system_processor_lower MATCHES "amd64" OR cmake_system_processor_lower MATCHES "i[36]86")
-    set_source_files_properties(fecpp_ssse3.cpp PROPERTIES COMPILE_FLAGS "$<$<NOT:$<C_COMPILER_ID:MSVC>:-mssse3>")
-    set_source_files_properties(fecpp_ssse3.cpp PROPERTIES COMPILE_FLAGS "$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-mssse3>")
-endif()
+#add_library(${THISLIB_NAME} STATIC "fecpp.cpp" "fecpp_ssse3.cpp")
+#string( TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" cmake_system_processor_lower )
+#if (cmake_system_processor_lower MATCHES "x86" OR cmake_system_processor_lower MATCHES "amd64" OR cmake_system_processor_lower MATCHES "i[36]86")
+#    set_source_files_properties(fecpp_ssse3.cpp PROPERTIES COMPILE_FLAGS "$<$<NOT:$<C_COMPILER_ID:MSVC>:-mssse3>")
+#    set_source_files_properties(fecpp_ssse3.cpp PROPERTIES COMPILE_FLAGS "$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-mssse3>")
+#endif()
 
-target_link_libraries(${THISLIB_NAME} PRIVATE SHAREDEFINES)
-set(THREADS_PREFER_PTHREAD_FLAG ON)
-find_package(Threads REQUIRED)
-target_link_libraries(${THISLIB_NAME} PUBLIC Threads::Threads)
+#target_link_libraries(${THISLIB_NAME} PRIVATE SHAREDEFINES)
+#set(THREADS_PREFER_PTHREAD_FLAG ON)
+#find_package(Threads REQUIRED)
+#target_link_libraries(${THISLIB_NAME} PUBLIC Threads::Threads)