diff options
| author | sumedh <sumedh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-03-19 01:51:28 +0000 |
|---|---|---|
| committer | sumedh <sumedh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-03-19 01:51:28 +0000 |
| commit | 1c877a26f48a2dbbd0886bc2c39735e07ed7025a (patch) | |
| tree | 40766311a4521a63acc1cf23be1f33835143ab7b | |
| parent | d9811988ccfcfe1e8a9e5d6ef184cba9473b5999 (diff) | |
| download | ATCD-1c877a26f48a2dbbd0886bc2c39735e07ed7025a.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/sfp.cpp | 14 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AVStreams.idl | 4 |
2 files changed, 11 insertions, 7 deletions
diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp index a069f1dc01d..0203534e88d 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp @@ -86,9 +86,6 @@ SFP_Encoder::encode_start_message () " start message into ACE_Message_Block"), 0); - message->length (encoder_->length ()); - cerr << message->length (); - return message; } @@ -178,8 +175,15 @@ SFP_Decoder::decode_start_message (ACE_Message_Block *message) TAO_TRY { - decoder_->setup_encapsulation (message->rd_ptr (), - message->length ()); + // decoder_->setup_encapsulation (message->rd_ptr (), + // message->length ()); + decoder_->grow (message->length ()); + + char *bufptr = decoder_->buffer (); + + ACE_OS::memcpy (bufptr, + message->rd_ptr (), + message->length ()); decoder_->decode (SFP::_tc_start_message, &start, diff --git a/TAO/orbsvcs/orbsvcs/AVStreams.idl b/TAO/orbsvcs/orbsvcs/AVStreams.idl index 8f71e2dee02..d9ada141a1a 100644 --- a/TAO/orbsvcs/orbsvcs/AVStreams.idl +++ b/TAO/orbsvcs/orbsvcs/AVStreams.idl @@ -48,7 +48,7 @@ module AVStreams // protocol names registered by OMG. // e.g., TCP, UDP, AAL5, IPX, RTP - typedef sequence<octet> key; + typedef sequence<octet> encryption_key; // Used as a key for public-key encryption struct SFPStatus @@ -338,7 +338,7 @@ module AVStreams // Used to "attach" a negotiator to the endpoint void set_key (in string flow_name, - in key the_key); + in encryption_key the_key); // Used for public key encryption. void set_source_id (in long source_id); |