picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #2134 from jorgenschaefer/detect-ipv6-with-sockstat6

Browse source 
Use /proc/net/sockstat6 to detect IPv6 support
This commit is contained in:
Daniel Mack 2015-12-10 16:54:57 +01:00
parent 4d3f0f66e6 7377964d4c
commit 34130ea7aa
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/basic/socket-util.c
View file

@ -440,17 +440,10 @@ const char* socket_address_get_path(const SocketAddress *a) {
}
bool socket_ipv6_is_supported(void) {
_cleanup_free_ char *l = NULL;
if (access("/sys/module/ipv6", F_OK) != 0)
if (access("/proc/net/sockstat6", F_OK) != 0)
return false;
/* If we can't check "disable" parameter, assume enabled */
if (read_one_line_file("/sys/module/ipv6/parameters/disable", &l) < 0)
return true;
/* If module was loaded with disable=1 no IPv6 available */
return l[0] == '0';
return true;
}
bool socket_address_matches_fd(const SocketAddress *a, int fd) {