mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 16:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10643] Update the ACE part we use to 5.8.2

Browse source 
Signed-off-by: Neo2003 <Neo.2003@Hotmail.fr>
This commit is contained in:
Neo2003 2010-10-25 20:36:51 +02:00
parent 8f71d95c0d
commit 23c920ca4b
739 changed files with 22031 additions and 40373 deletions
Download patch file Download diff file Expand all files Collapse all files

17
dep/ACE_wrappers/ace/Ping_Socket.cpp
View file

@ -1,4 +1,4 @@
// $Id: Ping_Socket.cpp 81737 2008-05-20 09:46:39Z johnnyw $
// $Id: Ping_Socket.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
#include "ace/Ping_Socket.h"
@ -9,16 +9,12 @@
#include "ace/OS_NS_string.h"
#include "ace/OS_NS_sys_time.h"
#include "ace/OS_NS_sys_socket.h"
# include "ace/OS_NS_unistd.h"
#if !defined (__ACE_INLINE__)
# include "ace/Ping_Socket.inl"
#endif /* !__ACE_INLINE__ */
ACE_RCSID (ace,
Ping_Socket,
"$Id: Ping_Socket.cpp 81737 2008-05-20 09:46:39Z johnnyw $")
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_ALLOC_HOOK_DEFINE (ACE_Ping_Socket)
@ -248,14 +244,15 @@ ACE_Ping_Socket::process_incoming_dgram (char * ptr, ssize_t len)
ACE_TEXT ("(%P|%t) ACE_Ping_Socket::process_incoming_dgram")
ACE_TEXT (" - ICMP_ECHOREPLY received.\n")));
if (icmp->icmp_id != getpid ())
if (icmp->icmp_id != (ACE_OS::getpid () & 0xFFFF))
{
ACE_ERROR_RETURN
((LM_ERROR,
ACE_TEXT ("(%P|%t) ACE_Ping_Socket::")
ACE_TEXT ("process_incoming_dgram ")
ACE_TEXT ("- The ICMP header received is a reply")
ACE_TEXT (" to request of another process.")),
ACE_TEXT ("- The ICMP header received is a reply to request ")
ACE_TEXT ("of another process (%d; expected %d).\n"),
icmp->icmp_id, ACE_OS::getpid()),
-1);
}
if (icmplen < 16)
@ -329,7 +326,7 @@ ACE_Ping_Socket::send_echo_check (ACE_INET_Addr &remote_addr,
_icmp = (struct icmp *) this->icmp_send_buff_;
_icmp->icmp_type = ICMP_ECHO;
_icmp->icmp_code = 0;
_icmp->icmp_id = getpid ();
_icmp->icmp_id = ACE_OS::getpid () & 0xFFFF;
_icmp->icmp_seq = sequence_number_++;
#if defined (ACE_WIN32)