commit 2ac2660c63734e8a8cc8cb4dd29afc40eb99a4dc
author William A. Kennington III <wak@google.com> Mon Jan 24 14:38:32 2022 -0800
committer William A. Kennington III <wak@google.com> Mon Aug 22 14:50:28 2022 -0700
tree a16907970a430a505ab2919f105d872c1a4da91a
parent d41db3836523f1979ee78ee9472aca5b000f6b3e

netlink: Switch to stdplus::fd

Simplifies the code a little bit and will allow us to remove the
Descriptor.

Change-Id: I386d7a16b4ba46d43298b7e814b2d3f1a5bb160b
Signed-off-by: William A. Kennington III <wak@google.com>

src/netlink.cpp

diff --git a/src/netlink.cpp b/src/netlink.cpp
index 9039575..011cf95 100644
--- a/src/netlink.cpp
+++ b/src/netlink.cpp
@@ -1,14 +1,12 @@
 #include "netlink.hpp"
 
-#include "util.hpp"
-
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
-#include <sys/socket.h>
-#include <unistd.h>
 
 #include <array>
 #include <stdexcept>
+#include <stdplus/fd/create.hpp>
+#include <stdplus/fd/ops.hpp>
 #include <stdplus/raw.hpp>
 #include <system_error>
 
@@ -144,22 +142,16 @@
     }
 }
 
-static int newRequestSocket(int protocol)
+static stdplus::ManagedFd makeSocket(int protocol)
 {
-    int sock = socket(AF_NETLINK, SOCK_RAW, protocol);
-    if (sock < 0)
-    {
-        throw std::system_error(errno, std::generic_category(), "netlink open");
-    }
+    using namespace stdplus::fd;
+
+    auto sock = socket(SocketDomain::Netlink, SocketType::Raw,
+                       static_cast<stdplus::fd::SocketProto>(protocol));
 
     sockaddr_nl local{};
     local.nl_family = AF_NETLINK;
-    int r = bind(sock, reinterpret_cast<sockaddr*>(&local), sizeof(local));
-    if (r < 0)
-    {
-        close(sock);
-        throw std::system_error(errno, std::generic_category(), "netlink bind");
-    }
+    bind(sock, local);
 
     return sock;
 }
@@ -167,9 +159,9 @@
 void performRequest(int protocol, void* data, size_t size,
                     const ReceiveCallback& cb)
 {
-    Descriptor sock(newRequestSocket(protocol));
-    requestSend(sock(), data, size);
-    receive(sock(), cb);
+    auto sock = makeSocket(protocol);
+    requestSend(sock.get(), data, size);
+    receive(sock.get(), cb);
 }
 
 } // namespace detail