Skip to content
Snippets Groups Projects
Commit ef31890d authored by dmitriy.gerasimov's avatar dmitriy.gerasimov
Browse files

Merge branch 'bugs-4415' into 'master'

bugs-4415

See merge request cellframe/cellframe-node!186
parents b6639803 8afce957
No related branches found
No related tags found
No related merge requests found
......@@ -8,7 +8,7 @@ set(CMAKE_C_STANDARD 11)
SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}")
SET( CPACK_PACKAGE_VERSION_MAJOR 4)
SET( CPACK_PACKAGE_VERSION_MINOR 0)
SET( CPACK_PACKAGE_VERSION_PATCH 50)
SET( CPACK_PACKAGE_VERSION_PATCH 51)
# init CellFrame SDK
add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}\"")
......
Subproject commit 557d688dd02629f2864a3dabe88eb8ad425da934
Subproject commit 4e0d8da7331479832d8e248a422fa5c5fe9d879f
Subproject commit 618770e6a20e04031fee135ef6c04ca4e2f1e8b7
Subproject commit a58336ccc97d38e1f6011a91d2e6555b0eccdd1e
......@@ -394,8 +394,7 @@ int main( int argc, const char **argv )
if( l_port > 0 ) {
l_server = dap_server_new(l_events, (dap_config_get_item_str(g_config, "server", "listen_address")),
(uint16_t) l_port,
DAP_SERVER_TCP );
(uint16_t) l_port, DAP_SERVER_TCP, NULL );
} else
log_it( L_WARNING, "Server is enabled but no port is defined" );
......@@ -446,7 +445,7 @@ int main( int argc, const char **argv )
bool bootstrap_balancer_enabled = dap_config_get_item_bool_default(g_config, "dns_server", "bootstrap_balancer", false);
log_it(L_DEBUG, "config dns_server->bootstrap_balancer = \"%u\" ", bootstrap_balancer_enabled);
if (bootstrap_balancer_enabled) {
dap_dns_server_start();
dap_dns_server_start(l_events);
}
// Chain Network init
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment