Checked in my recent changes and bug fixes for the RTEC and their filtering support, CIDL changes, and some IDL enhancements.

2 files changed, 39 insertions, 5 deletions

diff --git a/ciao/CCM_Event.idl b/ciao/CCM_Event.idl
index 6349682550a..760b95adc85 100644
--- a/ciao/CCM_Event.idl
+++ b/ciao/CCM_Event.idl
@@ -28,9 +28,16 @@ module Components
   {
     void push_event (in EventBase evt) raises (BadEventType);
 
-    /// CIAO-specific operation to help support the capability
-    /// to subscribe to eventtypes more derived than the type
-    /// consumed.
+    // CIAO-specific operation to treat event service as regular event 
+    // sink port. The source_id needs to be passed in to identify the
+    // source of the publisher port to support event filtering mechanism.
+    void ciao_push_event (in Components::EventBase evt, 
+                          in string source_id)
+      raises (BadEventType);
+
+    // CIAO-specific operation to help support the capability
+    // to subscribe to eventtypes more derived than the type
+    // consumed.
     boolean ciao_is_substitutable (in string event_repo_id);
   };
 
diff --git a/ciao/Deployment_Events.idl b/ciao/Deployment_Events.idl
index 1d4d431287c..0bb0dbb6190 100644
--- a/ciao/Deployment_Events.idl
+++ b/ciao/Deployment_Events.idl
@@ -12,6 +12,7 @@
 #define CIAO_DEPLOYMENT_EVENT_SERVICES_IDL
 
 #include <orb.idl>
+#include <orbsvcs/RtecUDPAdmin.idl>
 
 module CIAO
 {
@@ -46,8 +47,32 @@ module CIAO
       FilterType type;
       EventSourceSet sources;
     };
+    typedef sequence<EventFilter> EventFilters;
 
-    typedef sequence < EventFilter > EventFilters;
+    struct AddrServer
+    {
+      string name;
+    };
+    typedef sequence<AddrServer> AddrServers;
+
+    struct UDPSender
+    {
+      string name;
+    };
+    typedef sequence<UDPSender> UDPSenders;
+
+    struct UPDReceiver
+    {
+      string name;
+    };
+    typedef sequence<UPDReceiver> UPDReceivers;
+
+    struct EventHandler
+    {
+      string name;
+      boolean is_multicast;
+    };
+    typedef sequence<EventHandler> EventHandlers;
 
     /// CIAO specific extension to describe pub/sub services in the deployment
     struct EventServiceDeploymentDescription
@@ -58,8 +83,10 @@ module CIAO
       string svc_cfg_file;
 
       EventFilters filters;
+      UDPSenders senders;
+      UPDReceivers receivers;
+      EventHandlers ehs;
     };
-
     typedef sequence < EventServiceDeploymentDescription >
       EventServiceDeploymentDescriptions;
   };