|
|
|
@ -557,6 +557,7 @@ static void cm_start_phase_direct(struct CONN_MGR_ENTRY* entry) { |
|
|
|
etcp_conn_add_init_cbk(conn, cm_direct_init_cb, entry); |
|
|
|
etcp_conn_add_init_cbk(conn, cm_direct_init_cb, entry); |
|
|
|
sc_init_ctx(&conn->crypto_ctx, &entry->mgr->instance->my_keys); |
|
|
|
sc_init_ctx(&conn->crypto_ctx, &entry->mgr->instance->my_keys); |
|
|
|
sc_set_peer_public_key(&conn->crypto_ctx, target->node->public_key, 0); |
|
|
|
sc_set_peer_public_key(&conn->crypto_ctx, target->node->public_key, 0); |
|
|
|
|
|
|
|
etcp_conn_set_peer_node_id(conn, entry->node_id); |
|
|
|
if (etcp_link_new(conn, s, &sa, 0)) { |
|
|
|
if (etcp_link_new(conn, s, &sa, 0)) { |
|
|
|
entry->main.timer = uasync_set_timeout(entry->mgr->instance->ua, (int)(entry->mgr->direct_timeout_ms * 10), entry, cm_direct_timeout_cb, "conn_mgr_db_direct"); |
|
|
|
entry->main.timer = uasync_set_timeout(entry->mgr->instance->ua, (int)(entry->mgr->direct_timeout_ms * 10), entry, cm_direct_timeout_cb, "conn_mgr_db_direct"); |
|
|
|
return; |
|
|
|
return; |
|
|
|
@ -589,6 +590,7 @@ static void cm_start_phase_direct(struct CONN_MGR_ENTRY* entry) { |
|
|
|
etcp_conn_add_init_cbk(conn, cm_direct_init_cb, entry); |
|
|
|
etcp_conn_add_init_cbk(conn, cm_direct_init_cb, entry); |
|
|
|
sc_init_ctx(&conn->crypto_ctx, &entry->mgr->instance->my_keys); |
|
|
|
sc_init_ctx(&conn->crypto_ctx, &entry->mgr->instance->my_keys); |
|
|
|
sc_set_peer_public_key(&conn->crypto_ctx, target->node->public_key, 0); |
|
|
|
sc_set_peer_public_key(&conn->crypto_ctx, target->node->public_key, 0); |
|
|
|
|
|
|
|
etcp_conn_set_peer_node_id(conn, entry->node_id); |
|
|
|
if (etcp_link_new(conn, s, &sa, 0)) { |
|
|
|
if (etcp_link_new(conn, s, &sa, 0)) { |
|
|
|
entry->main.timer = uasync_set_timeout(entry->mgr->instance->ua, (int)(entry->mgr->direct_timeout_ms * 10), entry, cm_direct_timeout_cb, "conn_mgr_direct"); |
|
|
|
entry->main.timer = uasync_set_timeout(entry->mgr->instance->ua, (int)(entry->mgr->direct_timeout_ms * 10), entry, cm_direct_timeout_cb, "conn_mgr_direct"); |
|
|
|
return; |
|
|
|
return; |
|
|
|
|