diff --git a/.gitmodules b/.gitmodules old mode 100755 new mode 100644 index 3eb9a5ee1d149e33869204613860fc9ac59ffccd..5e4cad826c80a472f9267f80780d03a2024d804b --- a/.gitmodules +++ b/.gitmodules @@ -114,3 +114,6 @@ [submodule "libdap-chain-cs-dag-pos"] path = libdap-chain-cs-dag-pos url = https://github.com/kelvinblockchain/libdap-chain-cs-dag-pos +[submodule "libdap-server-http-db-auth"] + path = libdap-server-http-db-auth + url = https://github.com/kelvinblockchain/libdap-server-http-db-auth diff --git a/CMakeLists.txt b/CMakeLists.txt index cae9ca99faa0b1758f5d94a0b32bf204818ea4aa..bc79a924d59c7fbd424ab9228fbf764c5c196247 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,6 +42,7 @@ add_subdirectory(libdap) add_subdirectory(libdap-server-core) add_subdirectory(libdap-server-udp) add_subdirectory(libdap-server) +add_subdirectory(libdap-server-http-db-auth) add_subdirectory(libdap-chain) add_subdirectory(libdap-chain-crypto) @@ -89,7 +90,7 @@ target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_core_server dap_en dap_chain_cs_dag dap_chain_cs_dag_poa dap_chain_cs_dag_pos dap_chain_net dap_chain_net_srv dap_chain_net_srv_app dap_chain_net_srv_app_db dap_chain_net_srv_datum dap_chain_net_srv_datum_pool dap_chain_net_srv_vpn - dap_chain_wallet dap_chain_global_db dap_chain_mempool m pthread magic ) + dap_chain_wallet dap_chain_global_db dap_chain_mempool m pthread magic dap_server_http_db_auth) target_link_libraries(${PROJECT_NAME}-cli m dap_chain_net curl) target_link_libraries(${PROJECT_NAME}-tool dap_core dap_crypto dap_core_server dap_enc_server dap_udp_server dap_session dap_enc_server dap_stream dap_stream_ch_vpn dap_stream_ch_chain dap_stream_ch_chain_net diff --git a/sources/main.c b/sources/main.c index bf4da440f72afa52b02b8f58c26bab94fdd84bea..99adb1bafdccd7594accbb9da64546c807289280 100755 --- a/sources/main.c +++ b/sources/main.c @@ -280,7 +280,8 @@ int main(int argc, const char * argv[]) dap_config_get_item_int32(g_config, "traffic_track", "callback_timeout"); dap_traffic_track_init(l_server, timeout); - // dap_traffic_callback_set(db_auth_traffic_track_callback); + dap_traffic_callback_set(dap_chain_net_srv_traffic_callback); + //dap_traffic_callback_set(db_auth_traffic_track_callback); } // TCP-specific things