rtnlutil: Remove used rtnlutil

The rtnl code has been added to ELL. There is caller left in iwd,
therefore remove the rtnlutil file.

5 files changed, 2 insertions, 746 deletions

diff --git a/Makefile.am b/Makefile.am
index a9b48cd7a..9d378d3d2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,6 +39,7 @@ ell_headers = ell/util.h \
 			ell/netlink.h \
 			ell/genl.h \
 			ell/dbus.h \
+			ell/rtnl.h \
 			ell/dbus-service.h \
 			ell/dbus-client.h \
 			ell/hwdb.h \
@@ -84,6 +85,7 @@ ell_sources = ell/private.h \
 			ell/netlink.c \
 			ell/genl-private.h \
 			ell/genl.c \
+			ell/rtnl.c \
 			ell/dbus-private.h \
 			ell/dbus.c \
 			ell/dbus-message.c \
@@ -217,7 +219,6 @@ src_iwd_SOURCES = src/main.c linux/nl80211.h src/iwd.h src/missing.h \
 					src/manager.c \
 					src/erp.h src/erp.c \
 					src/fils.h src/fils.c \
-					src/rtnlutil.h src/rtnlutil.c \
 					src/auth-proto.h \
 					src/anqp.h src/anqp.c \
 					src/anqputil.h src/anqputil.c \
diff --git a/src/netconfig.c b/src/netconfig.c
index e89f87f89..b0fee4977 100644
--- a/src/netconfig.c
+++ b/src/netconfig.c
@@ -39,7 +39,6 @@
 #include "src/station.h"
 #include "src/common.h"
 #include "src/network.h"
-#include "src/rtnlutil.h"
 #include "src/resolve.h"
 #include "src/netconfig.h"
 
diff --git a/src/netdev.c b/src/netdev.c
index f44c7ec21..1dd1428f9 100644
--- a/src/netdev.c
+++ b/src/netdev.c
@@ -60,7 +60,6 @@
 #include "src/owe.h"
 #include "src/fils.h"
 #include "src/auth-proto.h"
-#include "src/rtnlutil.h"
 #include "src/frame-xchg.h"
 
 #ifndef ENOTSUPP
