ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Listen on dualstack sockets." am: 1f7bcf3e93

Browse source 
am: f6df8fce6d

* commit 'f6df8fce6d0bea7da34e2e16edc691881b92105a':
  Listen on dualstack sockets.
This commit is contained in:
Erik Kline 2015-12-07 22:35:10 -08:00 • committed by android-build-merger
commit 4cb2c1fbb6
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libcutils/socket_inaddr_any_server.c
View file

@ -34,21 +34,21 @@
/* open listen() port on any interface */ /* open listen() port on any interface */
int socket_inaddr_any_server(int port, int type) int socket_inaddr_any_server(int port, int type)
{ {
struct sockaddr_in addr; struct sockaddr_in6 addr;
int s, n; int s, n;
memset(&addr, 0, sizeof(addr)); memset(&addr, 0, sizeof(addr));
addr.sin_family = AF_INET; addr.sin6_family = AF_INET6;
addr.sin_port = htons(port); addr.sin6_port = htons(port);
addr.sin_addr.s_addr = htonl(INADDR_ANY); addr.sin6_addr = in6addr_any;
s = socket(AF_INET, type, 0); s = socket(AF_INET6, type, 0);
if(s < 0) return -1; if (s < 0) return -1;
n = 1; n = 1;
setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (const char *) &n, sizeof(n)); setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (const char *) &n, sizeof(n));
if(bind(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) { if (bind(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
close(s); close(s);
return -1; return -1;
} }