highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-04-19 19:29:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#33231: net: Prevent node from binding to the same CService

Browse Source 
4d4789dffa net: Prevent node from binding to the same CService (woltx)

Pull request description:

  Currently, if the node inadvertently starts with repeated `-bind` options (e.g. `./build/bin/bitcoind -listen -bind=0.0.0.0 -bind=0.0.0.0`), the user will receive a misleading message followed by the node shutdown:

  ```
  [net:error] Unable to bind to 0.0.0.0:8333 on this computer. Bitcoin Core is probably already running.
  [error] Unable to bind to 0.0.0.0:8333 on this computer. Bitcoin Core is probably already running.
  ```

  And the user might spend some time looking for a `bitcoind` process or what application is using port 8333, when what happens is that Bitcoin Core successfully connected to port 8333 and then tries again, generating this fatal error.

  This PR proposes that repeated `-bind` options have no effect.

ACKs for top commit:
  l0rinc:
    ACK 4d4789dffa
  yuvicc:
    re-ACK 4d4789dffa
  sipa:
    utACK 4d4789dffa
  achow101:
    ACK 4d4789dffa
  vasild:
    ACK 4d4789dffa
  naiyoma:
    Tested ACK 4d4789dffa

Tree-SHA512: f1042c00417da16550403cfcb75cb8b12740e67cf92a1d8e3c007ae81fcf741907088a633129ce12a6a48ad07fc9f320602792cafed73ec33f6306cd854514b4
This commit is contained in:
Ava Chow
2025-09-09 14:57:16 -07:00
parent 591eea7b5a 4d4789dffa
commit 2c8a478db4
2 changed files with 55 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
test/functional/feature_bind_extra.py
View File

@@ -3,10 +3,12 @@
# Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
"""
Test starting bitcoind with -bind and/or -bind=...=onion and confirm
that bind happens on the expected ports.
Test starting bitcoind with -bind and/or -bind=...=onion, confirm that
it binds to the expected ports, and verify that duplicate or conflicting
-bind/-whitebind configurations are rejected with a descriptive error.
"""
from itertools import combinations_with_replacement
from test_framework.netutil import (
addr_to_hex,
get_bind_addrs,
@@ -14,13 +16,13 @@ from test_framework.netutil import (
from test_framework.test_framework import (
BitcoinTestFramework,
)
from test_framework.test_node import ErrorMatch
from test_framework.util import (
assert_equal,
p2p_port,
rpc_port,
)
class BindExtraTest(BitcoinTestFramework):
def set_test_params(self):
self.setup_clean_chain = True
@@ -87,5 +89,14 @@ class BindExtraTest(BitcoinTestFramework):
binds = set(filter(lambda e: e[1] != rpc_port(i), binds))
assert_equal(binds, set(expected_services))
self.stop_node(0)
addr = "127.0.0.1:11012"
for opt1, opt2 in combinations_with_replacement([f"-bind={addr}", f"-bind={addr}=onion", f"-whitebind=noban@{addr}"], 2):
self.nodes[0].assert_start_raises_init_error(
[opt1, opt2],
"Error: Duplicate binding configuration",
match=ErrorMatch.PARTIAL_REGEX)
if __name__ == '__main__':
BindExtraTest(__file__).main()