[PATCH net-next v3 3/8] selftest: tun: Refactor tun_delete to use tuntap_helpers

[Xu Du]

The previous patch introduced common tuntap helpers to simplify
tuntap test code. This patch refactors the tun_delete function
to use these new helpers.

Signed-off-by: Xu Du <x...@redhat.com>
---
 tools/testing/selftests/net/tun.c | 39 ++-----------------------------
 1 file changed, 2 insertions(+), 37 deletions(-)

diff --git a/tools/testing/selftests/net/tun.c 
b/tools/testing/selftests/net/tun.c
index 128b0a5327d4..08e760fa5d15 100644
--- a/tools/testing/selftests/net/tun.c
+++ b/tools/testing/selftests/net/tun.c
@@ -8,14 +8,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <linux/if.h>
 #include <linux/if_tun.h>
-#include <linux/netlink.h>
-#include <linux/rtnetlink.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 
 #include "kselftest_harness.h"
+#include "tuntap_helpers.h"
 
 static int tun_attach(int fd, char *dev)
 {
@@ -66,40 +64,7 @@ static int tun_alloc(char *dev)
 
 static int tun_delete(char *dev)
 {
-       struct {
-               struct nlmsghdr nh;
-               struct ifinfomsg ifm;
-               unsigned char data[64];
-       } req;
-       struct rtattr *rta;
-       int ret, rtnl;
-
-       rtnl = socket(AF_NETLINK, SOCK_DGRAM, NETLINK_ROUTE);
-       if (rtnl < 0) {
-               fprintf(stderr, "can't open rtnl: %s\n", strerror(errno));
-               return 1;
-       }
-
-       memset(&req, 0, sizeof(req));
-       req.nh.nlmsg_len = NLMSG_ALIGN(NLMSG_LENGTH(sizeof(req.ifm)));
-       req.nh.nlmsg_flags = NLM_F_REQUEST;
-       req.nh.nlmsg_type = RTM_DELLINK;
-
-       req.ifm.ifi_family = AF_UNSPEC;
-
-       rta = (struct rtattr *)(((char *)&req) + NLMSG_ALIGN(req.nh.nlmsg_len));
-       rta->rta_type = IFLA_IFNAME;
-       rta->rta_len = RTA_LENGTH(IFNAMSIZ);
-       req.nh.nlmsg_len += rta->rta_len;
-       memcpy(RTA_DATA(rta), dev, IFNAMSIZ);
-
-       ret = send(rtnl, &req, req.nh.nlmsg_len, 0);
-       if (ret < 0)
-               fprintf(stderr, "can't send: %s\n", strerror(errno));
-       ret = (unsigned int)ret != req.nh.nlmsg_len;
-
-       close(rtnl);
-       return ret;
+       return dev_delete(dev);
 }
 
 FIXTURE(tun)
-- 
2.49.0