43. Incorporate ServerInterpreted address family authentication from IPv6XPRINT_BASE

    second public review. (Alan Coopersmith)

6 files changed, 86 insertions, 6 deletions

diff --git a/registry b/registry
index 610547d..6e97a79 100644
--- a/registry
+++ b/registry
@@ -1,5 +1,5 @@
 /* $Xorg: registry,v 1.7 2001/06/01 18:55:58 coskrey Exp $ */
-/* $XdotOrg: xc/registry,v 1.1.4.4 2004/03/05 13:38:02 eich Exp $ */
+/* $XdotOrg: xc/registry,v 1.1.4.2.6.2.2.1 2004/03/13 18:48:39 alanc Exp $ */
 
 				  X Registry
 
@@ -449,6 +449,7 @@ Value	Name					Reference
 0	Internet				[23]
 1	DECnet					[23]
 2	Chaos					[23]
+5	ServerInterpreted			[23]
 6	InternetV6				[23]
 33	Amoeba					[8]
 252	LocalHost				[105]
@@ -1027,6 +1028,21 @@ See XIM_ENCODING_NEGOTIATION in section 4.6 of the XIM standard.
 
 "COMPOUND_TEXT"					[104]
 
+23. SERVER INTERPRETED ADDRESS TYPES
+
+Types of addresses used in the ChangeHosts protocol request.
+See the description of ChangeHosts in section 9 of the X11 Protocol standard.
+
+Registered address types:
+
+Name				Reference
+----				---------
+"hostname"			[135 - xc/doc/spec/SIAddresses/hostname.txt]
+"IPv6"				[135 - xc/doc/spec/SIAddresses/IPv6.txt]
+
+Vendor-specific prefixes:
+
+None registered yet.
 
 REFERENCES
 
@@ -1686,4 +1702,8 @@ REFERENCES
         property type and selection target.  The ICCCM spec will be updated
         in a future release to fully specify UTF8_STRING.
 
-/* $XFree86: xc/registry,v 1.7tsi Exp $ */
+[135]	X.Org Foundation source implementation
+	See Reference [8]
+
+/* $XFree86: xc/registry,v 1.8 2003/07/09 15:27:23 tsi Exp $ */
+
diff --git a/specs/SIAddresses/IPv6.txt b/specs/SIAddresses/IPv6.txt
new file mode 100644
index 0000000..2d76f22
--- /dev/null
+++ b/specs/SIAddresses/IPv6.txt
@@ -0,0 +1,11 @@
+ServerInterpreted address definition for type "IPv6":
+
+The X.org Architecture Task Force reserves the ServerInterpreted
+address type of "IPv6" for use with IPv6 literal address formats.
+The syntax for the value will be defined as specified in RFC 3513
+and the IETF RFC to be published based on the current draft at
+http://www.ietf.org/internet-drafts/draft-ietf-ipv6-scoping-arch-00.txt
+This address type specification will be formally issued once the
+IETF IPv6 Working Group issues the corresponding RFC. 
+
+Version 0.9, March 2004
diff --git a/specs/SIAddresses/README b/specs/SIAddresses/README
new file mode 100644
index 0000000..b68beb7
--- /dev/null
+++ b/specs/SIAddresses/README
@@ -0,0 +1,6 @@
+$XdotOrg: xc/doc/specs/SIAddresses/README,v 1.1.2.1 2004/03/13 18:48:39 alanc Exp $
+
+This directory contains the specifications of address types for the 
+ServerInterpreted address family used in the ChangeHost and ListHosts 
+requests in the X11 Protocol.  See Chapter 9 of the X11 Protocol spec
+for more information.
diff --git a/specs/SIAddresses/hostname.txt b/specs/SIAddresses/hostname.txt
new file mode 100644
index 0000000..498fb01
--- /dev/null
+++ b/specs/SIAddresses/hostname.txt
@@ -0,0 +1,11 @@
+ServerInterpreted address definition for type "hostname":
+
+A ServerInterpreted address with type "hostname" shall have a value
+representing a hostname as defined in IETF RFC 2396. Due to Mobile IP
+and dynamic DNS, the name service should be consulted at connection
+authentication time.  Clients supporting Internationalized Domain
+Names must convert to ASCII Compatible Encoding as specified in the
+relevant IETF RFC's before use in the X11 protocol.  Note that this
+definition of hostname does not allow use of literal IP addresses. 
+
+Version 1.0, March 2004
diff --git a/specs/X11/CH09 b/specs/X11/CH09
index 3821745..b60eb40 100644
--- a/specs/X11/CH09
+++ b/specs/X11/CH09
@@ -40,7 +40,7 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
-.\" $XFree86: xc/doc/specs/X11/CH09,v 1.2 2003/07/09 15:27:25 tsi Exp $
+.\" $XdotOrg: xc/doc/specs/X11/CH09,v 1.1.4.1.6.1.2.1 2004/03/13 18:48:39 alanc Exp $
 \&
 .sp 1
 .ce 3
