-
Notifications
You must be signed in to change notification settings - Fork 193
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge bitcoin/bitcoin#31469: [28.x] 28.1rc2 backports
5576618 doc: update release notes for 28.1rc2 (Ava Chow) 01fe07a examples: Generate example bitcoin.conf (Ava Chow) 7ddfcf3 doc: Generate manpages (Ava Chow) e0b27b2 build: Bump to 28.1rc2 (Ava Chow) bdc6b3e Add release note for #31223 (Martin Zumsande) a0585b6 test: add functional test for -port behavior (Martin Zumsande) bbde830 net, init: derive default onion port if a user specified a -port (Martin Zumsande) 227642d test: fix MIN macro-redefinition (0xb10c) b8112cf util: use explicit cast in MultiIntBitSet::Fill() (Vasil Dimov) 2835158 fuzz: add cstdlib to FuzzedDataProvider (fanquake) Pull request description: Backports: * #31223 * #31448 * #31431 * #31419 ACKs for top commit: hodlinator: re-ACK 5576618 Tree-SHA512: f99f3c5960f18f6894832c5f9a827f97fd3c6e086670341760ce1b77c304d53136492371c59148f3b4bbcfe2d5428c835fe632c61b229b40f1f6f6cf2b72cdca
- Loading branch information
Showing
20 changed files
with
130 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| #!/usr/bin/env python3 | ||
| # Copyright (c) 2024-present The Bitcoin Core developers | ||
| # Distributed under the MIT software license, see the accompanying | ||
| # file COPYING or http://www.opensource.org/licenses/mit-license.php. | ||
| """ | ||
| Test the -port option and its interactions with | ||
| -bind. | ||
| """ | ||
|
|
||
| from test_framework.test_framework import ( | ||
| BitcoinTestFramework, | ||
| ) | ||
| from test_framework.util import ( | ||
| p2p_port, | ||
| ) | ||
|
|
||
|
|
||
| class PortTest(BitcoinTestFramework): | ||
| def set_test_params(self): | ||
| self.setup_clean_chain = True | ||
| # Avoid any -bind= on the command line. | ||
| self.bind_to_localhost_only = False | ||
| self.num_nodes = 1 | ||
|
|
||
| def run_test(self): | ||
| node = self.nodes[0] | ||
| node.has_explicit_bind = True | ||
| port1 = p2p_port(self.num_nodes) | ||
| port2 = p2p_port(self.num_nodes + 5) | ||
|
|
||
| self.log.info("When starting with -port, bitcoind binds to it and uses port + 1 for an onion bind") | ||
| with node.assert_debug_log(expected_msgs=[f'Bound to 0.0.0.0:{port1}', f'Bound to 127.0.0.1:{port1 + 1}']): | ||
| self.restart_node(0, extra_args=["-listen", f"-port={port1}"]) | ||
|
|
||
| self.log.info("When specifying -port multiple times, only the last one is taken") | ||
| with node.assert_debug_log(expected_msgs=[f'Bound to 0.0.0.0:{port2}', f'Bound to 127.0.0.1:{port2 + 1}'], unexpected_msgs=[f'Bound to 0.0.0.0:{port1}']): | ||
| self.restart_node(0, extra_args=["-listen", f"-port={port1}", f"-port={port2}"]) | ||
|
|
||
| self.log.info("When specifying ports with both -port and -bind, the one from -port is ignored") | ||
| with node.assert_debug_log(expected_msgs=[f'Bound to 0.0.0.0:{port2}'], unexpected_msgs=[f'Bound to 0.0.0.0:{port1}']): | ||
| self.restart_node(0, extra_args=["-listen", f"-port={port1}", f"-bind=0.0.0.0:{port2}"]) | ||
|
|
||
| self.log.info("When -bind specifies no port, the values from -port and -bind are combined") | ||
| with self.nodes[0].assert_debug_log(expected_msgs=[f'Bound to 0.0.0.0:{port1}']): | ||
| self.restart_node(0, extra_args=["-listen", f"-port={port1}", "-bind=0.0.0.0"]) | ||
|
|
||
| self.log.info("When an onion bind specifies no port, the value from -port, incremented by 1, is taken") | ||
| with self.nodes[0].assert_debug_log(expected_msgs=[f'Bound to 127.0.0.1:{port1 + 1}']): | ||
| self.restart_node(0, extra_args=["-listen", f"-port={port1}", "-bind=127.0.0.1=onion"]) | ||
|
|
||
| self.log.info("Invalid values for -port raise errors") | ||
| self.stop_node(0) | ||
| node.extra_args = ["-listen", "-port=65536"] | ||
| node.assert_start_raises_init_error(expected_msg="Error: Invalid port specified in -port: '65536'") | ||
| node.extra_args = ["-listen", "-port=0"] | ||
| node.assert_start_raises_init_error(expected_msg="Error: Invalid port specified in -port: '0'") | ||
|
|
||
|
|
||
| if __name__ == '__main__': | ||
| PortTest(__file__).main() |
Oops, something went wrong.