diff options
| author | crodrigu <crodrigu@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-11-14 19:29:15 +0000 |
|---|---|---|
| committer | crodrigu <crodrigu@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-11-14 19:29:15 +0000 |
| commit | 24812186730073caf74494dd5e9c7bc322ffa80a (patch) | |
| tree | 82cc35ea9930653e9a05c14e4926c582b40b1103 | |
| parent | 8aebbcaec44efff6e1fb98b200f7a6a71d2d7f0b (diff) | |
| download | ATCD-24812186730073caf74494dd5e9c7bc322ffa80a.tar.gz | |
ChangeLogTag: Wed Nov 14 13:42:42 2001 Craig Rodrigues <crodrigu@bbn.com>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/RTCP.cpp | 13 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/RTCP.h | 11 |
3 files changed, 20 insertions, 11 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 378ef73bda6..61a1d8128a0 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Wed Nov 14 13:42:42 2001 Craig Rodrigues <crodrigu@bbn.com> + + * orbsvcs/orbsvcs/AV/RTCP.h: + * orbsvcs/orbsvcs/AV/RTCP.cpp: Moved typedef of struct md5_string + from .cpp file to header file. Cast third parameter of + sdes.add_item() to unsigned char. + Tue Nov 13 20:58:02 2001 Craig Rodrigues <crodrigu@bbn.com> * orbsvcs/orbsvcs/AV/md5.h: Changed comments from C++ style diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp index 77677640108..1526fc5c20c 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp @@ -187,16 +187,7 @@ ACE_INT32 random32 (int); ACE_UINT32 TAO_AV_RTCP::alloc_srcid (ACE_UINT32 addr) { - struct - { - int type; - ACE_Time_Value tv; - pid_t pid; - pid_t pgid; - pid_t ppid; - uid_t uid; - gid_t gid; - } s; + md5_string s; s.type = addr; s.tv = ACE_OS::gettimeofday (); @@ -684,7 +675,7 @@ TAO_AV_RTCP_Callback::send_report (int bye) -1); } else - sdes.add_item (my_ssrc, sdes_type, value.length (), value.c_str ()); + sdes.add_item (my_ssrc, sdes_type, (unsigned char)value.length (), value.c_str ()); // create the message block char *cp_ptr; diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.h b/TAO/orbsvcs/orbsvcs/AV/RTCP.h index aa54c808d6e..f88cd8e7319 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.h @@ -82,6 +82,17 @@ public: ACE_UINT32 lower; /* less significant 32 bits */ }; + struct md5_string + { + int type; + ACE_Time_Value tv; + pid_t pid; + pid_t pgid; + pid_t ppid; + uid_t uid; + gid_t gid; + }; + static void send_report (ACE_Message_Block *mb); static ACE_UINT32 alloc_srcid (ACE_UINT32 addr); |