Make IPv6 support optional again (defaults to enabled) #1431

pull luke-jr wants to merge 3 commits into bitcoin:master from luke-jr:opt_ipv6 changing 6 files +55 −8

luke-jr commented at 4:43 PM on June 8, 2012: member

No description provided.
in src/init.cpp:None in 4ded13c538 outdated
```
 453 | @@ -454,6 +454,10 @@ bool AppInit2()
 454 |                  SetLimited(net);
 455 |          }
 456 |      }
 457 | +#if defined(USE_IPV6) && ! USE_IPV6
```
sipa commented at 4:54 PM on June 8, 2012:

Shouldn't this be !defined(USE_IPV6) || !USE_IPV6 ?

luke-jr commented at 5:31 PM on June 8, 2012:

If USE_IPV6 is not defined, then there's no support compiled in to disable.

sipa commented at 8:44 PM on June 8, 2012:

Right.
jgarzik commented at 5:21 PM on June 8, 2012: contributor

IPv6 support should be enabled by default, disabled by necessity.
luke-jr commented at 5:31 PM on June 8, 2012: member

@jgarzik That's what this does...
sipa commented at 8:47 PM on June 8, 2012: member

What is the practical difference between USE_IPV6=0 and USE_IPV6=-? One compiles it in, but leaves no way to use it, the other just doesn't compile it in.
luke-jr commented at 8:57 PM on June 8, 2012: member

-onlynet=ipv6 should work, no?
sipa commented at 9:04 PM on June 8, 2012: member

If you call SetLimited(NET_IPV6) explicitly, -onlynet=ipv6 will just disable all other networks, and there won't be any network left.
luke-jr commented at 9:38 PM on June 8, 2012: member

That's why it's in an 'else' clause
sipa commented at 9:47 PM on June 8, 2012: member

Oops, missed that in the diff. ACK.
luke-jr commented at 3:46 PM on June 22, 2012: member
Found and fixed some build bugs:
1. Omitting USE_IPV6 in Bitcoin-Qt effectively disabled it
2. The preprocessor might evaluate the right-hand side of && even if the left hand side is false, so complained if USE_IPV6 was undefined
jgarzik commented at 5:08 PM on August 1, 2012: contributor

weak ACK. Would prefer a better system for including and overriding USE_FOO defaults. Some build systems look for a file "makefile.local" or "makefile.cfg" or whatever. If it exists, read it and use it to adjust the defaults.
luke-jr commented at 5:13 PM on August 1, 2012: member

GNUmakefile can be used for that purpose (I do this).
Diapolo commented at 5:53 PM on August 1, 2012: none

Would be nice to not introduce something that does not work on Windows or makes building even harder to do @GNUmakefile ;).
luke-jr commented at 5:54 PM on August 1, 2012: member

@Diapolo GNUmakefile is more of an out-of-tree config thing. Windows has .BAT files :P
BitcoinPullTester commented at 1:40 AM on August 10, 2012: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/751b8eb120375a1a045d55f267d2d93d807ab649 for binaries and test log.
Make IPv6 support buildtime-optional again (defaults to enabled) e422bebbdc
Bugfix: Make USE_UPNP=- work with makefile.{linux-mingw,mingw,osx} too 45beb88966
Allow building with IPv6 support, but it disabled by default 9655d73f49
gmaxwell commented at 9:17 PM on August 23, 2012: contributor

ACK.
gmaxwell referenced this in commit 1bcd3f26c0 on Aug 23, 2012
gmaxwell merged this on Aug 23, 2012
gmaxwell closed this on Aug 23, 2012
Diapolo commented at 9:24 PM on August 23, 2012: none

So with Qt, now do I need to supply "USE_IPV6=1" or is that also default for Qt ^^?
luke-jr commented at 9:41 PM on August 23, 2012: member

It's default.
laanwj commented at 5:57 AM on August 24, 2012: member

It has been default for a long time. IPv6 is not exactly experimental anymore :)
suprnurd referenced this in commit 7a5943c3a2 on Dec 5, 2017
lateminer referenced this in commit 72759ccd0c on Jan 22, 2019
lateminer referenced this in commit 01651b6c63 on May 6, 2020
DrahtBot locked this on Sep 8, 2021

Contributors

Milestone
0.7.0

Linked (view graph)

#1671 next 2012-08-13