diff options
Diffstat (limited to 'apps/drwho')
| -rw-r--r-- | apps/drwho/CM_Server.cpp | 23 | ||||
| -rw-r--r-- | apps/drwho/ChangeLog | 7 |
2 files changed, 14 insertions, 16 deletions
diff --git a/apps/drwho/CM_Server.cpp b/apps/drwho/CM_Server.cpp index d0c264a2a39..ef2d96f92b4 100644 --- a/apps/drwho/CM_Server.cpp +++ b/apps/drwho/CM_Server.cpp @@ -41,26 +41,17 @@ CM_Server::open (short port_number) int CM_Server::receive (int) { - // It would be nice to use ACE_SOCKET_LEN here, but that's only - // defined in ace/OS.i. -#if defined (ACE_HAS_SOCKLEN_T) - socklen_t sin_len = -#elif defined (ACE_HAS_SIZET_SOCKET_LEN) - size_t sin_len = -#else - int sin_len = -#endif /* ACE_HAS_SIZET_SOCKET_LEN */ - sizeof this->sin_; + int sin_len = sizeof this->sin_; if (Options::get_opt (Options::DEBUG) != 0) ACE_DEBUG ((LM_DEBUG, "waiting for client to send...\n")); - int n = recvfrom (this->sokfd_, - this->recv_packet_, - UDP_PACKET_SIZE, - 0, - (sockaddr *) &this->sin_, - &sin_len); + int n = ACE_OS::recvfrom (this->sokfd_, + this->recv_packet_, + UDP_PACKET_SIZE, + 0, + (sockaddr *) &this->sin_, + &sin_len); if (n == -1) return -1; diff --git a/apps/drwho/ChangeLog b/apps/drwho/ChangeLog index a6062fdc71f..eca92bc2898 100644 --- a/apps/drwho/ChangeLog +++ b/apps/drwho/ChangeLog @@ -1,3 +1,10 @@ +Tue May 23 20:52:29 2000 David L. Levine <levine@cs.wustl.edu> + + * CM_Server.cpp (receive): one last time. Use + ACE_OS::recvfrom instead of the direct system call, + so it hides the native socklen_t or whatever the OS + uses. + Tue May 23 07:11:53 2000 David L. Levine <levine@cs.wustl.edu> * CM_Server.cpp (receive): changed type of local sin_len |