.

5 files changed, 88 insertions, 20 deletions

diff --git a/ChangeLog-99b b/ChangeLog-99b
index 6e2766a05fd..414cd052f40 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,13 +1,22 @@
+Fri Jun 18 12:12:59 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* ace/SOCK_Dgram: Added the first set of hooks to support
+ 	  QoS-enabled data grams for Win2K GQoS.
+
 Fri Jun 18 11:37:31 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-	* *.{mdp,mak}: Removed all MSVC 4 workspaces and makefiles.
+	* *.{mdp,mak}: Removed all MSVC++ 4.x workspaces and makefiles.
+  	  We are no longer supporting this version of MSVC++.  If you need
+ 	  support for MSVC++ 4.x please contact Steve Huston
+ 	  <shuston@riverace.com> of Riverace to arrange a support
+ 	  contract.
 
 Fri Jun 18 12:19:42 1999  Matthew J Braun  <mjb2@cs.wustl.edu>
 
-	* tests/DLList_Test.cpp
-	  Removeed unnecessary explicit template instantiation that
-	  mirrored ones in ace/Containers.cpp to fix compile errors on
-	  VxWorks. Why this _ever_ worked, I don't know...
+	* tests/DLList_Test.cpp: Removeed unnecessary explicit template
+ 	  instantiation that mirrored ones in ace/Containers.cpp to fix
+ 	  compile errors on VxWorks. Why this _ever_ worked, I don't
+ 	  know...
 
 Fri Jun 18 11:37:31 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index b4b87b9fe00..d6f85c0f57b 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,9 +1,13 @@
 Fri Jun 18 12:17:23 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-	* *.{mdp,mak}: Removed all MSVC 4 workspaces and makefiles.
+	* *.{mdp,mak}: Removed all MSVC 4 workspaces and makefiles.  We
+ 	  are no longer supporting this version of MSVC++.  If you need
+ 	  support for MSVC++ 4.x please contact Steve Huston
+ 	  <shuston@riverace.com> of Riverace to arrange a support
+ 	  contract.
 
 	* tests/Native_Exceptions/client.cpp (main): Caught exception
-	  <fail> is not used.
+ 	  <fail> is not used.
 
 	* tests/Native_Exceptions/Native_Exception.dsw:
 	* tests/Native_Exceptions/client.dsp:
diff --git a/ace/SOCK_Dgram.cpp b/ace/SOCK_Dgram.cpp
index 2e3ec6a7e4f..aaae0b6f8c2 100644
--- a/ace/SOCK_Dgram.cpp
+++ b/ace/SOCK_Dgram.cpp
@@ -127,7 +127,36 @@ ACE_SOCK_Dgram::ACE_SOCK_Dgram (const ACE_Addr &local,
   ACE_TRACE ("ACE_SOCK_Dgram::ACE_SOCK_Dgram");
 
   if (this->shared_open (local, protocol_family) == -1)
-    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_SOCK_Dgram")));
+    ACE_ERROR ((LM_ERROR,
+                ASYS_TEXT ("%p\n"),
+                ASYS_TEXT ("ACE_SOCK_Dgram")));
+}
+
+ACE_SOCK_Dgram::ACE_SOCK_Dgram (const ACE_Addr &local, 
+                                const ACE_Connect_QoS_Params &qos_params,
+                                int protocol_family, 
+                                int protocol,
+                                int reuse_addr)
+  : ACE_SOCK (SOCK_DGRAM, protocol_family, protocol, reuse_addr)
+{
+  ACE_UNUSED_ARG (qos_params);
+}
+
+int
+ACE_SOCK_Dgram::open (const ACE_Addr &local, 
+                      const ACE_Connect_QoS_Params &qos_params,
+                      int protocol_family, 
+                      int protocol,
+                      int reuse_addr)
+{
+  ACE_UNUSED_ARG (local);
+  ACE_UNUSED_ARG (qos_params);
+  ACE_UNUSED_ARG (protocol_family);
+  ACE_UNUSED_ARG (protocol);
+  ACE_UNUSED_ARG (reuse_addr);
+
+  // Under construction...
+  ACE_NOTSUP_RETURN (-1);
 }
 
 // Here's the general-purpose open routine.
