ChangeLogTag: Mon May 8 10:06:12 UTC 2006 Martin Corino <mcorino@remedy.nl>

4 files changed, 61 insertions, 6 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 79fd2b53969..ad572866dc3 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Mon May  8 10:06:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
+
+        * docs/Options.html:
+        * docs/ORBEndpoint.html:
+        * docs/INS.html:
+          Added IPv6 specific info regarding endpoint and corbaloc
+          definitions.
+          Added some links for easier crossreferencing.
+
 Mon May  8 09:22:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/Hello/run_test.pl:
diff --git a/TAO/docs/INS.html b/TAO/docs/INS.html
index 38d924cb9de..351524ef62b 100644
--- a/TAO/docs/INS.html
+++ b/TAO/docs/INS.html
@@ -40,7 +40,7 @@ for locating a service: <P>
 TAO uses the ACE_Hash_Map_Manager
 to keep track of the ObjectID:IOR mappings specified on the
 command-line. The IOR could be in <CODE>IOR</CODE>, <CODE>iiop</CODE>,
-or <CODE>corbaloc</CODE> format.  If the ORB fails to resolve the IOR
+or <CODE><A href="#corbaloc">corbaloc</A></CODE> format.  If the ORB fails to resolve the IOR
 using the command-line parameters or the default settings, it uses UDP
 multicast to resolve the service. <P>
 
@@ -101,14 +101,14 @@ The ORB default initial reference argument assists in resolution of
 
 <HR align=left width=80% ><P>
 
-<H4>corbaloc: IOR format</H4>
+<H4><A NAME="corbaloc">corbaloc: IOR format</A></H4>
 The <CODE>CORBA::ORB::string_to_object</CODE> now understands the <CODE>corbaloc:</CODE>
 format IORs (previously called iioploc). These are user-friendly multiple end-point IORs. For
 example - <p>
  <img width=50 height=5
 src="http://www.cs.wustl.edu/~schmidt/gifs/space.gif">corbaloc:iiop:tango.cs.wustl.edu:9999,iiop:merengue.cs.wustl.edu:9999/SimpleKey <p>
 
-Each of the end-points can use any transport protocols ex: iiop, rir. 
+Each of the end-points can use any transport protocols ex: iiop, rir.
 The corbaloc:rir URL is defined to allow access to the ORB's
 configured initial references through an URL. Each of the end-points
 is converted into a Profile. These profiles are used to construct the
@@ -127,6 +127,18 @@ octets ^t^a^o/0. This is taken care of by the POA when it generates
 the Object key for the IOR. The sequence is useful for the ORB to
 distinguish a simple key from the usual TAO object key. <p>
 
+The corbaloc::iiop URL also supports the IPv6 decimal address for the
+host field using the same format as for <A HREF="ORBEndpoint.html#IIOP">IIOP endpoint</A> definitions:
+<P><CODE>corbaloc:iiop:1.2@[01ef::1]:123/KeyName</CODE>
+<P>
+TAO only supports IPv6 endpoints in GIOP/IIOP >= 1.2.
+Since the CORBA spec requires (and such is implemented in TAO) that
+by default when no version is specified the version will be 1.0 the
+version has been explicitly set or not the result is that for
+corbalocs the version needs to be explicitly set.<BR>
+If not set the corbaloc parser will report an error for encountering
+an unresolvable hostname.
+
 <HR align=left width=80% ><P>
 
 <!--<EM>
diff --git a/TAO/docs/ORBEndpoint.html b/TAO/docs/ORBEndpoint.html
index 894192e0a1e..881f8e4804f 100644
--- a/TAO/docs/ORBEndpoint.html
+++ b/TAO/docs/ORBEndpoint.html
@@ -14,7 +14,6 @@
     <UL>
       <LI><A HREF="#Overview">Overview</A></LI>
       <LI><A HREF="#Options">Endpoint-Specific Options</A></LI>
-      <LI><A HREF="#Common Options">Common Endpoint-Specific Options</A></LI>
       <LI><A HREF="#IIOP">IIOP Endpoints</A></LI>
       <LI><A HREF="#SHMIOP">SHMIOP Endpoints</A></LI>
       <LI><A HREF="#UIOP">UIOP Endpoints</A></LI>
@@ -235,6 +234,41 @@
       a given network interface.
 
     <P>
+    <P>
+      The hostname part of an endpoint can also be specified as a literal
+      IP address in 'dotted decimal address' form for IPv4 addresses:
+    <BLOCKQUOTE>
+      <P>
+        <CODE>
+          -ORBEndpoint iiop://192.168.10.24:1234
+        </CODE>
+    </BLOCKQUOTE>
+
+      For IPv6 addresses a special form is required to specify decimal IP
+      addresses since the decimal separator for IPv6 addresses is identical
+      to the separator used for port numbers; i.e. a colon (':').
+      To be able to distinguish an endpoint specification for host 01ef::1
+      and port 123 and one for host 01ef::1:123 and no port number IPv6
+      decimal addresses need to enclosed by square brackets ('[' and ']'):
+    <BLOCKQUOTE>
+      <P>
+        <CODE>
+          -ORBEndpoint iiop://[01ef::1]:123
+          -ORBEndpoint iiop://[01ef::1:123]
+        </CODE>
+    </BLOCKQUOTE>
+
+      <B>NOTE:</B>
+      Since IPv6 endpoint are supported only for GIOP/IIOP versions >= 1.2
+      it is <FONT color='RED'>illegal</FONT> to combine version numbers
+      &lt; 1.2 and IPv6 decimal addresses:
+    <BLOCKQUOTE>
+      <P>
+        <CODE>
+          -ORBEndpoint iiop://1.1@[01ef::1]:123 <B><FONT color='RED'>--> ILLEGAL</FONT></B>
+        </CODE>
+    </BLOCKQUOTE>
+    <P>
     <h3>IIOP Endpoint-Specific Options</h3>
     <P>
     TAO supports the following endpoint-specific options that apply only
diff --git a/TAO/docs/Options.html b/TAO/docs/Options.html
index 22197133429..bc337fc8b8a 100644
--- a/TAO/docs/Options.html
+++ b/TAO/docs/Options.html
@@ -469,7 +469,7 @@ resolution of initial references not explicitly specified with
 <CODE>-ORBInitRef</CODE>. It requires a URL prefix that, after appending a slash '/'
 ('|' for the UIOP pluggable protocol) and a simple object key, forms a
 new URL to identify an initial object reference. The URL prefix format
-currently supported is based on the standard <code>corbaloc</code>
+currently supported is based on the standard <code><A href="INS.html#corbaloc">corbaloc</A></code>
 mechanism in the CORBA <a href="INS.html">Interoperable Naming
 Service. </a></td>
       </tr>
@@ -654,7 +654,7 @@ listening on for multicast requests. By default, the <code>TAO_DEFAULT_IMPLREPO_
 arbitrary object reference for an initial service. The IOR could be in
 any one of the following formats: OMG <code>IOR</code>, <code>URL</code>,
         <code>corbaloc</code> (including <code>uioploc</code>) or <code>file</code>.
-        <code>corbaloc</code> is a multiple end-point IOR understood by
+        <code><A href="INS.html#corbaloc">corbaloc</A></code> is a multiple end-point IOR understood by
         <code>ORB::string_to_object()</code> and used as a
 boot-strapping mechanism by the <code>ORB::resolve_initial_references()</code>.
 The mappings specified through this argument override the ORB