From 417981761ed4f12ec8dfb5480099436db2d0bf25 Mon Sep 17 00:00:00 2001
From: Thomas Winget <tewinget@gmail.com>
Date: Mon, 12 Dec 2022 20:53:43 -0500
Subject: [PATCH] squash

---
 llarp/vpn/null.hpp | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/llarp/vpn/null.hpp b/llarp/vpn/null.hpp
index fa6c6850e..4f7530904 100644
--- a/llarp/vpn/null.hpp
+++ b/llarp/vpn/null.hpp
@@ -10,7 +10,7 @@ namespace llarp::vpn
     int m_pipe[2];
 
    public:
-    NullInterface()
+    NullInterface(InterfaceInfo info) : NetworkInterface{std::move(info)}
     {
       ::pipe(m_pipe);
     }
@@ -27,13 +27,6 @@ namespace llarp::vpn
       return m_pipe[0];
     }
 
-    /// the interface's name
-    std::string
-    IfName() const override
-    {
-      return "";
-    }
-
     net::IPPacket
     ReadNextPacket() override
     {
@@ -52,13 +45,15 @@ namespace llarp::vpn
   class NopRouteManager : public IRouteManager
   {
    public:
-    void AddRoute(IPVariant_t, IPVariant_t) override{};
+    void AddRoute(net::ipaddr_t, net::ipaddr_t) override{};
 
-    void DelRoute(IPVariant_t, IPVariant_t) override{};
+    void DelRoute(net::ipaddr_t, net::ipaddr_t) override{};
 
-    void AddDefaultRouteViaInterface(std::string) override{};
+    void
+    AddDefaultRouteViaInterface(NetworkInterface&) override{};
 
-    void DelDefaultRouteViaInterface(std::string) override{};
+    void
+    DelDefaultRouteViaInterface(NetworkInterface&) override{};
 
     void
     AddRouteViaInterface(NetworkInterface&, IPRange) override{};
@@ -66,11 +61,11 @@ namespace llarp::vpn
     void
     DelRouteViaInterface(NetworkInterface&, IPRange) override{};
 
-    std::vector<IPVariant_t>
-    GetGatewaysNotOnInterface(std::string) override
+    std::vector<net::ipaddr_t>
+    GetGatewaysNotOnInterface(NetworkInterface&) override
     {
-      return {};
-    }
+      return std::vector<net::ipaddr_t>{};
+    };
   };
 
   class NullPlatform : public Platform
@@ -84,9 +79,9 @@ namespace llarp::vpn
     virtual ~NullPlatform() = default;
 
     std::shared_ptr<NetworkInterface>
-    ObtainInterface(InterfaceInfo, AbstractRouter*)
+    ObtainInterface(InterfaceInfo info, AbstractRouter*) override
     {
-      return std::static_pointer_cast<NetworkInterface>(std::make_shared<NullInterface>());
+      return std::make_shared<NullInterface>(std::move(info));
     }
 
     IRouteManager&