From 4d31fc919b685df3f881a996a7de70ff1ba14cd2 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 8 Aug 2017 08:00:35 -0700 Subject: QNetworkInterface: add a Linux backend directly using AF_NETLINK This allows us a lot greater detail in getting information than relying on getifaddrs() function. It is also the only way of getting some extra information we'll need in the future, like address lifetimes. The parser will also be helpful if we want to add a network interface monitor in the future, though I currently have no clue how to do the equivalent on macOS and Windows. This commit does not remove the support for getifaddrs() on Linux, but I will no longer add features to it. Note that Android does not support getifaddrs(), so this may be an improvement if AF_NETLINK works there. Change-Id: I3868166e5efc45538544fffd14d8e6f993e1eb91 Reviewed-by: Timur Pocheptsov Reviewed-by: Edward Welbourne --- src/network/configure.json | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'src/network/configure.json') diff --git a/src/network/configure.json b/src/network/configure.json index d46fbfc101..9d99605df0 100644 --- a/src/network/configure.json +++ b/src/network/configure.json @@ -116,6 +116,24 @@ }, "use": "network" }, + "linux-netlink": { + "label": "Linux AF_NETLINK sockets", + "type": "compile", + "test": { + "include": [ "asm/types.h", "linux/netlink.h", "linux/rtnetlink.h", "sys/socket.h" ], + "main": [ + "struct rtattr rta = { };", + "struct ifinfomsg ifi = {};", + "struct ifaddrmsg ifa = {};", + "struct ifa_cacheinfo ci;", + "ci.ifa_prefered = ci.ifa_valid = 0;", + "(void)RTM_NEWLINK; (void)RTM_NEWADDR;", + "(void)IFLA_ADDRESS; (void)IFLA_IFNAME;", + "(void)IFA_ADDRESS; (void)IFA_LABEL; (void)IFA_CACHEINFO;", + "(void)(IFA_F_SECONDARY | IFA_F_DEPRECATED | IFA_F_PERMANENT | IFA_F_MANAGETEMPADDR);" + ] + } + }, "sctp": { "label": "SCTP support", "type": "compile", @@ -161,6 +179,11 @@ "condition": "libs.libproxy", "output": [ "privateFeature" ] }, + "linux-netlink": { + "label": "Linux AF_NETLINK", + "condition": "config.linux && tests.linux-netlink", + "output": [ "privateFeature" ] + }, "openssl": { "label": "OpenSSL", "enable": "input.openssl == 'yes' || input.openssl == 'linked' || input.openssl == 'runtime'", @@ -308,6 +331,11 @@ For example: "condition": "config.darwin" }, "getifaddrs", "ipv6ifname", "libproxy", + { + "type": "feature", + "args": "linux-netlink", + "condition": "config.linux" + }, { "type": "feature", "args": "securetransport", -- cgit v1.2.3