Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Listen on multiple addresses for net_plugin p2p. #1411

Merged
merged 13 commits into from
Jul 25, 2023
Merged

Listen on multiple addresses for net_plugin p2p. #1411

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3a7c072
Listen on multiple addresses for net_plugin p2p.
jgiszczak Jul 15, 2023
d5fdd64
Move post of timers outside listener post loop.
jgiszczak Jul 17, 2023
1c81166
Restore running nodeos with zero p2p listen ports.
jgiszczak Jul 18, 2023
db93c63
Set p2p_address for outgoing connections as well.
jgiszczak Jul 19, 2023
4d71d2a
Rename connection's p2p_address to listen_address.
jgiszczak Jul 19, 2023
3c10138
Add p2p multiple listen port test and new fields to connections API
jgiszczak Jul 20, 2023
a4f9399
Expand description of p2p-server-address option and normalize language.
jgiszczak Jul 20, 2023
1bbb36a
Merge branch 'main' into p2p-multiple-listen-addresses
jgiszczak Jul 20, 2023
374f8a3
Merge branch 'main' into p2p-multiple-listen-addresses
jgiszczak Jul 21, 2023
2f55f15
Revise net_plugin p2p-listen-endpoint parsing for readability.
jgiszczak Jul 21, 2023
4a4875e
Add test to verify nodeos can run with p2p disabled.
jgiszczak Jul 22, 2023
31f3889
Extend auto bp peering test to include p2p-server-address args.
jgiszczak Jul 25, 2023
501056f
Merge branch 'main' into p2p-multiple-listen-addresses
jgiszczak Jul 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugins/net_plugin/include/eosio/net_plugin/auto_bp_peering.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ class bp_connection_manager {

fc_dlog(self()->get_logger(), "pending_downstream_neighbors: ${pending_downstream_neighbors}",
("pending_downstream_neighbors", to_string(pending_downstream_neighbors)));
for (auto neighbor : pending_downstream_neighbors) { self()->connections.connect(config.bp_peer_addresses[neighbor]); }
for (auto neighbor : pending_downstream_neighbors) { self()->connections.connect(config.bp_peer_addresses[neighbor], *self()->p2p_addresses.begin() ); }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As discussed please update help and PR description indicating that the first configured server_address is reported in the handshake message to peers. Also guard against p2p_addresses being empty here.


pending_neighbors = std::move(pending_downstream_neighbors);
finder.add_upstream_neighbors(pending_neighbors);
Expand Down
13 changes: 9 additions & 4 deletions plugins/net_plugin/include/eosio/net_plugin/net_plugin.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,14 @@ namespace eosio {

struct connection_status {
string peer;
bool connecting = false;
bool syncing = false;
bool is_bp_peer = false;
string remote_ip;
string remote_port;
bool connecting = false;
bool syncing = false;
bool is_bp_peer = false;
bool is_socket_open = false;
bool is_blocks_only = false;
bool is_transactions_only = false;
handshake_message last_handshake;
};

Expand Down Expand Up @@ -49,4 +54,4 @@ namespace eosio {

}

FC_REFLECT( eosio::connection_status, (peer)(connecting)(syncing)(is_bp_peer)(last_handshake) )
FC_REFLECT( eosio::connection_status, (peer)(remote_ip)(remote_port)(connecting)(syncing)(is_bp_peer)(is_socket_open)(is_blocks_only)(is_transactions_only)(last_handshake) )
Loading