Added the configuration parameters iiop_out_ports_attempts and iiop_out_ports_random.

3 files changed, 52 insertions, 8 deletions

diff --git a/lib/orber/doc/src/ch_install.xml b/lib/orber/doc/src/ch_install.xml
index ab5885954b..dde4bf4006 100644
--- a/lib/orber/doc/src/ch_install.xml
+++ b/lib/orber/doc/src/ch_install.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,12 +13,12 @@
       compliance with the License. You should have received a copy of the
       Erlang Public License along with this software. If not, it can be
       retrieved online at http://www.erlang.org/.
-    
+
       Software distributed under the License is distributed on an "AS IS"
       basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
       the License for the specific language governing rights and limitations
       under the License.
-    
+
     </legalnotice>
 
     <title>Installing Orber</title>
@@ -234,6 +234,16 @@ nodeB@hostB> orber:start().
         <cell align="left" valign="middle">0</cell>
       </row>
       <row>
+        <cell align="left" valign="middle">iiop_out_ports_attempts</cell>
+        <cell align="left" valign="middle">integer() > 0</cell>
+        <cell align="left" valign="middle">1</cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle">iiop_out_ports_random</cell>
+        <cell align="left" valign="middle">true | false</cell>
+        <cell align="left" valign="middle">false</cell>
+      </row>
+      <row>
         <cell align="left" valign="middle">iiop_max_fragments</cell>
         <cell align="left" valign="middle">integer() > 0 | infinity</cell>
         <cell align="left" valign="middle">infinity</cell>
@@ -506,6 +516,13 @@ nodeB@hostB> orber:start().
        If communicating via SSL, make sure you use a version that supports
        the local <c>{port, Port}</c> option. See also
       <seealso marker="ch_install#firewall">Firewall Configuration</seealso>.</item>
+      <tag><em>iiop_out_ports_random</em></tag>
+      <item>Requires that <c>iiop_out_ports</c> define a port range. If that is the
+       case Orber will select a port randomly from that sequence.</item>
+      <tag><em>iiop_out_ports_attempts</em></tag>
+      <item>Requires that <c>iiop_out_ports</c> define a port range. If so Orber will
+       accept a number of timeouts, defined by this parameter, when trying to connect
+       to another ORB.</item>
       <tag><em>iiop_max_fragments</em></tag>
       <item>Limits the number of IIOP fragments allowed per request.</item>
       <tag><em>iiop_max_in_requests</em></tag>
diff --git a/lib/orber/doc/src/notes.xml b/lib/orber/doc/src/notes.xml
index c7a2dab617..d388cc42a8 100644
--- a/lib/orber/doc/src/notes.xml
+++ b/lib/orber/doc/src/notes.xml
@@ -40,6 +40,13 @@
       <list type="bulleted">
         <item>
           <p>
+            Added the configuration parameters iiop_out_ports_attempts and
+            iiop_out_ports_random.</p>
+          <p>
+            Own Id: OTP-8448 Aux Id: seq11498</p>
+        </item>
+        <item>
+          <p>
             Removed obsolete SSL dependency.</p>
           <p>
             Own Id: OTP-8374 Aux Id:</p>
diff --git a/lib/orber/doc/src/orber.xml b/lib/orber/doc/src/orber.xml
index 05036667cc..5e38e4cf9f 100644
--- a/lib/orber/doc/src/orber.xml
+++ b/lib/orber/doc/src/orber.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,12 +13,12 @@
       compliance with the License. You should have received a copy of the
       Erlang Public License along with this software. If not, it can be
       retrieved online at http://www.erlang.org/.
-    
+
       Software distributed under the License is distributed on an "AS IS"
       basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
       the License for the specific language governing rights and limitations
       under the License.
-    
+
     </legalnotice>
 
     <title>orber</title>
@@ -162,13 +162,33 @@
     </func>
     <func>
       <name>iiop_out_ports() -> 0 | {Min, Max}</name>
-      <fsummary>Display the ports Orber may use when connecting to  another ORB</fsummary>
+      <fsummary>Display the ports Orber may use when connecting to another ORB</fsummary>
       <desc>
         <p>The return value of this operation is what the configuration
           parameter <seealso marker="ch_install#config">iiop_out_ports</seealso>
-          have been set to.</p>
+          has been set to.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>iiop_out_ports_random() -> true | false</name>
+      <fsummary>Determine if Orber should select local ports randomly</fsummary>
+      <desc>
+        <p>Return the value of the configuration parameter
+           <seealso marker="ch_install#config">iiop_out_ports_random</seealso>.</p>
       </desc>
     </func>
+
+    <func>
+      <name>iiop_out_ports_attempts() -> int()</name>
+      <fsummary>Display if Orber should accept more than one timeout connecting to another ORB</fsummary>
+      <desc>
+        <p>Return the value of the configuration parameter
+           <seealso marker="ch_install#config">iiop_out_ports_attempts</seealso>.</p>
+      </desc>
+    </func>
+
+
     <func>
       <name>iiop_ssl_port() -> int()</name>
       <fsummary>Display the IIOP port number used for secure connections</fsummary>