add SeedNodes to CConnman::Options #10467

pull benma wants to merge 1 commits into bitcoin:master from benma:connmannoptions_seednodes changing 3 files +12 −9

benma commented at 10:07 AM on May 27, 2017: none

Start of a series of changes to clean up the instantiation of connman by decoupling the command line arguments.
benma commented at 10:10 AM on May 27, 2017: none

Pinging @theuni
fanquake added the label P2P on May 27, 2017
benma commented at 5:00 PM on May 29, 2017: none

@fanquake I don't think the P2P label is accurate. It should be Refactoring, like #9897, which this PR is a subset of.
fanquake added the label Refactoring on May 30, 2017
fanquake removed the label P2P on May 30, 2017

in src/net.cpp:2215 in dee1831583 outdated

2211 | @@ -2212,6 +2212,10 @@ bool CConnman::Start(CScheduler& scheduler, std::string& strNodeError, Options c
2212 |  
2213 |      SetBestHeight(connOptions.nBestHeight);
2214 |  
2215 | +    BOOST_FOREACH(const std::string& strDest, connOptions.vSeedNodes) {

fanquake commented at 12:57 AM on May 30, 2017:

Can you change this to not introduce new Boost code.

benma commented at 7:22 AM on May 30, 2017:

Done

add SeedNodes to CConnman::Options

Start of a series of changes to clean up the instantiation of connman
by decoupling the command line arguments.

5d67526026

in src/init.cpp:1658 in dee1831583 outdated

1653 | @@ -1659,6 +1654,11 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
1654 |      connOptions.nMaxOutboundTimeframe = nMaxOutboundTimeframe;
1655 |      connOptions.nMaxOutboundLimit = nMaxOutboundLimit;
1656 |  
1657 | +    if (gArgs.IsArgSet("-seednode")) {
1658 | +        BOOST_FOREACH(const std::string& strDest, gArgs.GetArgs("-seednode"))

fanquake commented at 12:57 AM on May 30, 2017:

Even though your only moving this, if we're going to touch these lines, can you remove Boost.

benma commented at 7:22 AM on May 30, 2017:

Done

benma force-pushed on May 30, 2017
theuni approved
theuni commented at 7:30 PM on May 30, 2017: member

Nice. Ridding CConnman of the argument parsing has been on my todo for a long time.

utACK 5d67526026cd41845e06e93e5ae216bc1a7b9596
laanwj merged this on May 31, 2017
laanwj closed this on May 31, 2017
laanwj referenced this in commit 18ba984140 on May 31, 2017
benma deleted the branch on Jun 1, 2017
PastaPastaPasta referenced this in commit 90685dcc92 on Jun 20, 2019
PastaPastaPasta referenced this in commit 9f54911cd6 on Jun 20, 2019
PastaPastaPasta referenced this in commit b2a6d7b8fb on Jun 22, 2019
PastaPastaPasta referenced this in commit 96f91ff4bf on Jun 22, 2019
PastaPastaPasta referenced this in commit 43dfebf7f6 on Jun 22, 2019
PastaPastaPasta referenced this in commit 5f9bafb597 on Jun 22, 2019
PastaPastaPasta referenced this in commit 41f1916c37 on Jun 22, 2019
PastaPastaPasta referenced this in commit d10c874979 on Jun 22, 2019
PastaPastaPasta referenced this in commit 840ddde0dd on Jun 22, 2019
PastaPastaPasta referenced this in commit 0ed283da7b on Jun 22, 2019
PastaPastaPasta referenced this in commit faafd40460 on Jun 22, 2019
PastaPastaPasta referenced this in commit 4d8a2e4c15 on Jun 22, 2019
PastaPastaPasta referenced this in commit d77a9d51d4 on Jun 22, 2019
PastaPastaPasta referenced this in commit 785420b838 on Jun 24, 2019
barrystyle referenced this in commit cfe5e9e9b3 on Jan 22, 2020
DrahtBot locked this on Sep 8, 2021

Contributors

Labels