diff options
| author | crodrigu <crodrigu@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-11-16 21:53:50 +0000 |
|---|---|---|
| committer | crodrigu <crodrigu@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-11-16 21:53:50 +0000 |
| commit | fd455e47edadd499a791254139896370c364e7c1 (patch) | |
| tree | 0f8638b798babbe15d54e07a699569a93769ac9a | |
| parent | f1f977a8237d48569f04826138560a35795c13cb (diff) | |
| download | ATCD-fd455e47edadd499a791254139896370c364e7c1.tar.gz | |
ChangeLogTag: Fri Nov 16 16:41:45 2001 Craig Rodrigues <crodrigu@bbn.com>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 9 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/RTCP.cpp | 5 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/RTP.cpp | 8 |
3 files changed, 20 insertions, 2 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index f6c9d54458f..c42d9a3d4ca 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,12 @@ +Fri Nov 16 16:41:45 2001 Craig Rodrigues <crodrigu@bbn.com> + + * orbsvcs/orbsvcs/AV/RTCP.cpp (send_report): Moved code + around to eliminate VC++ warning about casting arguments. + * orbsvcs/orbsvcs/AV/RTP.cpp (TAO_AV_RTP_Object): Imported + code from AVStreams_i.cpp for calling alloc_srcid() to eliminate + IA64 warning. + Thanks to Rob Ruff for providing these fixes. + Fri Nov 16 13:36:09 2001 Craig Rodrigues <crodrigu@bbn.com> * orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp: Removed deletes from diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp index 5849c7a6092..0f4eff8dfc1 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp @@ -675,7 +675,10 @@ TAO_AV_RTCP_Callback::send_report (int bye) -1); } else - sdes.add_item (my_ssrc, sdes_type, (unsigned char)value.length (), value.c_str ()); + { + unsigned char length = (unsigned char)(value.length() & 0xFF); + sdes.add_item (my_ssrc, sdes_type, length, value.c_str ()); + } // create the message block char *cp_ptr; diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp index ba4ffe21a8a..d1583f80aa0 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp @@ -596,7 +596,13 @@ TAO_AV_RTP_Object::TAO_AV_RTP_Object (TAO_AV_Callback *callback, { this->sequence_num_ = ACE_OS::rand (); this->timestamp_offset_ = ACE_OS::rand (); - this->ssrc_ = TAO_AV_RTCP::alloc_srcid ((unsigned int)this); + + char buf [BUFSIZ]; + int result = ACE_OS::hostname (buf, BUFSIZ); + unsigned long ipaddr = 0; + if (result == 0) + ipaddr = ACE_OS::inet_addr (buf); + this->ssrc_ = TAO_AV_RTCP::alloc_srcid (ipaddr); this->frame_.size (2 * this->transport_->mtu ()); } |