diff options
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 6 | ||||
| -rw-r--r-- | TAO/tao/GIOP_Message_State.cpp | 29 | ||||
| -rw-r--r-- | TAO/tao/GIOP_Message_State.h | 37 |
3 files changed, 24 insertions, 48 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 620139c2a7f..b3abac2f67a 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Wed Aug 15 12:06:20 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * tao/GIOP_Message_State.cpp: + * tao/GIOP_Message_State.h: Cosmetic changes to the debug + statements and comments. + Wed Aug 15 11:35:18 2001 Balachandran Natarajan <bala@cs.wustl.edu> * tao/Transport.cpp: Added a debugging statement that is going to diff --git a/TAO/tao/GIOP_Message_State.cpp b/TAO/tao/GIOP_Message_State.cpp index ae91a1d5931..a49b91c012d 100644 --- a/TAO/tao/GIOP_Message_State.cpp +++ b/TAO/tao/GIOP_Message_State.cpp @@ -17,8 +17,9 @@ ACE_RCSID(tao, GIOP_Message_State, "$Id$") TAO_GIOP_Message_State::TAO_GIOP_Message_State ( TAO_ORB_Core * /*orb_core*/, - TAO_GIOP_Message_Base * /*base*/) - : giop_version_ (TAO_DEF_GIOP_MAJOR, + TAO_GIOP_Message_Base *base) + : base_ (base), + giop_version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR), byte_order_ (0), message_type_ (0), @@ -82,7 +83,8 @@ TAO_GIOP_Message_State::parse_message_header_i (ACE_Message_Block &incoming) if (TAO_debug_level > 0) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) Error Message recd. \n"))); + "TAO (%P|%t) -" + "GIOP_MESSAGE_ERROR received \n")); } return 0; } @@ -90,17 +92,16 @@ TAO_GIOP_Message_State::parse_message_header_i (ACE_Message_Block &incoming) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) Message with size 0 recd.. \n"))); + "TAO (%P|%t) - " + "Message of size zero recd. \n")); return -1; } } if (this->more_fragments_) { - // Parse the - /*int retval = */ - this->parse_fragment_header (buf, - incoming.length ()); + (void) this->parse_fragment_header (buf, + incoming.length ()); } return 0; @@ -120,7 +121,7 @@ TAO_GIOP_Message_State::parse_magic_bytes (char *buf) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) bad header, " + ACE_TEXT ("TAO (%P|%t) - bad header, " "magic word [%2.2x,%2.2x,%2.2x,%2.2x]\n"), buf[0], buf[1], @@ -137,7 +138,7 @@ TAO_GIOP_Message_State::get_version_info (char *buf) { if (TAO_debug_level > 8) { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Getting version info.. \n")); + ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Getting version info.. \n")); } // We have a GIOP message on hand. Get its revision numbers @@ -154,7 +155,7 @@ TAO_GIOP_Message_State::get_version_info (char *buf) if (TAO_debug_level > 0) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t|%N|%l) bad version <%d.%d>\n"), + ACE_TEXT ("TAO (%P|%t) - bad version <%d.%d>\n"), incoming_major, incoming_minor)); } @@ -173,7 +174,7 @@ TAO_GIOP_Message_State::get_byte_order_info (char *buf) { if (TAO_debug_level > 8) { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Getting byte order info.. \n")); + ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Getting byte order info.. \n")); } // Let us be specific that this is for 1.0 @@ -188,7 +189,7 @@ TAO_GIOP_Message_State::get_byte_order_info (char *buf) { if (TAO_debug_level > 2) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) invalid byte order <%d>") + ACE_TEXT ("TAO (%P|%t) - invalid byte order <%d>") ACE_TEXT (" for version <1.0>\n"), this->byte_order_)); return -1; @@ -208,7 +209,7 @@ TAO_GIOP_Message_State::get_byte_order_info (char *buf) { if (TAO_debug_level > 2) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) invalid flags for <%d>") + ACE_TEXT ("TAO (%P|%t) - invalid flags for <%d>") ACE_TEXT (" for version <%d %d> \n"), buf[TAO_GIOP_MESSAGE_FLAGS_OFFSET], this->giop_version_.major, diff --git a/TAO/tao/GIOP_Message_State.h b/TAO/tao/GIOP_Message_State.h index 3f262373f54..594747dc4cc 100644 --- a/TAO/tao/GIOP_Message_State.h +++ b/TAO/tao/GIOP_Message_State.h @@ -95,6 +95,9 @@ private: private: + /// The GIOP base class.. + TAO_GIOP_Message_Base *base_; + // GIOP version information.. TAO_GIOP_Message_Version giop_version_; @@ -110,40 +113,6 @@ private: /// Request Id from the Fragment header CORBA::ULong request_id_; - /** - * The fragments are collected in a chain of message blocks (using - * the cont() field). When the complete message is received the - * chain is reassembled into the main message block that is sent - * along - */ - // ACE_Message_Block fragmented_messages; - - - /** - * The byte order for the the first fragment - * @@ The current implementation cannot handle fragments with - * different byte orders, this should not be a major problem - * because: - * 1) It is unlikely that we are going to receive fragments. - * 2) The spec *seems* to allow different byte_orders, but it is - * unlikely that any ORB will do that. - * 3) Even if we allowed that at this layer the CDR classes are - * not prepared to handle that. - */ - // CORBA::Octet first_fragment_byte_order; - - /// The GIOP version for the first fragment - /// @@ Same as above, all GIOP versions must match. - // TAO_GIOP_Message_Version first_fragment_giop_version; - - /** - * If the messages are chained this represents the message type for - * the *complete* message (remember that the last message will be - * fragment and the upper level needs to know if it is a request, - * locate request or what). - */ - // CORBA::Octet first_fragment_message_type; - /// (Requests and Replys) CORBA::Octet more_fragments_; |