diff --git a/src/rtnlutil.c b/src/rtnlutil.c
deleted file mode 100644
index cd5c11a08..000000000
--- a/src/rtnlutil.c
+++ /dev/null
@@ -1,640 +0,0 @@
-/*
- *
- *  Wireless daemon for Linux
- *
- *  Copyright (C) 2019  Intel Corporation. All rights reserved.
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <sys/socket.h>
-#include <linux/if.h>
-#include <linux/rtnetlink.h>
-#include <arpa/inet.h>
-
-#include <ell/ell.h>
-
-#include "src/rtnlutil.h"
-
-static size_t rta_add_u8(void *rta_buf, unsigned short type, uint8_t value)
-{
-	struct rtattr *rta = rta_buf;
-
-	rta->rta_len = RTA_LENGTH(sizeof(uint8_t));
-	rta->rta_type = type;
-	*((uint8_t *) RTA_DATA(rta)) = value;
-
-	return RTA_SPACE(sizeof(uint8_t));
-}
-
-static size_t rta_add_u32(void *rta_buf, unsigned short type, uint32_t value)
-{
-	struct rtattr *rta = rta_buf;
-
-	rta->rta_len = RTA_LENGTH(sizeof(uint32_t));
-	rta->rta_type = type;
-	*((uint32_t *) RTA_DATA(rta)) = value;
-
-	return RTA_SPACE(sizeof(uint32_t));
-}
-
-static size_t rta_add_data(void *rta_buf, unsigned short type, void *data,
-								size_t data_len)
-{
-	struct rtattr *rta = rta_buf;
-
-	rta->rta_len = RTA_LENGTH(data_len);
-	rta->rta_type = type;
-	memcpy(RTA_DATA(rta), data, data_len);
-
-	return RTA_SPACE(data_len);
-}
-
-uint32_t rtnl_set_linkmode_and_operstate(struct l_netlink *rtnl, int ifindex,
-					uint8_t linkmode, uint8_t operstate,
-					l_netlink_command_func_t cb,
-					void *user_data,
-					l_netlink_destroy_func_t destroy)
-{
-	struct ifinfomsg *rtmmsg;
-	void *rta_buf;
-	size_t bufsize;
-	uint32_t id;
-
-	bufsize = NLMSG_ALIGN(sizeof(struct ifinfomsg)) +
-		RTA_SPACE(sizeof(uint8_t)) + RTA_SPACE(sizeof(uint8_t));
-
-	rtmmsg = l_malloc(bufsize);
-	memset(rtmmsg, 0, bufsize);
-
-	rtmmsg->ifi_family = AF_UNSPEC;
-	rtmmsg->ifi_index = ifindex;
-
-	rta_buf = (void *) rtmmsg + NLMSG_ALIGN(sizeof(struct ifinfomsg));
-
-	rta_buf += rta_add_u8(rta_buf, IFLA_LINKMODE, linkmode);
-	rta_buf += rta_add_u8(rta_buf, IFLA_OPERSTATE, operstate);
-
-	id = l_netlink_send(rtnl, RTM_SETLINK, 0, rtmmsg,
-					rta_buf - (void *) rtmmsg,
-					cb, user_data, destroy);
-	l_free(rtmmsg);
-
-	return id;
-}
-
-uint32_t rtnl_set_mac(struct l_netlink *rtnl, int ifindex,
-					const uint8_t addr[static 6],
-					l_netlink_command_func_t cb,
-					void *user_data,
-					l_netlink_destroy_func_t destroy)
-{
-	struct ifinfomsg *rtmmsg;
-	void *rta_buf;
-	size_t bufsize;
-	uint32_t id;
-
-	bufsize = NLMSG_ALIGN(sizeof(struct ifinfomsg)) + RTA_SPACE(6);
-
-	rtmmsg = l_malloc(bufsize);
-	memset(rtmmsg, 0, bufsize);
-
-	rtmmsg->ifi_family = AF_UNSPEC;
-	rtmmsg->ifi_index = ifindex;
-
-	rta_buf = (void *) rtmmsg + NLMSG_ALIGN(sizeof(struct ifinfomsg));
-
-	rta_buf += rta_add_data(rta_buf, IFLA_ADDRESS, (void *) addr, 6);
-
-	id = l_netlink_send(rtnl, RTM_SETLINK, 0, rtmmsg,
-					rta_buf - (void *) rtmmsg,
-					cb, user_data, destroy);
-	l_free(rtmmsg);
-
-	return id;
-}
-
-uint32_t rtnl_set_powered(struct l_netlink *rtnl, int ifindex, bool powered,
-				l_netlink_command_func_t cb, void *user_data,
-				l_netlink_destroy_func_t destroy)
-{
-	struct ifinfomsg *rtmmsg;
-	size_t bufsize;
-	uint32_t id;
-
-	bufsize = NLMSG_ALIGN(sizeof(struct ifinfomsg));
-
-	rtmmsg = l_malloc(bufsize);
-	memset(rtmmsg, 0, bufsize);
-
-	rtmmsg->ifi_family = AF_UNSPEC;
-	rtmmsg->ifi_index = ifindex;
-	rtmmsg->ifi_change = IFF_UP;
-	rtmmsg->ifi_flags = powered ? IFF_UP : 0;
-
-	id = l_netlink_send(rtnl, RTM_SETLINK, 0, rtmmsg, bufsize,
-					cb, user_data, destroy);
-	l_free(rtmmsg);
-
-	return id;
-}
-
-void rtnl_ifaddr_extract(const struct ifaddrmsg *ifa, int bytes,
-				char **label, char **ip, char **broadcast)
-{
-	struct in_addr in_addr;
-	struct rtattr *attr;
-
-	for (attr = IFA_RTA(ifa); RTA_OK(attr, bytes);
-						attr = RTA_NEXT(attr, bytes)) {
-		switch (attr->rta_type) {
-		case IFA_LOCAL:
-			if (!ip)
-				break;
-
-			in_addr = *((struct in_addr *) RTA_DATA(attr));
-			*ip = l_strdup(inet_ntoa(in_addr));
-
-			break;
-		case IFA_BROADCAST:
-			if (!broadcast)
-				break;
-
-			in_addr = *((struct in_addr *) RTA_DATA(attr));
-			*broadcast = l_strdup(inet_ntoa(in_addr));
-
-			break;
-		case IFA_LABEL:
-			if (!label)
-				break;
-
-			*label = l_strdup(RTA_DATA(attr));
-			break;
-		}
-	}
-}
-
-uint32_t rtnl_ifaddr_get(struct l_netlink *rtnl, l_netlink_command_func_t cb,
-					void *user_data,
-					l_netlink_destroy_func_t destroy)
-{
-	struct ifaddrmsg *rtmmsg;
-	uint32_t id;
-
-	rtmmsg = l_malloc(sizeof(struct ifaddrmsg));
-	memset(rtmmsg, 0, sizeof(struct ifaddrmsg));
-
-	rtmmsg->ifa_family = AF_INET;
-
-	id = l_netlink_send(rtnl, RTM_GETADDR, NLM_F_DUMP, rtmmsg,
-				sizeof(struct ifaddrmsg), cb, user_data,
-				destroy);
-
-	l_free(rtmmsg);
-
-	return id;
-}
-
-static uint32_t rtnl_ifaddr_change(struct l_netlink *rtnl, uint16_t nlmsg_type,
-					int ifindex, uint8_t prefix_len,
-					const char *ip, const char *broadcast,
-					l_netlink_command_func_t
-					cb, void *user_data,
-					l_netlink_destroy_func_t destroy)
-{
-	struct ifaddrmsg *rtmmsg;
-	struct in_addr in_addr;
-	void *rta_buf;
-	size_t bufsize;
-	uint32_t id;
-
-	bufsize = NLMSG_ALIGN(sizeof(struct ifaddrmsg)) +
-					RTA_SPACE(sizeof(struct in_addr)) +
-					RTA_SPACE(sizeof(struct in_addr));
-
-	rtmmsg = l_malloc(bufsize);
-	memset(rtmmsg, 0, bufsize);
-
-	rtmmsg->ifa_index = ifindex;
-	rtmmsg->ifa_family = AF_INET;
-	rtmmsg->ifa_flags = IFA_F_PERMANENT;
-	rtmmsg->ifa_scope = RT_SCOPE_UNIVERSE;
-	rtmmsg->ifa_prefixlen = prefix_len;
-
-	rta_buf = (void *) rtmmsg + NLMSG_ALIGN(sizeof(struct ifaddrmsg));
-
-	if (inet_pton(AF_INET, ip, &in_addr) < 1) {
-		l_free(rtmmsg);
-		return 0;
-	}
-
-	rta_buf += rta_add_data(rta_buf, IFA_LOCAL, &in_addr,
-							sizeof(struct in_addr));
-
-	if (broadcast) {
-		if (inet_pton(AF_INET, broadcast, &in_addr) < 1) {
-			l_free(rtmmsg);
-			return 0;
-		}
-	} else {
-		in_addr.s_addr = in_addr.s_addr |
-					htonl(0xFFFFFFFFLU >> prefix_len);
-	}
-
-	rta_buf += rta_add_data(rta_buf, IFA_BROADCAST, &in_addr,
-							sizeof(struct in_addr));
-
-	id = l_netlink_send(rtnl, nlmsg_type, 0, rtmmsg,
-						rta_buf - (void *) rtmmsg, cb,
-						user_data, destroy);
-	l_free(rtmmsg);
-
-	return id;
-}
-
-uint32_t rtnl_ifaddr_add(struct l_netlink *rtnl, int ifindex,
-				uint8_t prefix_len, const char *ip,
-				const char *broadcast,
-				l_netlink_command_func_t cb, void *user_data,
-				l_netlink_destroy_func_t destroy)
-{
-	return rtnl_ifaddr_change(rtnl, RTM_NEWADDR, ifindex, prefix_len, ip,
-					broadcast, cb, user_data, destroy);
-}
-
-uint32_t rtnl_ifaddr_delete(struct l_netlink *rtnl, int ifindex,
-				uint8_t prefix_len, const char *ip,
-				const char *broadcast,
-				l_netlink_command_func_t cb, void *user_data,
-				l_netlink_destroy_func_t destroy)
-{
-	return rtnl_ifaddr_change(rtnl, RTM_DELADDR, ifindex, prefix_len, ip,
-					broadcast, cb, user_data, destroy);
-}
-
-void rtnl_route_extract_ipv4(const struct rtmsg *rtmsg, uint32_t len,
-				uint32_t *ifindex, char **dst, char **gateway,
-				char **src)
-{
-	struct in_addr in_addr;
-	struct rtattr *attr;
-
-	for (attr = RTM_RTA(rtmsg); RTA_OK(attr, len);
-						attr = RTA_NEXT(attr, len)) {
-		switch (attr->rta_type) {
-		case RTA_DST:
-			if (!dst)
-				break;
-
-			in_addr = *((struct in_addr *) RTA_DATA(attr));
-			*dst = l_strdup(inet_ntoa(in_addr));
-
-			break;
-		case RTA_GATEWAY:
-			if (!gateway)
-				break;
-
-			in_addr = *((struct in_addr *) RTA_DATA(attr));
-			*gateway = l_strdup(inet_ntoa(in_addr));
-
-			break;
-		case RTA_PREFSRC:
-			if (!src)
-				break;
-
-			in_addr = *((struct in_addr *) RTA_DATA(attr));
-			*src = l_strdup(inet_ntoa(in_addr));
-
-			break;
-		case RTA_OIF:
-			if (!ifindex)
-				break;
-
-			*ifindex = *((uint32_t *) RTA_DATA(attr));
-			break;
-		}
-	}
-}
-
-uint32_t rtnl_route_dump_ipv4(struct l_netlink *rtnl,
-				l_netlink_command_func_t cb, void *user_data,
-				l_netlink_destroy_func_t destroy)
-{
-	struct rtmsg rtmsg;
-
-	memset(&rtmsg, 0, sizeof(struct rtmsg));
-	rtmsg.rtm_family = AF_INET;
-
-	return l_netlink_send(rtnl, RTM_GETROUTE, NLM_F_DUMP, &rtmsg,
-					sizeof(struct rtmsg), cb, user_data,
-					destroy);
-}
-
-static uint32_t rtnl_route_add(struct l_netlink *rtnl, int ifindex,
-					uint8_t scope, uint8_t dst_len,
-					const char *dst, const char *gateway,
-					const char *src,
-					uint32_t priority_offset, uint8_t proto,
-					l_netlink_command_func_t cb,
-					void *user_data,
-					l_netlink_destroy_func_t destroy)
-{
-	L_AUTO_FREE_VAR(struct rtmsg *, rtmmsg) = NULL;
-	struct in_addr in_addr;
-	size_t bufsize;
-	void *rta_buf;
-	uint16_t flags;
-
-	if (!dst && !gateway)
-		return 0;
-
-	bufsize = NLMSG_ALIGN(sizeof(struct rtmsg)) +
-			RTA_SPACE(sizeof(uint32_t)) +
-			(priority_offset ? RTA_SPACE(sizeof(uint32_t)) : 0) +
-			(gateway ? RTA_SPACE(sizeof(struct in_addr)) : 0) +
-			(src ? RTA_SPACE(sizeof(struct in_addr)) : 0) +
-			(dst ? RTA_SPACE(sizeof(struct in_addr)) : 0);
-
-	rtmmsg = l_malloc(bufsize);
-	memset(rtmmsg, 0, bufsize);
-
-	rtmmsg->rtm_family = AF_INET;
-	rtmmsg->rtm_table = RT_TABLE_MAIN;
-	rtmmsg->rtm_protocol = proto;
-	rtmmsg->rtm_type = RTN_UNICAST;
-	rtmmsg->rtm_scope = scope;
-
-	flags = NLM_F_CREATE | NLM_F_REPLACE;
-
-	rta_buf = (void *) rtmmsg + NLMSG_ALIGN(sizeof(struct rtmsg));
-	rta_buf += rta_add_u32(rta_buf, RTA_OIF, ifindex);
-
-	if (priority_offset)
-		rta_buf += rta_add_u32(rta_buf, RTA_PRIORITY,
-						priority_offset + ifindex);
-
-	if (dst) {
-		if (inet_pton(AF_INET, dst, &in_addr) < 1)
-			return 0;
-
-		rtmmsg->rtm_dst_len = dst_len;
-		rta_buf += rta_add_data(rta_buf, RTA_DST, &in_addr,
-							sizeof(struct in_addr));
-	}
-
-	if (gateway) {
-		if (inet_pton(AF_INET, gateway, &in_addr) < 1)
-			return 0;
-
-		rta_buf += rta_add_data(rta_buf, RTA_GATEWAY, &in_addr,
-							sizeof(struct in_addr));
-	}
-
-	if (src) {
-		if (inet_pton(AF_INET, src, &in_addr) < 1)
-			return 0;
-
-		rtmmsg->rtm_src_len = 32;
-		rta_buf += rta_add_data(rta_buf, RTA_PREFSRC, &in_addr,
-							sizeof(struct in_addr));
-	}
-
-	return l_netlink_send(rtnl, RTM_NEWROUTE, flags, rtmmsg,
-				rta_buf - (void *) rtmmsg, cb, user_data,
-								destroy);
-}
-
-uint32_t rtnl_route_ipv4_add_connected(struct l_netlink *rtnl, int ifindex,
-					uint8_t dst_len, const char *dst,
-					const char *src, uint8_t proto,
-					l_netlink_command_func_t cb,
-					void *user_data,
-					l_netlink_destroy_func_t destroy)
-{
-	return rtnl_route_add(rtnl, ifindex, RT_SCOPE_LINK, dst_len, dst, NULL,
-				src, 0, proto, cb, user_data, destroy);
-}
-
-uint32_t rtnl_route_ipv4_add_gateway(struct l_netlink *rtnl, int ifindex,
-					const char *gateway, const char *src,
-					uint32_t priority_offset,
-					uint8_t proto,
-					l_netlink_command_func_t cb,
-					void *user_data,
-					l_netlink_destroy_func_t destroy)
-{
-	return rtnl_route_add(rtnl, ifindex, RT_SCOPE_UNIVERSE, 0, NULL,
-				gateway, src, priority_offset, proto, cb,
-				user_data, destroy);
-}
-
-void rtnl_ifaddr_ipv6_extract(const struct ifaddrmsg *ifa, int len, char **ip)
-{
-	struct in6_addr in6_addr;
-	struct rtattr *attr;
-	char address[128];
-
-	for (attr = IFA_RTA(ifa); RTA_OK(attr, len);
-						attr = RTA_NEXT(attr, len)) {
-		switch (attr->rta_type) {
-		case IFA_ADDRESS:
-			if (!ip)
-				break;
-
-			memcpy(&in6_addr.s6_addr, RTA_DATA(attr),
-						sizeof(in6_addr.s6_addr));
-
-			if (!inet_ntop(AF_INET6, &in6_addr, address,
-							INET6_ADDRSTRLEN)) {
-
-				l_error("rtnl: Failed to extract IPv6 address");
-				break;
-			}
-
-			*ip = l_strdup(address);
-
-			break;
-		}
-	}
-}
-
-uint32_t rtnl_ifaddr_ipv6_get(struct l_netlink *rtnl,
-				l_netlink_command_func_t cb, void *user_data,
-				l_netlink_destroy_func_t destroy)
-{
-	struct ifaddrmsg *rtmmsg;
-	uint32_t id;
-
-	rtmmsg = l_malloc(sizeof(struct ifaddrmsg));
-	memset(rtmmsg, 0, sizeof(struct ifaddrmsg));
-
-	rtmmsg->ifa_family = AF_INET6;
-
-	id = l_netlink_send(rtnl, RTM_GETADDR, NLM_F_DUMP, rtmmsg,
-				sizeof(struct ifaddrmsg), cb, user_data,
-				destroy);
-
-	l_free(rtmmsg);
-
-	return id;
-}
-
-static uint32_t rtnl_ifaddr_ipv6_change(struct l_netlink *rtnl,
-					uint16_t nlmsg_type,
-					int ifindex, uint8_t prefix_len,
-					const char *ip,
-					l_netlink_command_func_t cb,
-					void *user_data,
-					l_netlink_destroy_func_t destroy)
-{
-	struct ifaddrmsg *rtmmsg;
-	struct in6_addr in6_addr;
-	void *rta_buf;
-	size_t bufsize;
-	uint32_t id;
-
-	bufsize = NLMSG_ALIGN(sizeof(struct ifaddrmsg)) +
-					RTA_SPACE(sizeof(struct in6_addr));
-
-	rtmmsg = l_malloc(bufsize);
-	memset(rtmmsg, 0, bufsize);
-
-	rtmmsg->ifa_index = ifindex;
-	rtmmsg->ifa_family = AF_INET6;
-	rtmmsg->ifa_flags = IFA_F_PERMANENT;
-	rtmmsg->ifa_scope = RT_SCOPE_UNIVERSE;
-	rtmmsg->ifa_prefixlen = prefix_len;
-
-	rta_buf = (void *) rtmmsg + NLMSG_ALIGN(sizeof(struct ifaddrmsg));
-
-	if (inet_pton(AF_INET6, ip, &in6_addr) < 1) {
-		l_free(rtmmsg);
-		return 0;
-	}
-
-	rta_buf += rta_add_data(rta_buf, IFA_LOCAL, &in6_addr,
-						sizeof(struct in6_addr));
-
-	id = l_netlink_send(rtnl, nlmsg_type, 0, rtmmsg,
-						rta_buf - (void *) rtmmsg, cb,
-						user_data, destroy);
-	l_free(rtmmsg);
-
-	return id;
-}
-
-uint32_t rtnl_ifaddr_ipv6_add(struct l_netlink *rtnl, int ifindex,
-				uint8_t prefix_len, const char *ip,
-				l_netlink_command_func_t cb, void *user_data,
-				l_netlink_destroy_func_t destroy)
-{
-	return rtnl_ifaddr_ipv6_change(rtnl, RTM_NEWADDR, ifindex, prefix_len,
-						ip, cb, user_data, destroy);
-}
-
-uint32_t rtnl_ifaddr_ipv6_delete(struct l_netlink *rtnl, int ifindex,
-					uint8_t prefix_len, const char *ip,
-					l_netlink_command_func_t cb,
-					void *user_data,
-					l_netlink_destroy_func_t destroy)
-{
-	return rtnl_ifaddr_ipv6_change(rtnl, RTM_DELADDR, ifindex, prefix_len,
-						ip, cb, user_data, destroy);
-}
-
-static uint32_t rtnl_route_ipv6_change(struct l_netlink *rtnl,
-					uint16_t nlmsg_type, int ifindex,
-					const char *gateway,
-					uint32_t priority_offset,
-					uint8_t proto,
-					l_netlink_command_func_t cb,
-					void *user_data,
-					l_netlink_destroy_func_t destroy)
-{
-	L_AUTO_FREE_VAR(struct rtmsg *, rtmmsg) = NULL;
-	struct in6_addr in6_addr;
-	size_t bufsize;
-	void *rta_buf;
-	uint16_t flags;
-
-	if (!gateway)
-		return 0;
-
-	bufsize = NLMSG_ALIGN(sizeof(struct rtmsg)) +
-			RTA_SPACE(sizeof(uint32_t)) +
-			(priority_offset ? RTA_SPACE(sizeof(uint32_t)) : 0) +
-			RTA_SPACE(sizeof(struct in6_addr));
-
-	rtmmsg = l_malloc(bufsize);
-	memset(rtmmsg, 0, bufsize);
-
-	rtmmsg->rtm_family = AF_INET6;
-	rtmmsg->rtm_table = RT_TABLE_MAIN;
-	rtmmsg->rtm_protocol = proto;
-	rtmmsg->rtm_type = RTN_UNICAST;
-	rtmmsg->rtm_scope = RT_SCOPE_UNIVERSE;
-
-	flags = NLM_F_CREATE | NLM_F_REPLACE;
-
-	rta_buf = (void *) rtmmsg + NLMSG_ALIGN(sizeof(struct rtmsg));
-	rta_buf += rta_add_u32(rta_buf, RTA_OIF, ifindex);
-
-	if (priority_offset)
-		rta_buf += rta_add_u32(rta_buf, RTA_PRIORITY,
-						priority_offset + ifindex);
-
-	if (gateway) {
-		if (inet_pton(AF_INET6, gateway, &in6_addr) < 1)
-			return 0;
-
-		rta_buf += rta_add_data(rta_buf, RTA_GATEWAY, &in6_addr,
-						sizeof(struct in6_addr));
-	}
-
-	return l_netlink_send(rtnl, nlmsg_type, flags, rtmmsg,
-				rta_buf - (void *) rtmmsg, cb, user_data,
-								destroy);
-}
-
-uint32_t rtnl_route_ipv6_add_gateway(struct l_netlink *rtnl, int ifindex,
-					const char *gateway,
-					uint32_t priority_offset,
-					uint8_t proto,
-					l_netlink_command_func_t cb,
-					void *user_data,
-					l_netlink_destroy_func_t destroy)
-{
-	return rtnl_route_ipv6_change(rtnl, RTM_NEWROUTE, ifindex, gateway,
-					priority_offset, proto, cb,
-					user_data, destroy);
-}
-
-uint32_t rtnl_route_ipv6_delete_gateway(struct l_netlink *rtnl, int ifindex,
-					const char *gateway,
-					uint32_t priority_offset,
-					uint8_t proto,
-					l_netlink_command_func_t cb,
-					void *user_data,
-					l_netlink_destroy_func_t destroy)
-{
-	return rtnl_route_ipv6_change(rtnl, RTM_DELROUTE, ifindex, gateway,
-					priority_offset, proto, cb,
-					user_data, destroy);
-}
diff --git a/src/rtnlutil.h b/src/rtnlutil.h
deleted file mode 100644
index dc0537831..000000000
--- a/src/rtnlutil.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- *
- *  Wireless daemon for Linux
- *
- *  Copyright (C) 2019  Intel Corporation. All rights reserved.
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-uint32_t rtnl_set_linkmode_and_operstate(struct l_netlink *rtnl, int ifindex,
-					uint8_t linkmode, uint8_t operstate,
-					l_netlink_command_func_t cb,
-					void *user_data,
-					l_netlink_destroy_func_t destroy);
-
-uint32_t rtnl_set_mac(struct l_netlink *rtnl, int ifindex,
-					const uint8_t addr[static 6],
-					l_netlink_command_func_t cb,
-					void *user_data,
-					l_netlink_destroy_func_t destroy);
-
-uint32_t rtnl_set_powered(struct l_netlink *rtnl, int ifindex, bool powered,
-				l_netlink_command_func_t cb, void *user_data,
-				l_netlink_destroy_func_t destroy);
-
-void rtnl_ifaddr_extract(const struct ifaddrmsg *ifa, int bytes,
-				char **label, char **ip, char **broadcast);
-uint32_t rtnl_ifaddr_get(struct l_netlink *rtnl, l_netlink_command_func_t cb,
-				void *user_data,
-				l_netlink_destroy_func_t destroy);
-uint32_t rtnl_ifaddr_add(struct l_netlink *rtnl, int ifindex,
-				uint8_t prefix_len, const char *ip,
-				const char *broadcast,
-				l_netlink_command_func_t cb, void *user_data,
-				l_netlink_destroy_func_t destroy);
-uint32_t rtnl_ifaddr_delete(struct l_netlink *rtnl, int ifindex,
-				uint8_t prefix_len, const char *ip,
-				const char *broadcast,
-				l_netlink_command_func_t cb, void *user_data,
-				l_netlink_destroy_func_t destroy);
-
-void rtnl_route_extract_ipv4(const struct rtmsg *rtmsg, uint32_t len,
-				uint32_t *ifindex, char **dst, char **gateway,
-				char **src);
-uint32_t rtnl_route_dump_ipv4(struct l_netlink *rtnl,
-				l_netlink_command_func_t cb, void *user_data,
-				l_netlink_destroy_func_t destroy);
-uint32_t rtnl_route_ipv4_add_connected(struct l_netlink *rtnl, int ifindex,
-					uint8_t dst_len, const char *dst,
-					const char *src, uint8_t proto,
-					l_netlink_command_func_t cb,
-					void *user_data,
-					l_netlink_destroy_func_t destroy);
-uint32_t rtnl_route_ipv4_add_gateway(struct l_netlink *rtnl, int ifindex,
-					const char *gateway, const char *src,
-					uint32_t priority_offset,
-					uint8_t proto,
-					l_netlink_command_func_t cb,
-					void *user_data,
-					l_netlink_destroy_func_t destroy);
-
-void rtnl_ifaddr_ipv6_extract(const struct ifaddrmsg *ifa, int bytes,
-								char **ip);
-uint32_t rtnl_ifaddr_ipv6_get(struct l_netlink *rtnl,
-				l_netlink_command_func_t cb,
-				void *user_data,
-				l_netlink_destroy_func_t destroy);
-uint32_t rtnl_ifaddr_ipv6_add(struct l_netlink *rtnl, int ifindex,
-				uint8_t prefix_len, const char *ip,
-				l_netlink_command_func_t cb, void *user_data,
-				l_netlink_destroy_func_t destroy);
-uint32_t rtnl_ifaddr_ipv6_delete(struct l_netlink *rtnl, int ifindex,
-					uint8_t prefix_len, const char *ip,
-					l_netlink_command_func_t cb,
-					void *user_data,
-					l_netlink_destroy_func_t destroy);
-uint32_t rtnl_route_ipv6_add_gateway(struct l_netlink *rtnl, int ifindex,
-					const char *gateway,
-					uint32_t priority_offset,
-					uint8_t proto,
-					l_netlink_command_func_t cb,
-					void *user_data,
-					l_netlink_destroy_func_t destroy);
-uint32_t rtnl_route_ipv6_delete_gateway(struct l_netlink *rtnl, int ifindex,
-					const char *gateway,
-					uint32_t priority_offset,
-					uint8_t proto,
-					l_netlink_command_func_t cb,
-					void *user_data,
-					l_netlink_destroy_func_t destroy);