JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* fhandler_socket.cc (get_inet_addr): Handle abstract AF_LOCAL socket.

Browse Source 
(fhandler_socket::recv_internal): Create abstract socket name for
	AF_LOCAL datagram sockets.  Explain why we do that.
This commit is contained in:
Corinna Vinschen 2013-04-08 17:34:34 +00:00
parent d57416f03d
commit 2617a91597
2 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,9 @@
2013-04-08 Corinna Vinschen <corinna@vinschen.de>
* fhandler_socket.cc (get_inet_addr): Handle abstract AF_LOCAL socket.
(fhandler_socket::recv_internal): Create abstract socket name for
AF_LOCAL datagram sockets. Explain why we do that.
2013-04-07 Christopher Faylor <me.cygwin2013@cgf.cx>
* cygheap.cc (init_cygheap::find_tls): Add a comment.

37
winsup/cygwin/fhandler_socket.cc
View File

@ -72,6 +72,21 @@ get_inet_addr (const struct sockaddr *in, int inlen,
switch (in->sa_family)
{
case AF_LOCAL:
/* Check for abstract socket. These are generated for AF_LOCAL datagram
sockets in recv_internal, to allow a datagram server to use sendto
after recvfrom. */
if (inlen >= (int) sizeof (in->sa_family) + 7
&& in->sa_data[0] == '\0' && in->sa_data[1] == 'd'
&& in->sa_data[6] == '\0')
{
struct sockaddr_in addr;
addr.sin_family = AF_INET;
sscanf (in->sa_data + 2, "%04hx", &addr.sin_port);
addr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
*outlen = sizeof addr;
memcpy (out, &addr, *outlen);
return 0;
}
break;
case AF_INET:
case AF_INET6:
@ -1502,14 +1517,28 @@ fhandler_socket::recv_internal (LPWSAMSG wsamsg, bool use_recvmsg)
if (get_addr_family () == AF_LOCAL && wsamsg->name != NULL
&& orig_namelen >= (int) sizeof (sa_family_t))
{
/* WSARecvFrom copied the sockaddr_in block to wsamsg->name.
We have to overwrite it with a sockaddr_un block. */
/* WSARecvFrom copied the sockaddr_in block to wsamsg->name. We have to
overwrite it with a sockaddr_un block. For datagram sockets we
generate a sockaddr_un with a filename analogue to abstract socket
names under Linux. See `man 7 unix' under Linux for a description. */
sockaddr_un *un = (sockaddr_un *) wsamsg->name;
un->sun_family = AF_LOCAL;
int len = orig_namelen - offsetof (struct sockaddr_un, sun_path);
if (len > 0)
{
if (!get_peer_sun_path ())
{
if (get_socket_type () == SOCK_DGRAM)
{
if (len >= 7)
{
__small_sprintf (un->sun_path + 1, "d%04x",
((struct sockaddr_in *) wsamsg->name)->sin_port);
wsamsg->namelen = offsetof (struct sockaddr_un, sun_path) + 7;
}
else
wsamsg->namelen = offsetof (struct sockaddr_un, sun_path) + 1;
un->sun_path[0] = '\0';
}
else if (!get_peer_sun_path ())
wsamsg->namelen = sizeof (sa_family_t);
else
{