ChangeLogTag: Sat Jun 16 22:00:00 2001 Craig Rodrigues <crodrigu@bbn.com>

6 files changed, 37 insertions, 9 deletions

diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
index eba056b366f..04977123bfd 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
@@ -1805,7 +1805,7 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
 
 
       if (result < 0)
-        ACE_ERROR_RETURN ((LM_ERROR, "TAO_AV_Core::init_forward_flows failed\n"), 0);
+        ACE_ERROR_RETURN ((LM_ERROR, "%N:%l TAO_AV_Core::init_forward_flows failed\n"), 0);
 
 
       AVStreams::StreamEndPoint_var streamendpoint = this->_this (ACE_TRY_ENV);
@@ -1819,7 +1819,7 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
       ACE_TRY_CHECK;
       
       ACE_DEBUG ((LM_DEBUG,
-		  "The return value is %d\n",
+		  "%N:%l The return value is %d\n",
 		  retv));
 
       if (retv == 0)
@@ -2124,8 +2124,16 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato
           ACE_NEW_RETURN (entry,
                           TAO_Forward_FlowSpec_Entry,
                           0);
+
+	  if(TAO_debug_level > 0);
+	     ACE_DEBUG(( LM_DEBUG, "%N:%l Parsing flow spec: %s\n", flow_spec[i].in() ));
+
           if (entry->parse (flow_spec[i]) == -1)
+	  {
+            if(TAO_debug_level > 0); 
+              ACE_DEBUG((LM_DEBUG, "%N:%l Error parsing flow_spec: %s\n", flow_spec[i].in() ));
             return 0;
+	  }
           if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_DEBUG, 
 			"TAO_StreamEndPoint::request_connection Flow Spec %s", 
diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
index 09374995947..1c853386025 100644
--- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
@@ -118,8 +118,10 @@ TAO_FlowSpec_Entry::set_protocol (void)
         this->protocol_ = TAO_AV_Core::TAO_AV_AAL3_4;
       else if (ACE_OS::strcasecmp (this->carrier_protocol_.c_str(),"AAL1") == 0)
         this->protocol_ = TAO_AV_Core::TAO_AV_AAL1;
-      else if (ACE_OS::strcasecmp (this->carrier_protocol_.c_str(),"RTP/UDP") == 0)
-        this->protocol_ = TAO_AV_Core::TAO_AV_RTP_UDP;
+      else if (ACE_OS::strcasecmp (this->carrier_protocol_.c_str(),"RTP/UDP") == 0){
+        this->protocol_ = TAO_AV_Core::TAO_AV_UDP;
+        flow_protocol_ = "RTP";
+      }
       else if (ACE_OS::strcasecmp (this->carrier_protocol_.c_str(),"RTP/AAL5") == 0)
         this->protocol_ = TAO_AV_Core::TAO_AV_RTP_AAL5;
       else if (ACE_OS::strcasecmp (this->carrier_protocol_.c_str(),"IPX") == 0)
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.i b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.i
index eb5a9d7ce05..f6c2935bf01 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.i
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.i
@@ -17,6 +17,7 @@ int
 TAO_AV_UDP_QoS_Flow_Handler::open (ACE_Addr &address)
 {
   //    return this->qos_sock_dgram_.open (address);
+  ACE_UNUSED_ARG( address );
   return 0;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
index dd768a8b499..c4b25c47edc 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
@@ -112,8 +112,10 @@ TAO_AV_RTP_Object::handle_input (void)
                                          frame_info);
   if (result < 0)
     return 0;
-  this->control_object_->handle_control_input (data,
-                                               *addr);
+
+  if(this->control_object_)
+     this->control_object_->handle_control_input (data,
+                                                  *addr);
 
   this->frame_.rd_ptr (sizeof(TAO_AV_RTP::rtphdr));
   result = this->callback_->receive_frame (&this->frame_,
@@ -229,7 +231,9 @@ TAO_AV_RTP_Object::~TAO_AV_RTP_Object (void)
 int
 TAO_AV_RTP_Object::destroy (void)
 {
-  this->control_object_->destroy ();
+  if(this->control_object_)
+     this->control_object_->destroy ();
+
   this->callback_->handle_destroy ();
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
index 2e7b5677383..9b0d2439906 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
@@ -274,6 +274,8 @@ TAO_AV_Acceptor_Registry::open (TAO_Base_StreamEndPoint *endpoint,
                                 TAO_AV_Core *av_core,
                                 TAO_AV_FlowSpecSet &flow_spec_set)
 {
+  int retv = 0;
+
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
                 "TAO_AV_Acceptor_Registry::open \n"));
@@ -300,9 +302,11 @@ TAO_AV_Acceptor_Registry::open (TAO_Base_StreamEndPoint *endpoint,
 
       if (address == 0)
         {
-          this->open_default (endpoint,
+          retv = this->open_default (endpoint,
 			      av_core,
 			      entry);
+	  if(retv < 0)
+		  return retv;
           continue;
         }
       else
@@ -494,6 +498,8 @@ TAO_AV_Acceptor_Registry::open_default (TAO_Base_StreamEndPoint *endpoint,
           ACE_DEBUG((LM_DEBUG, "(%N,%l) Matched flow_protocol: %s, Looking for transport protocol: %s\n", flow_protocol, transport_protocol));
           TAO_AV_TransportFactorySetItor transport_factory_end =
             av_core->transport_factories ()->end ();
+
+	  int matched_transport = 0;
           for (;transport_factory != transport_factory_end;
                ++transport_factory)
             {
@@ -511,7 +517,7 @@ TAO_AV_Acceptor_Registry::open_default (TAO_Base_StreamEndPoint *endpoint,
                   continue;
                 }
 
-
+              matched_transport = 1;  
 
               // got it, make an acceptor
               TAO_AV_Acceptor *acceptor =
@@ -542,6 +548,11 @@ TAO_AV_Acceptor_Registry::open_default (TAO_Base_StreamEndPoint *endpoint,
 
               this->acceptors_.insert (acceptor);
             }
+	    if( matched_transport == 0 ){
+                ACE_ERROR ((LM_ERROR, "(%P|%t), %N:%l could not match transport protocol: %s\n",
+					transport_protocol));
+		return -1;
+	    }
         }
     }
   if (this->acceptors_.size () == 0)
diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
index 3d7008f00c0..5c5bc70b684 100644
--- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
@@ -611,6 +611,8 @@ TAO_AV_UDP_Factory::match_protocol (const char *protocol_string)
 {
   if (ACE_OS::strcasecmp (protocol_string,"UDP") == 0)
     return 1;
+  if (ACE_OS::strcasecmp (protocol_string,"RTP/UDP") == 0)
+    return 1;
   return 0;
 }