Browse Source

1

nodeinfo-routing-update
jeka 1 week ago
parent
commit
23482c5046
  1. 2
      src/etcp_connections.c
  2. 10
      src/route_bgp.c
  3. 2
      src/utun.c

2
src/etcp_connections.c

@ -1050,8 +1050,8 @@ static void etcp_connections_read_callback_socket(socket_t sock, void* arg) {
link->link_state = 3; link->link_state = 3;
if (link->etcp->initialized == 0) { if (link->etcp->initialized == 0) {
etcp_conn_ready(link->etcp); etcp_conn_ready(link->etcp);
DEBUG_INFO(DEBUG_CATEGORY_GENERAL, "Connection established: log_name=%s socket=%s link_id=%d status=UP", link->etcp->log_name, e_sock->name, link->local_link_id);
} }
DEBUG_INFO(DEBUG_CATEGORY_GENERAL, "Connection established: log_name=%s socket=%s link_id=%d status=UP", link->etcp->log_name, e_sock->name, link->local_link_id);
DEBUG_INFO(DEBUG_CATEGORY_CONNECTION, "[%s] Link %p (local_id=%d) initialized and marked as UP (server)", link->etcp->log_name, link, link->local_link_id); DEBUG_INFO(DEBUG_CATEGORY_CONNECTION, "[%s] Link %p (local_id=%d) initialized and marked as UP (server)", link->etcp->log_name, link, link->local_link_id);
start_keepalive_timer(link); start_keepalive_timer(link);
loadbalancer_link_ready(link); loadbalancer_link_ready(link);

10
src/route_bgp.c

@ -251,6 +251,8 @@ static void route_bgp_receive_cbk(struct ETCP_CONN* from_conn, struct ll_entry*
return; return;
} }
DEBUG_INFO(DEBUG_CATEGORY_DEBUG, "RECV route from %s", from_conn->log_name);
DEBUG_INFO(DEBUG_CATEGORY_BGP, "route_bgp_receive_cbk: from=%016llx len=%zu", DEBUG_INFO(DEBUG_CATEGORY_BGP, "route_bgp_receive_cbk: from=%016llx len=%zu",
(unsigned long long)from_conn->peer_node_id, entry->len); (unsigned long long)from_conn->peer_node_id, entry->len);
@ -336,7 +338,7 @@ static void route_bgp_receive_cbk(struct ETCP_CONN* from_conn, struct ll_entry*
} }
struct BGP_ROUTE_REQUEST* req = (struct BGP_ROUTE_REQUEST*)data; struct BGP_ROUTE_REQUEST* req = (struct BGP_ROUTE_REQUEST*)data;
DEBUG_INFO(DEBUG_CATEGORY_BGP, "Received table request from %s (version=%u), sending full table", DEBUG_INFO(DEBUG_CATEGORY_BGP, "Received table request from %s (version=%u), sending full table",
from_conn->log_name, be32toh(req->version)); from_conn->log_name, req->version);
route_bgp_send_full_table(bgp, from_conn); route_bgp_send_full_table(bgp, from_conn);
} }
@ -352,8 +354,8 @@ static void route_bgp_receive_cbk(struct ETCP_CONN* from_conn, struct ll_entry*
// Callback для готовности ETCP соединения - отправляет маршруты // Callback для готовности ETCP соединения - отправляет маршруты
static void route_bgp_on_conn_up(struct ETCP_CONN* conn, void* arg) { static void route_bgp_on_conn_up(struct ETCP_CONN* conn, void* arg) {
(void)arg; (void)arg;
//printf ("on Up: %s\n", conn->log_name);
if (conn && conn->instance && conn->instance->bgp) { if (conn && conn->instance && conn->instance->bgp) {
DEBUG_INFO(DEBUG_CATEGORY_DEBUG, "BGP ON UP %s", conn->log_name);
DEBUG_TRACE(DEBUG_CATEGORY_BGP, "Connection %s on up ", conn->log_name); DEBUG_TRACE(DEBUG_CATEGORY_BGP, "Connection %s on up ", conn->log_name);
route_bgp_new_conn(conn); route_bgp_new_conn(conn);
} }
@ -361,8 +363,8 @@ static void route_bgp_on_conn_up(struct ETCP_CONN* conn, void* arg) {
static void route_bgp_on_conn_down(struct ETCP_CONN* conn, void* arg) { static void route_bgp_on_conn_down(struct ETCP_CONN* conn, void* arg) {
(void)arg; (void)arg;
//printf ("on Dn\n");
if (conn && conn->instance && conn->instance->bgp) { if (conn && conn->instance && conn->instance->bgp) {
DEBUG_INFO(DEBUG_CATEGORY_DEBUG, "BGP ON DOWN %s", conn->log_name);
DEBUG_TRACE(DEBUG_CATEGORY_BGP, "Connection %s on down ", conn->log_name); DEBUG_TRACE(DEBUG_CATEGORY_BGP, "Connection %s on down ", conn->log_name);
route_bgp_remove_conn(conn); route_bgp_remove_conn(conn);
} }
@ -372,8 +374,8 @@ static void route_bgp_on_conn_down(struct ETCP_CONN* conn, void* arg) {
static void route_bgp_etcp_conn_cbk(struct ETCP_CONN* conn, void* arg) { static void route_bgp_etcp_conn_cbk(struct ETCP_CONN* conn, void* arg) {
(void)arg; (void)arg;
if (conn && conn->instance && conn->instance->bgp) { if (conn && conn->instance && conn->instance->bgp) {
DEBUG_INFO(DEBUG_CATEGORY_DEBUG, "BGP SET CBKS %s", conn->log_name);
DEBUG_TRACE(DEBUG_CATEGORY_BGP, "Set ETCP ready callback for connection %s", conn->log_name); DEBUG_TRACE(DEBUG_CATEGORY_BGP, "Set ETCP ready callback for connection %s", conn->log_name);
//printf ("on evt set\n");
etcp_conn_set_up_cbk(conn, route_bgp_on_conn_up, conn->instance->bgp); etcp_conn_set_up_cbk(conn, route_bgp_on_conn_up, conn->instance->bgp);
etcp_conn_set_down_cbk(conn, route_bgp_on_conn_down, conn->instance->bgp); etcp_conn_set_down_cbk(conn, route_bgp_on_conn_down, conn->instance->bgp);
} }

2
src/utun.c

@ -327,7 +327,7 @@ int main(int argc, char *argv[]) {
return 1; return 1;
} }
uasync_set_timeout(ua, 10000, ua, test_tmr); // uasync_set_timeout(ua, 10000, ua, test_tmr);
#ifdef _WIN32 #ifdef _WIN32
// Check for wintun.dll before enabling TUN // Check for wintun.dll before enabling TUN

Loading…
Cancel
Save