diff options
| author | yamuna <yamuna@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-08-05 04:38:07 +0000 |
|---|---|---|
| committer | yamuna <yamuna@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-08-05 04:38:07 +0000 |
| commit | c0452228814bc79b005001459799a7029fe1d7ac (patch) | |
| tree | 749595690e981bb7256306ccf1da3c3872d478e2 | |
| parent | 4bfcdb998d1e332a1e37f3c0c41312787cb6a9f3 (diff) | |
| download | ATCD-TAO-1_3_3-with-AV-patch.tar.gz | |
ChangelogTag: Tue Aug 05 00:42:31 2003 Yamuna Krishnamurthy <yamuna@oomworks.com>TAO-1_3_3-with-AV-patch
| -rw-r--r-- | TAO/ChangeLog | 13 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/UDP.cpp | 39 |
2 files changed, 28 insertions, 24 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 0eec700f90f..b0118cc0878 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,16 @@ +Tue Aug 05 00:42:31 2003 Yamuna Krishnamurthy <yamuna@oomworks.com> + + * orbsvcs/orbsvcs/AV/UDP.cpp: + + Integrated Craig's changes: Wed Jul 30 18:34:34 UTC 2003 Craig + Rodrigues <crodrigu@bbn.com> + +Mon Aug 04 19:30:57 2003 Yamuna Krishnamurthy <yamuna@oomworks.com> + + * orbsvcs/tests/AVStreams/Component_Switching/sender.cpp: + + Removed the signal handler. + Mon Jul 28 15:56:12 2003 Yamuna Krishnamurthy <yamuna@oomworks.com> * orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp: diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp index aab883f0305..2c8c1b9e775 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp @@ -191,7 +191,7 @@ TAO_AV_UDP_Transport::close (void) int TAO_AV_UDP_Transport::mtu (void) { - return ACE_MAX_DGRAM_SIZE; + return 65535; } ACE_Addr* @@ -425,8 +425,8 @@ TAO_AV_UDP_Acceptor::open_i (ACE_INET_Addr *inet_addr, int is_default_addr) { int result = -1; - ACE_INET_Addr *local_addr = 0; + TAO_AV_Flow_Handler *flow_handler = 0; // if using a default address and this is the control flow component, the @@ -529,7 +529,7 @@ TAO_AV_UDP_Acceptor::open_i (ACE_INET_Addr *inet_addr, this->entry_->set_local_addr (local_addr); this->entry_->handler (flow_handler); //this->entry_->address (inet_addr); - this->entry_->address (local_addr); + this->entry_->address (local_addr); } else { @@ -644,9 +644,6 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry, local_addr = ACE_dynamic_cast (ACE_INET_Addr*,addr); char buf [BUFSIZ]; local_addr->addr_to_string (buf, BUFSIZ); - ACE_DEBUG ((LM_DEBUG, - "local_addr %s\n", - buf)); } TAO_AV_UDP_Connection_Setup::setup (flow_handler, inet_addr, @@ -686,9 +683,6 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry, ACE_INET_Addr (addr_str.c_str ()), -1); local_control_addr->addr_to_string (buf, BUFSIZ); - ACE_DEBUG ((LM_DEBUG, - "local_addr %s\n", - buf)); } @@ -851,13 +845,7 @@ TAO_AV_UDP_Connection_Setup::setup (TAO_AV_Flow_Handler *&flow_handler, ACE_NEW_RETURN (local_addr, ACE_INET_Addr ("0"), -1); - - char buf [BUFSIZ]; - local_addr->addr_to_string (buf, BUFSIZ); - ACE_DEBUG ((LM_DEBUG, - "Local Address %s\n", - buf)); - + TAO_AV_UDP_Flow_Handler *handler; ACE_NEW_RETURN (handler, TAO_AV_UDP_Flow_Handler, @@ -891,15 +879,15 @@ TAO_AV_UDP_Connection_Setup::setup (TAO_AV_Flow_Handler *&flow_handler, if (ct == CONNECTOR) handler->set_remote_address (inet_addr); - + result = handler->get_socket ()->get_local_addr (*local_addr); - - + local_addr->set (local_addr->get_port_number (), - local_addr->get_host_name ()); - + local_addr->get_host_name ()); + + char buf [BUFSIZ]; local_addr->addr_to_string (buf, BUFSIZ); - + if (result < 0) ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_Dgram_Connector::open: get_local_addr failed\n"),result); } @@ -991,7 +979,10 @@ TAO_AV_UDP_Object::send_frame (const iovec *iov, int iovcnt, TAO_AV_frame_info * /*frame_info*/) { - return this->transport_->send (iov,iovcnt); + int result = this->transport_->send (iov,iovcnt); + if (result < 0); + return result; + return 0; } int @@ -1008,7 +999,7 @@ TAO_AV_UDP_Object::TAO_AV_UDP_Object (TAO_AV_Callback *callback, TAO_AV_Transport *transport) :TAO_AV_Protocol_Object (callback,transport) { - this->frame_.size (2 * this->transport_->mtu ()); + this->frame_.size (this->transport_->mtu ()); } TAO_AV_UDP_Object::~TAO_AV_UDP_Object (void) |