diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-09-06 01:54:31 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-09-06 02:03:48 +0200 |
| commit | 6866b4912b8013ed748d12250209f7079a3c92e6 (patch) | |
| tree | 43e6f6d0c8bda76a134783d4f5d12bff9af55c53 /src/init.cpp | |
| parent | 28485c783d826fa6ce14aaf215e82118c1af8db7 (diff) | |
| parent | 352d582ba240b825cb834cdde041864bafca0e21 (diff) | |
| download | bitcoin-6866b4912b8013ed748d12250209f7079a3c92e6.tar.xz | |
Merge #10596: Add vConnect to CConnman::Options
352d582ba Add vConnect to CConnman::Options (Marko Bencun)
Pull request description:
Split the "-connect" argument parsing out of CConnman and put it into
AppInitMain().
Tree-SHA512: f2d3efc4e2c5808ff98696ea20dd96df599bc472ed5afc9c3eea305d94c36a6ab50c632aa05396c7c34d1917d91b1e7ccd725656ff2631e2a36d9eac477455dc
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/init.cpp b/src/init.cpp index 6114bbaa2d..a46742e56a 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1677,7 +1677,14 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler) if (gArgs.IsArgSet("-seednode")) { connOptions.vSeedNodes = gArgs.GetArgs("-seednode"); } - + // Initiate outbound connections unless connect=0 + connOptions.m_use_addrman_outgoing = !gArgs.IsArgSet("-connect"); + if (!connOptions.m_use_addrman_outgoing) { + const auto connect = gArgs.GetArgs("-connect"); + if (connect.size() != 1 || connect[0] != "0") { + connOptions.m_specified_outgoing = connect; + } + } if (!connman.Start(scheduler, connOptions)) { return false; } |