@@ -139,11 +168,14 @@ ACE_SOCK_Dgram::open (const ACE_Addr &local,
                       int reuse_addr)
 {
   ACE_TRACE ("ACE_SOCK_Dgram::open");
-  if (ACE_SOCK::open (SOCK_DGRAM, protocol_family, 
-                      protocol, reuse_addr) == -1)
+  if (ACE_SOCK::open (SOCK_DGRAM,
+                      protocol_family, 
+                      protocol,
+                      reuse_addr) == -1)
     return -1;
   else
-    return this->shared_open (local, protocol_family);
+    return this->shared_open (local,
+                              protocol_family);
 }
 
 #if defined (ACE_HAS_MSG)
@@ -177,7 +209,9 @@ ACE_SOCK_Dgram::send (const iovec iov[],
   send_msg.msg_accrightslen = 0;
 #endif /* ACE_HAS_4_4BSD_SENDMSG_RECVMSG */
 
-  return ACE_OS::sendmsg (this->get_handle (), &send_msg, flags);
+  return ACE_OS::sendmsg (this->get_handle (),
+                          &send_msg,
+                          flags);
 }
 
 // Recv an iovec of size N to ADDR as a datagram (connectionless
@@ -210,7 +244,8 @@ ACE_SOCK_Dgram::recv (iovec iov[],
 #endif /* ACE_HAS_4_4BSD_SENDMSG_RECVMSG */
 
   ssize_t status = ACE_OS::recvmsg (this->get_handle (), 
-                                    &recv_msg, flags);
+                                    &recv_msg,
+                                    flags);
   addr.set_size (recv_msg.msg_namelen);
   return status;
 }
diff --git a/ace/SOCK_Dgram.h b/ace/SOCK_Dgram.h
index 815ab73d1fc..7ccf55f3f95 100644
--- a/ace/SOCK_Dgram.h
+++ b/ace/SOCK_Dgram.h
@@ -31,7 +31,7 @@ class ACE_Export ACE_SOCK_Dgram : public ACE_SOCK
   //     Defines the member functions for the ACE_SOCK datagram
   //     abstraction.
 public:
-  // = Initialization routines.
+  // = Initialization and termination methods.
   ACE_SOCK_Dgram (void);
   // Default constructor.
 
@@ -39,16 +39,36 @@ public:
                   int protocol_family = PF_INET,
                   int protocol = 0,
                   int reuse_addr = 0);
-  // Initiate a socket dgram.
+  // This is a BSD-style method (i.e., no QoS) for initiating a socket
+  // dgram that will accept datagrams at the <local> address.
 
-  ~ACE_SOCK_Dgram (void);
-  // Default dtor.
+  ACE_SOCK_Dgram (const ACE_Addr &local,
+                  const ACE_Connect_QoS_Params &qos_params,
+                  int protocol_family = PF_INET,
+                  int protocol = 0,
+                  int reuse_addr = 0);
+  // This is a QoS-enabed method for initiating a socket dgram that
+  // will accept datagrams at the <local> address.  The <qos_params>
+  // are passed to <ACE_OS::join_leaf>.
+
+  int open (const ACE_Addr &local,
+            int protocol_family = PF_INET,
+            int protocol = 0,
+            int reuse_addr = 0);
+  // This is a BSD-style method (i.e., no QoS) for initiating a socket
+  // dgram that will accept datagrams at the <local> address.
 
   int open (const ACE_Addr &local,
+            const ACE_Connect_QoS_Params &qos_params,
             int protocol_family = PF_INET,
             int protocol = 0,
             int reuse_addr = 0);
-  // Initiate a socket dgram.
+  // This is a QoS-enabed method for initiating a socket dgram that
+  // will accept datagrams at the <local> address.  The <qos_params>
+  // are passed to <ACE_OS::join_leaf>.
+
+  ~ACE_SOCK_Dgram (void);
+  // Default dtor.
 
   // = Data transfer routines.
   ssize_t send (const void *buf,
diff --git a/ace/SOCK_Dgram_Mcast.h b/ace/SOCK_Dgram_Mcast.h
index 7b8a1c24955..5bc6cda37aa 100644
--- a/ace/SOCK_Dgram_Mcast.h
+++ b/ace/SOCK_Dgram_Mcast.h
@@ -50,8 +50,8 @@ public:
                  const ASYS_TCHAR *net_if = 0,
                  int protocol_family = PF_INET,
                  int protocol = 0);
-  // This is a BSD-style method for joining a multicast group (i.e.,
-  // no QoS).  The network interface device driver is instructed to
+  // This is a BSD-style method (i.e., no QoS) for joining a multicast
+  // group.  The network interface device driver is instructed to
   // accept datagrams with <mcast_addr> multicast addresses.  If the
   // socket has already been opened, <subscribe> closes the socket and
   // opens a new socket bound to the <mcast_addr>.