topo: комментарии к функциям topo_node/topo_group
conn_mgr: src node_id вместо conn->peer_node_id, препенд ETCP_RT_ID_CONN_MGR к dgram, bind CONN_MGR после etcp_router_init call: guard CALL_ST_CONNECTING при accept
This commit is contained in:
1 parent
1fce405204
commit
e7fc69bb1d
7 files changed
+95
-19
No files matched your search
+4
-1
@@ -221,7 +221,6 @@ static int instance_init_common(struct UTUN_INSTANCE* instance, struct UASYNC* u
|
||||
DEBUG_ERROR(DEBUG_CATEGORY_BGP, "Failed to initialize BGP module");
|
||||
} else {
|
||||
DEBUG_INFO(DEBUG_CATEGORY_BGP, "BGP module initialized");
|
||||
etcp_router_bind(instance, ETCP_RT_ID_CONN_MGR, conn_mgr_router_recv_handler);
|
||||
topo_group_invite_init(instance);
|
||||
struct TOPO_GROUP* g = topo_groups_get_default(instance->topo_groups);
|
||||
if (instance->rt && g && g->local_node) {
|
||||
@@ -255,6 +254,10 @@ static int instance_init_common(struct UTUN_INSTANCE* instance, struct UASYNC* u
|
||||
return -1;
|
||||
}
|
||||
|
||||
// Bind CONN_MGR handler AFTER etcp_router_init (init затирает router_bindings)
|
||||
if (g_topo_group_enabled && instance->topo_groups)
|
||||
etcp_router_bind(instance, ETCP_RT_ID_CONN_MGR, conn_mgr_router_recv_handler);
|
||||
|
||||
// Bind DATA handler via etcp_router (after etcp_router_init)
|
||||
if (routing_bind(instance) != 0) {
|
||||
DEBUG_ERROR(DEBUG_CATEGORY_ROUTING, "Failed to bind DATA via etcp_router");
|
||||
|
||||
Reference in new issue
Block a user