adding DS library

3 files changed, 64 insertions, 1 deletions

diff --git a/modules/TAO/tao/PortableServer/POA_Cached_Policies.cpp b/modules/TAO/tao/PortableServer/POA_Cached_Policies.cpp
index 687352df393..7cc00e60693 100644
--- a/modules/TAO/tao/PortableServer/POA_Cached_Policies.cpp
+++ b/modules/TAO/tao/PortableServer/POA_Cached_Policies.cpp
@@ -33,7 +33,10 @@ namespace TAO
         servant_retention_ (::PortableServer::RETAIN),
         request_processing_ (::PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY),
         priority_model_ (Cached_Policies::NOT_SPECIFIED),
-        server_priority_ (TAO_INVALID_PRIORITY)
+        server_priority_ (TAO_INVALID_PRIORITY),
+        network_priority_model_ (Cached_Policies::NO_NETWORK_PRIORITY),
+        request_diffserv_codepoint_ (0),
+        reply_diffserv_codepoint_ (0)
     {
     }
 
diff --git a/modules/TAO/tao/PortableServer/POA_Cached_Policies.h b/modules/TAO/tao/PortableServer/POA_Cached_Policies.h
index 60465f8238a..3d9ea18e773 100644
--- a/modules/TAO/tao/PortableServer/POA_Cached_Policies.h
+++ b/modules/TAO/tao/PortableServer/POA_Cached_Policies.h
@@ -50,6 +50,13 @@ namespace TAO
         NOT_SPECIFIED
       };
 
+      enum NetworkPriorityModel
+      {
+        CLIENT_PROPAGATED_NETWORK_PRIORITY,
+        SERVER_DECLARED_NETWORK_PRIORITY,
+        NO_NETWORK_PRIORITY
+      };
+
       Cached_Policies ();
 
       ~Cached_Policies (void);
@@ -72,6 +79,15 @@ namespace TAO
       PriorityModel priority_model (void) const;
       CORBA::Short server_priority (void) const;
 
+      NetworkPriorityModel network_priority_model (void) const;
+      CORBA::Long request_diffserv_codepoint (void) const;
+      CORBA::Long reply_diffserv_codepoint (void) const;
+
+      void network_priority_model (
+        NetworkPriorityModel network_priority_model);
+      void request_diffserv_codepoint (CORBA::Long diffserv_codepoint);
+      void reply_diffserv_codepoint (CORBA::Long diffserv_codepoint);
+
       void priority_model (PriorityModel priority_model);
       void server_priority (CORBA::Short priority);
       void implicit_activation (::PortableServer::ImplicitActivationPolicyValue value);
@@ -100,6 +116,12 @@ namespace TAO
       PriorityModel priority_model_;
 
       CORBA::Short server_priority_;
+
+      NetworkPriorityModel network_priority_model_;
+
+      CORBA::Long request_diffserv_codepoint_;
+
+      CORBA::Long reply_diffserv_codepoint_;
     };
   }
 }
diff --git a/modules/TAO/tao/PortableServer/POA_Cached_Policies.inl b/modules/TAO/tao/PortableServer/POA_Cached_Policies.inl
index b3699fe3e7d..45cb696e294 100644
--- a/modules/TAO/tao/PortableServer/POA_Cached_Policies.inl
+++ b/modules/TAO/tao/PortableServer/POA_Cached_Policies.inl
@@ -74,6 +74,44 @@ namespace TAO
       this->server_priority_ = priority;
     }
 
+    ACE_INLINE Cached_Policies::NetworkPriorityModel
+    Cached_Policies::network_priority_model (void) const
+    {
+      return this->network_priority_model_;
+    }
+
+    ACE_INLINE CORBA::Long
+    Cached_Policies::request_diffserv_codepoint (void) const
+    {
+      return this->request_diffserv_codepoint_;
+    }
+
+    ACE_INLINE CORBA::Long
+    Cached_Policies::reply_diffserv_codepoint (void) const
+    {
+      return this->reply_diffserv_codepoint_;
+    }
+
+    ACE_INLINE void
+    Cached_Policies::network_priority_model (
+       NetworkPriorityModel network_priority_model)
+    {
+      this->network_priority_model_ = network_priority_model;
+    }
+
+    ACE_INLINE void
+    Cached_Policies::request_diffserv_codepoint (
+      CORBA::Long diffserv_codepoint)
+    {
+      this->request_diffserv_codepoint_ = diffserv_codepoint;
+    }
+
+    ACE_INLINE void
+    Cached_Policies::reply_diffserv_codepoint (CORBA::Long diffserv_codepoint)
+    {
+      this->reply_diffserv_codepoint_ = diffserv_codepoint;
+    }
+
     ACE_INLINE void
     Cached_Policies::implicit_activation (PortableServer::ImplicitActivationPolicyValue value)
     {