ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-07 19:40:25 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[CORDA-2323]: Make detectPublicIp disabled by default. (#4404)

Browse Source
This commit is contained in:
Michele Sollecito 2018-12-12 13:38:57 +00:00 committed by GitHub
parent 351207145c
commit ccaf9dfbfa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/source/corda-configuration-file.rst
View File

@ -166,9 +166,9 @@ The available config fields are listed below.
If no value is specified in the node config file, the node will attempt to detect if it's running on a developer machine and set ``devMode=true`` in that case. If no value is specified in the node config file, the node will attempt to detect if it's running on a developer machine and set ``devMode=true`` in that case.
This value can be overridden from the command line using the ``--dev-mode`` option. This value can be overridden from the command line using the ``--dev-mode`` option.
:detectPublicIp: This flag toggles the auto IP detection behaviour, it is enabled by default. On startup the node will :detectPublicIp: This flag toggles the auto IP detection behaviour, it is disabled by default. If enabled, on startup the node will
attempt to discover its externally visible IP address first by looking for any public addresses on its network attempt to discover its externally visible IP address first by looking for any public addresses on its network
interfaces, and then by sending an IP discovery request to the network map service. Set to ``false`` to disable. interfaces, and then by sending an IP discovery request to the network map service. Set to ``true`` to enable.
:compatibilityZoneURL: The root address of Corda compatibility zone network management services, it is used by the Corda node to register with the network and :compatibilityZoneURL: The root address of Corda compatibility zone network management services, it is used by the Corda node to register with the network and
obtain Corda node certificate, (See :doc:`permissioning` for more information.) and also used by the node to obtain network map information. Cannot be obtain Corda node certificate, (See :doc:`permissioning` for more information.) and also used by the node to obtain network map information. Cannot be

1
node/src/integration-test/kotlin/net/corda/services/messaging/AdditionP2PAddressModeTest.kt
View File

@ -32,7 +32,6 @@ class AdditionP2PAddressModeTest {
val mainAddress = portAllocation.nextHostAndPort().toString() val mainAddress = portAllocation.nextHostAndPort().toString()
val altAddress = portAllocation.nextHostAndPort().toString() val altAddress = portAllocation.nextHostAndPort().toString()
val haConfig = mutableMapOf<String, Any?>() val haConfig = mutableMapOf<String, Any?>()
haConfig["detectPublicIp"] = false
haConfig["p2pAddress"] = mainAddress //advertise this as primary haConfig["p2pAddress"] = mainAddress //advertise this as primary
haConfig["messagingServerAddress"] = altAddress // but actually host on the alternate address haConfig["messagingServerAddress"] = altAddress // but actually host on the alternate address
haConfig["messagingServerExternal"] = false haConfig["messagingServerExternal"] = false

2
node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
View File

@ -50,7 +50,7 @@ interface NodeConfiguration {
// TODO Move into DevModeOptions // TODO Move into DevModeOptions
val useTestClock: Boolean get() = false val useTestClock: Boolean get() = false
val lazyBridgeStart: Boolean val lazyBridgeStart: Boolean
val detectPublicIp: Boolean get() = true val detectPublicIp: Boolean get() = false
val sshd: SSHDConfiguration? val sshd: SSHDConfiguration?
val database: DatabaseConfig val database: DatabaseConfig
val noLocalShell: Boolean get() = false val noLocalShell: Boolean get() = false

2
node/src/main/kotlin/net/corda/node/services/config/NodeConfigurationImpl.kt
View File

@ -92,7 +92,7 @@ data class NodeConfigurationImpl(
val devModeOptions: DevModeOptions? = null val devModeOptions: DevModeOptions? = null
const val useTestClock: Boolean = false const val useTestClock: Boolean = false
const val lazyBridgeStart: Boolean = true const val lazyBridgeStart: Boolean = true
const val detectPublicIp: Boolean = true const val detectPublicIp: Boolean = false
val additionalNodeInfoPollingFrequencyMsec: Long = 5.seconds.toMillis() val additionalNodeInfoPollingFrequencyMsec: Long = 5.seconds.toMillis()
val sshd: SSHDConfiguration? = null val sshd: SSHDConfiguration? = null
val transactionCacheSizeMegaBytes: Int? = null val transactionCacheSizeMegaBytes: Int? = null