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

Some missing from merge.

Browse source 
Signed-off-by: Salja <salja2012@hotmail.de>
This commit is contained in:
Salja 2012-08-05 14:54:07 +02:00 • committed by Antz
parent ec939a5bce
commit f4be15a7af
1895 changed files with 160408 additions and 53601 deletions
Download patch file Download diff file Expand all files Collapse all files

27
dep/acelite/ace/LSOCK_Stream.cpp
View file

@ -1,11 +1,10 @@
// $Id: LSOCK_Stream.cpp 96985 2013-04-11 15:50:32Z huangh $
#include "ace/LSOCK_Stream.h"
#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
#include "ace/Log_Category.h"
#include "ace/OS_NS_sys_socket.h"
#if defined (ACE_HAS_ALLOC_HOOKS)
# include "ace/Malloc_Base.h"
#endif /* ACE_HAS_ALLOC_HOOKS */
@ -69,7 +68,7 @@ ACE_LSOCK_Stream::send_msg (const iovec iov[],
{
ACE_TRACE ("ACE_LSOCK_Stream::send_msg");
msghdr send_msg;
#if !defined (ACE_LACKS_SENDMSG) && defined (ACE_HAS_4_4BSD_SENDMSG_RECVMSG)
#if defined (ACE_HAS_4_4BSD_SENDMSG_RECVMSG)
char cmsgbuf[ACE_BSD_CONTROL_MSG_LEN];
cmsghdr *cmsgptr = (cmsghdr *) cmsgbuf;
#endif /* ACE_HAS_4_4BSD_SENDMSG_RECVMSG */
@ -79,10 +78,7 @@ ACE_LSOCK_Stream::send_msg (const iovec iov[],
send_msg.msg_name = 0;
send_msg.msg_namelen = 0;
#if defined (ACE_LACKS_SENDMSG)
ACE_UNUSED_ARG (handle);
#else
# if defined (ACE_HAS_4_4BSD_SENDMSG_RECVMSG)
#if defined (ACE_HAS_4_4BSD_SENDMSG_RECVMSG)
cmsgptr->cmsg_level = SOL_SOCKET;
cmsgptr->cmsg_type = SCM_RIGHTS;
cmsgptr->cmsg_len = sizeof cmsgbuf;
@ -90,11 +86,10 @@ ACE_LSOCK_Stream::send_msg (const iovec iov[],
send_msg.msg_controllen = sizeof cmsgbuf;
*(ACE_HANDLE *) CMSG_DATA (cmsgptr) = handle;
send_msg.msg_flags = 0 ;
# else
#else
send_msg.msg_accrights = (char *) &handle;
send_msg.msg_accrightslen = sizeof handle;
# endif /* ACE_HAS_4_4BSD_SENDMSG_RECVMSG */
#endif /* ACE_LACKS_SENDMSG */
#endif /* ACE_HAS_4_4BSD_SENDMSG_RECVMSG */
return ACE_OS::sendmsg (this->ACE_SOCK_Stream::get_handle (),
&send_msg, 0);
@ -110,7 +105,7 @@ ACE_LSOCK_Stream::recv_msg (iovec iov[],
{
ACE_TRACE ("ACE_LSOCK_Stream::recv_msg");
msghdr recv_msg;
#if !defined (ACE_LACKS_SENDMSG) && defined (ACE_HAS_4_4BSD_SENDMSG_RECVMSG)
#if defined (ACE_HAS_4_4BSD_SENDMSG_RECVMSG)
char cmsgbuf[ACE_BSD_CONTROL_MSG_LEN];
cmsghdr *cmsgptr = (cmsghdr *) cmsgbuf;
#endif /* ACE_HAS_4_4BSD_SENDMSG_RECVMSG */
@ -120,9 +115,7 @@ ACE_LSOCK_Stream::recv_msg (iovec iov[],
recv_msg.msg_name = 0;
recv_msg.msg_namelen = 0;
#if defined (ACE_LACKS_SENDMSG)
ACE_UNUSED_ARG (handle);
#elif defined (ACE_HAS_4_4BSD_SENDMSG_RECVMSG)
#if defined (ACE_HAS_4_4BSD_SENDMSG_RECVMSG)
recv_msg.msg_control = cmsgbuf;
recv_msg.msg_controllen = sizeof cmsgbuf;
ssize_t result = ACE_OS::recvmsg (this->ACE_SOCK_Stream::get_handle (),
@ -132,12 +125,10 @@ ACE_LSOCK_Stream::recv_msg (iovec iov[],
#else
recv_msg.msg_accrights = (char *) &handle;
recv_msg.msg_accrightslen = sizeof handle;
#endif /* ACE_HAS_4_4BSD_SENDMSG_RECVMSG */ /* ACE_LACKS_SENDMSG */
#if defined ACE_LACKS_SENDMSG || !defined ACE_HAS_4_4BSD_SENDMSG_RECVMSG
return ACE_OS::recvmsg (this->ACE_SOCK_Stream::get_handle (),
&recv_msg, 0);
#endif
#endif /* ACE_HAS_4_4BSD_SENDMSG_RECVMSG */
}
#endif /* ACE_HAS_MSG */