*** empty log message ***

6 files changed, 36 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 6b57776557b..8a860ec979c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jan 28 13:57:37 2000  Fred Kuhns    <fredk@cs.wustl.edu>
+
+        * fixed QoS realted bugs in QoS_Session_Impl.cpp QoS_Session_Impl.h
+          SOCK_Dgram_Mcast.cpp.  Just added some error checking and
+          check errno after call to join_leaf.
+
 Thu Jan 27 20:25:37 2000  Irfan Pyarali  <irfan@cs.wustl.edu>
 
 	* ace/Token.cpp (shared_acquire and renew): Must decrement
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 6b57776557b..8a860ec979c 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,9 @@
+Fri Jan 28 13:57:37 2000  Fred Kuhns    <fredk@cs.wustl.edu>
+
+        * fixed QoS realted bugs in QoS_Session_Impl.cpp QoS_Session_Impl.h
+          SOCK_Dgram_Mcast.cpp.  Just added some error checking and
+          check errno after call to join_leaf.
+
 Thu Jan 27 20:25:37 2000  Irfan Pyarali  <irfan@cs.wustl.edu>
 
 	* ace/Token.cpp (shared_acquire and renew): Must decrement
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 6b57776557b..8a860ec979c 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,9 @@
+Fri Jan 28 13:57:37 2000  Fred Kuhns    <fredk@cs.wustl.edu>
+
+        * fixed QoS realted bugs in QoS_Session_Impl.cpp QoS_Session_Impl.h
+          SOCK_Dgram_Mcast.cpp.  Just added some error checking and
+          check errno after call to join_leaf.
+
 Thu Jan 27 20:25:37 2000  Irfan Pyarali  <irfan@cs.wustl.edu>
 
 	* ace/Token.cpp (shared_acquire and renew): Must decrement
diff --git a/ace/QoS_Session_Impl.cpp b/ace/QoS_Session_Impl.cpp
index 69716be1d45..5c98e57703f 100644
--- a/ace/QoS_Session_Impl.cpp
+++ b/ace/QoS_Session_Impl.cpp
@@ -15,7 +15,7 @@ ACE_RCSID(ace, QoS_Session_Impl, "$Id$")
 ACE_ALLOC_HOOK_DEFINE(ACE_QoS_Session_Impl)
 
 #if defined (ACE_HAS_RAPI)
-#include "rapi/rapi_err.h"
+#include "rapi_err.h"
 
 int ACE_RAPI_Session::rsvp_error = 0;
 
@@ -159,12 +159,12 @@ ACE_RAPI_Session::open (ACE_INET_Addr dest_addr,
   // Open a RAPI session. Note "this" is being passed as an argument to 
   // the callback function. The callback function uses this argument to 
   // update the QoS of this session based on the RSVP event it receives.
-  if (this->session_id_ = rapi_session((sockaddr *) dest_addr.get_addr (), 
+  if ((this->session_id_ = rapi_session((sockaddr *) dest_addr.get_addr (), 
                                        protocol_id,
                                        0, 
                                        rsvp_callback, 
                                        (void *) this, 
-                                       &rsvp_error) != 0)
+                                       &rsvp_error)) == NULL_SID)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "rapi_session () call fails. Error\n"),
                       -1);
diff --git a/ace/QoS_Session_Impl.h b/ace/QoS_Session_Impl.h
index b99c12af44a..0680f26b9af 100644
--- a/ace/QoS_Session_Impl.h
+++ b/ace/QoS_Session_Impl.h
@@ -25,7 +25,7 @@
 
 
 #if defined (ACE_HAS_RAPI)
-#include "rapi/rapi_lib.h"
+#include "rapi_lib.h"
 
 class ACE_Export ACE_RAPI_Session : public ACE_QoS_Session
 {
diff --git a/ace/SOCK_Dgram_Mcast.cpp b/ace/SOCK_Dgram_Mcast.cpp
index 925cdf74c11..2322c927aa7 100644
--- a/ace/SOCK_Dgram_Mcast.cpp
+++ b/ace/SOCK_Dgram_Mcast.cpp
@@ -418,32 +418,42 @@ ACE_SOCK_Dgram_Mcast::subscribe (const ACE_INET_Addr &mcast_addr,
     {
       // Check if the mcast_addr passed into this method is the
       // same as the QoS session address.
-      if (mcast_addr == qos_session->dest_addr ())
+      if (mcast_addr == qos_session->dest_addr ()) 
+      {
 
         // Subscribe to the QoS session.
         if (this->join_qos_session (qos_session) == -1)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to join QoS Session\n"),
                             -1);
-        else
+      } 
+      else
+      {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Dest Addr in the QoS Session does"
                              " not match the address passed into"
                              " subscribe\n"),
                             -1);
+      }
 
       sockaddr_in mult_addr;
 
-      mult_addr.sin_family = protocolinfo->iAddressFamily;
+      if (protocol_family == ACE_FROM_PROTOCOL_INFO)
+        mult_addr.sin_family = protocolinfo->iAddressFamily;
+      else
+        mult_addr.sin_family = protocol_family;
+
       mult_addr.sin_port = ACE_HTONS (mcast_addr.get_port_number ());
 
       mult_addr.sin_addr = this->mcast_request_if_.IMR_MULTIADDR;
 
+      // XX This is windows stuff only. fredk
       if (ACE_OS::join_leaf (this->get_handle (),
                              ACE_reinterpret_cast (const sockaddr *,
                                                    &mult_addr),
                              sizeof mult_addr,
-                             qos_params) == ACE_INVALID_HANDLE)
+                             qos_params) == ACE_INVALID_HANDLE
+          && errno != ENOTSUP)
         return -1;
       else
         qos_session->qos (*(qos_params.socket_qos ()));