aboutsummaryrefslogtreecommitdiffstats
path: root/lib/orber/doc/src/orber.xml
diff options
context:
space:
mode:
authorMarcus Arendt <[email protected]>2014-08-08 15:02:29 +0200
committerMarcus Arendt <[email protected]>2014-08-08 15:02:29 +0200
commite189bae81fbc873d3349b9dec12ef234daf9d8ad (patch)
tree52d2791377955057c44fad4d0479439c900b9c77 /lib/orber/doc/src/orber.xml
parent2525622c384b27581c4b4cb158fc951f15ac5ca3 (diff)
parentc472c3f5aafc81a409d0443c4601de43bafb53cb (diff)
downloadotp-e189bae81fbc873d3349b9dec12ef234daf9d8ad.tar.gz
otp-e189bae81fbc873d3349b9dec12ef234daf9d8ad.tar.bz2
otp-e189bae81fbc873d3349b9dec12ef234daf9d8ad.zip
Merge branch 'maint-17' into maint
Diffstat (limited to 'lib/orber/doc/src/orber.xml')
-rw-r--r--lib/orber/doc/src/orber.xml9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/orber/doc/src/orber.xml b/lib/orber/doc/src/orber.xml
index 16781059c7..a182a56972 100644
--- a/lib/orber/doc/src/orber.xml
+++ b/lib/orber/doc/src/orber.xml
@@ -356,8 +356,8 @@
<v>Type = normal | ssl</v>
<v>Port = integer() > 0</v>
<v>ConfigurationParameters = [{Key, Value}]</v>
- <v>Key = flags | iiop_in_connection_timeout | iiop_max_fragments | iiop_max_in_requests | interceptors | iiop_port | iiop_ssl_port | ssl_server_options</v>
- <v>Value = as described in the User's Guide</v>
+ <v>Key = flags | ip_family | iiop_in_connection_timeout | iiop_max_fragments | iiop_max_in_requests | interceptors | iiop_port | iiop_ssl_port | ssl_server_options</v>
+ <v>Value = as described in the User's Guide or below</v>
<v>Result = {ok, Ref} | {error, Reason} | {'EXCEPTION', #'BAD_PARAM'{}}</v>
<v>Ref = #Ref</v>
<v>Reason = string()</v>
@@ -383,6 +383,9 @@
<item><em>flags</em> - currently it is only possible to override the global
setting for the <c>Use Current Interface in IOR</c> and
<c>Exclude CodeSet Component</c> flags.</item>
+ <item><em>ip_family</em> - can be set to <c>inet</c> or <c>inet6</c> and is
+ used to get a listen interface that uses another IP version than the default
+ set with flags at startup.</item>
<item><em>iiop_port</em> - requires that <c>Use Current Interface in IOR</c>
is activated and the supplied <c>Type</c> is <c>normal</c>. If so,
exported IOR:s will contain the IIOP port defined by this configuration
@@ -390,7 +393,7 @@
<item><em>iiop_ssl_port</em> - almost equivalent to <c>iiop_port</c>.
The difference is that <c>Type</c> shall be <c>ssl</c> and that
exported IOR:s will contain the IIOP via SSL port defined by this configuration
- parameter.</item>
+ parameter.</item>
</list>
<p>If it is not possible to add a listener based on the supplied interface
and port, the error message is one of the ones described in <c>inet</c>