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

rtnetlink: Switch to stdplus::Fd

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

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

test/test_rtnetlink.cpp

diff --git a/test/test_rtnetlink.cpp b/test/test_rtnetlink.cpp
index 98d8db3..21aaca3 100644
--- a/test/test_rtnetlink.cpp
+++ b/test/test_rtnetlink.cpp
@@ -28,7 +28,7 @@
 {
 
   public:
-    phosphor::Descriptor smartSock;
+    std::optional<rtnetlink::Server> svr;
 
     TestRtNetlink()
     {
@@ -41,8 +41,9 @@
         initializeTimers();
         createNetLinkSocket();
         bus.attach_event(eventPtr.get(), SD_EVENT_PRIORITY_NORMAL);
-        rtnetlink::Server svr(eventPtr, smartSock);
+        svr.emplace(eventPtr);
     }
+
     void createNetLinkSocket()
     {
         // RtnetLink socket
@@ -72,7 +73,7 @@
 
     EXPECT_EQ(false, manager->hasInterface("igb5"));
     // Send the request
-    send(smartSock(), nlMsg, nlMsg->nlmsg_len, 0);
+    send(svr->getSock(), nlMsg, nlMsg->nlmsg_len, 0);
 
     int i = 3;
     while (i--)