@@ -970,6 +970,7 @@ The family member specifies which protocol address family to use
 (for example, TCP/IP or DECnet) and can be
 .PN FamilyInternet ,
 .PN FamilyInternet6 ,
+.PN FamilyServerInterpreted ,
 .PN FamilyDECnet ,
 or
 .PN FamilyChaos .
@@ -989,6 +990,30 @@ The second byte contains the most significant 2 bits of the
 node number in the least significant 2 bits of the byte
 and the area in the most significant 6 bits of the byte.
 .LP
+For the ServerInterpreted family, the length is ignored and the address 
+member is a pointer to a 
+.PN XServerInterpretedAddress
+structure, which contains:
+.LP
+.IN "XServerInterpretedAddress" "" "@DEF@"
+.sM
+.Ds 0
+.TA .5i 3i
+.ta .5i 3i
+typedef struct {
+	int typelength;	/* length of type string, in bytes */
+	int valuelength;/* length of value string, in bytes */
+	char *type;	/* pointer to where to find the type string */
+	char *value;	/* pointer to where to find the address */
+} XServerInterpretedAddress;
+.De
+.LP
+.eM
+The type and value members point to strings representing the type and value of
+the server interpreted entry.  These strings may not be NULL-terminated so care
+should be used when accessing them.  The typelength and valuelength members
+specify the length in byte of the type and value strings.
+.LP
 .sp
 To add a single host, use
 .PN XAddHost .
diff --git a/specs/XProtocol/X11.protocol b/specs/XProtocol/X11.protocol
index 9ce6121..70c5d98 100644
--- a/specs/XProtocol/X11.protocol
+++ b/specs/XProtocol/X11.protocol
@@ -1,4 +1,5 @@
 .\" $Xorg: X11.protocol,v 1.4 $
+.\" $XdotOrg: xc/doc/specs/XProtocol/X11.protocol,v 1.1.4.2.10.1 2004/03/13 18:48:39 alanc Exp $
 .\"
 .\"
 .\"
@@ -8733,9 +8734,15 @@ The host number is always the first byte in the address,
 and the subnet number is always the second byte.
 The server performs no automatic swapping on the address bytes.
 .LP
-The ServerInterpreted family may be of any length up to 65535 bytes.
-The address is simply a string of characters which is interpreted by
-the server.  The server performs no automatic swapping on the address bytes.
+For the ServerInterpreted family, the address may be of any
+length up to 65535 bytes.  The address consists of two strings
+of ASCII characters, separated by a byte with a value of 0.
+The first string represents the type of address, and the second
+string contains the address value.  Address types and the syntax
+for their associated values will be registered via the X.org Registry.
+Implementors who wish to add implementation specific types may register
+a unique prefix with the X.org registry to prevent namespace
+collisions. 
 .LP
 Use of a host address in the ChangeHosts request is deprecated.  It is
 only useful when a host has a unique, constant address, a requirement