[Xorg-commit] xc/lib/Xdmcp Xdmcp.h,1.1.4.2,1.1.4.3

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/lib/Xdmcp
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/lib/Xdmcp

Modified Files:
      Tag: XORG-CURRENT
	Xdmcp.h 
Log Message:
merge XFree86 4.3.99.901 (RC1) from vendor branch

Index: Xdmcp.h
===================================================================
RCS file: /cvs/xorg/xc/lib/Xdmcp/Xdmcp.h,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- Xdmcp.h	26 Nov 2003 22:48:39 -0000	1.1.4.2
+++ Xdmcp.h	6 Dec 2003 13:24:22 -0000	1.1.4.3
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /* $Xorg: Xdmcp.h,v 1.7 2001/04/13 14:43:00 steve Exp $ */
 /*
  * Copyright 1989 Network Computing Devices, Inc., Mountain View, California.
@@ -13,7 +14,7 @@
  * without express or implied warranty.
  *
  */
-/* $XFree86: xc/lib/Xdmcp/Xdmcp.h,v 3.7 2003/07/09 15:27:29 tsi Exp $ */
+/* $XFree86: xc/lib/Xdmcp/Xdmcp.h,v 3.8 2003/11/22 04:50:59 dawes Exp $ */
 
 #ifndef _XDMCP_H_
 #define _XDMCP_H_
@@ -26,6 +27,17 @@
 
 #define XDM_PROTOCOL_VERSION	1
 #define XDM_UDP_PORT		177
+
+/* IANA has assigned FF0X:0:0:0:0:0:0:12B as the permanently assigned 
+ * multicast addresses for XDMCP, where X in the prefix may be replaced
+ * by any valid scope identifier, such as 1 for Node-Local, 2 for Link-Local,
+ * 5 for Site-Local, and so on.  We set the default here to the Link-Local
+ * version to most closely match the old IPv4 subnet broadcast behavior.
+ * Both xdm and X -query allow specifying a different address if a different
+ * scope is defined.
+ */
+#define XDM_DEFAULT_MCAST_ADDR6	"ff02:0:0:0:0:0:0:12b"
+
 #define XDM_MAX_MSGLEN		8192
 #define XDM_MIN_RTX		2
 #define XDM_MAX_RTX		32