icremental net cleanup 3 #4397

pull Diapolo wants to merge 2 commits into bitcoin:master from Diapolo:net_cleanup_incr_3 changing 1 files +56 −48

Diapolo commented at 7:19 AM on June 24, 2014: none

No description provided.
Diapolo commented at 7:30 AM on June 24, 2014: none

I'm so annoyed by that ancient GCC in pulltester, who isn't aware of this:

<pre> net.cpp:1623: error: â€˜PROTECTION_LEVEL_UNRESTRICTEDâ€™ was not declared in this scope net.cpp:1624: error: â€˜IPV6_PROTECTION_LEVELâ€™ was not declared in this scope </pre>

Gnahh....

small cleanup of #ifdefs in BindListenPort()

- SO_NOSIGPIPE isn't available on WIN32 so merge the 2 non-WIN32 blocks
- use predefined names from header for IPV6_PROTECTION_LEVEL and
  PROTECTION_LEVEL_UNRESTRICTED

9e9ca2b671

add missing BOOST_FOREACH indentation in ThreadSocketHandler() 5d59921237
in src/net.cpp:None in 7dc65fadca outdated
```
1587 | @@ -1587,18 +1588,15 @@ bool BindListenPort(const CService &addrBind, string& strError)
1588 |          return false;
1589 |      }
1590 |  
1591 | +#ifndef WIN32
1592 |  #ifdef SO_NOSIGPIPE
1593 | -    // Different way of disabling SIGPIPE on BSD
```
laanwj commented at 5:21 AM on June 25, 2014:

Why do you remove this comment?

Diapolo commented at 8:49 AM on June 26, 2014:

Another place in the source with that code didn't contain it, so I thought it would be obvious what's happening here. Can re-add, if you want.

laanwj commented at 8:51 AM on June 26, 2014:

This is far from obvious to me, at least.
BitcoinPullTester commented at 9:20 AM on June 26, 2014: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/p4397_5d59921237ecb5a301ac37e0b97eb9c371a43d11/ for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.
jgarzik commented at 1:57 PM on June 26, 2014: contributor

untested ACK
Diapolo commented at 7:23 AM on July 1, 2014: none

@laanwj So this one will also die?
laanwj commented at 7:45 AM on July 1, 2014: member

@Diapolo no, untested ACK

Edit: Checked with git diff -w that there are no changes beyond a reindent and moving defines around.
laanwj merged this on Jul 1, 2014
laanwj closed this on Jul 1, 2014
laanwj referenced this in commit 9aaa1cadf4 on Jul 1, 2014
Diapolo deleted the branch on Jul 1, 2014
MarcoFalke locked this on Sep 8, 2021

Contributors