[certi-cvs] certi/RTIG RTIG_processing.cc

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      10/04/28 18:45:43

Modified files:
        RTIG           : RTIG_processing.cc 

Log message:
        Merge from Jeroen IEEE-1516 work
        Fix publish/subscribe interaction bug 

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG_processing.cc?cvsroot=certi&r1=3.101&r2=3.102

Patches:
Index: RTIG_processing.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG_processing.cc,v
retrieving revision 3.101
retrieving revision 3.102
diff -u -b -r3.101 -r3.102
--- RTIG_processing.cc  29 Mar 2010 07:56:04 -0000      3.101
+++ RTIG_processing.cc  28 Apr 2010 18:45:42 -0000      3.102
@@ -18,7 +18,7 @@
 // along with this program ; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
-// $Id: RTIG_processing.cc,v 3.101 2010/03/29 07:56:04 erk Exp $
+// $Id: RTIG_processing.cc,v 3.102 2010/04/28 18:45:42 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -771,12 +771,19 @@
                        req->getFederation(),
                        req->getInteractionClass());
 
+       if (pub) {
        NM_Publish_Interaction_Class rep;
+               rep.setFederate(req->getFederate());
+               rep.setInteractionClass(req->getInteractionClass());
 
+               rep.send(link,NM_msgBufSend); // send answer to RTIA
+       } else {
+               NM_Unpublish_Interaction_Class rep;
        rep.setFederate(req->getFederate());
        rep.setInteractionClass(req->getInteractionClass());
 
        rep.send(link,NM_msgBufSend); // send answer to RTIA
+       }
 }
 
 // ----------------------------------------------------------------------------
@@ -797,11 +804,19 @@
                        req->getFederation(),
                        req->getInteractionClass());
 
+       if (sub) {
        NM_Subscribe_Interaction_Class rep;
        rep.setFederate(req->getFederate());
        rep.setInteractionClass(req->getInteractionClass());
 
        rep.send(link,NM_msgBufSend); // send answer to RTIA
+       } else {
+               NM_Unsubscribe_Interaction_Class rep;
+               rep.setFederate(req->getFederate());
+               rep.setInteractionClass(req->getInteractionClass());
+
+               rep.send(link,NM_msgBufSend); // send answer to RTIA
+       }
 }
 
 // ----------------------------------------------------------------------------
@@ -1466,4 +1481,4 @@
 
 }} // namespace certi/rtig
 
-// $Id: RTIG_processing.cc,v 3.101 2010/03/29 07:56:04 erk Exp $
+// $Id: RTIG_processing.cc,v 3.102 2010/04/28 18:45:42 erk Exp $