gfwleak/stellar-stellar
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve merge conflicts

Browse Source
This commit is contained in:
luwenpeng
2024-05-20 11:12:24 +08:00
parent ccaddf7fdb
commit 0e33a1b647
24 changed files with 172 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/stellar/CMakeLists.txt
View File

@@ -4,5 +4,4 @@ target_link_libraries(core times plugin_manager session_manager ip_reassembly pa
add_executable(stellar main.cpp)
target_link_libraries(stellar core)
target_link_libraries(stellar "-rdynamic")
install(TARGETS stellar RUNTIME DESTINATION bin COMPONENT Program)
install(TARGETS stellar RUNTIME DESTINATION bin COMPONENT Program)

4
src/stellar/stellar.cpp
View File

@@ -51,7 +51,7 @@ static inline void free_evicted_sessions(struct session_manager *sess_mgr, uint6
if (sess)
{
plugin_ctx = session_get_user_data(sess);
plugin_manager_session_runtime_free((struct plugin_manager_runtime*)plugin_ctx);
plugin_manager_session_runtime_free((struct plugin_manager_runtime *)plugin_ctx);
session_manager_free_session(sess_mgr, sess);
}
else
@@ -71,7 +71,7 @@ static inline void free_expired_sessions(struct session_manager *sess_mgr, uint6
if (sess)
{
plugin_ctx = session_get_user_data(sess);
plugin_manager_session_runtime_free((struct plugin_manager_runtime*)plugin_ctx);
plugin_manager_session_runtime_free((struct plugin_manager_runtime *)plugin_ctx);
session_manager_free_session(sess_mgr, sess);
}
else