fix recursive call and use common config

steinwurf · Aug 15, 2024 · 1fc635a · 1fc635a
1 parent c7fa7a4
commit 1fc635a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 16 deletions.
diff --git a/apps/app/tunnel.cpp b/apps/app/tunnel.cpp
@@ -147,9 +147,9 @@ int main(int argc, char** argv)
     if (mode == "tun")
     {
         tunnel::tun_interface iface1;
+        iface1.create({});
         iface1.set_log_callback(log1);
         iface1.monitor().enable_log();
-        iface1.create({});
         iface1.set_ipv4(tunnel_address);
         iface1.set_ipv4_netmask("255.255.255.0");
         iface1.set_mtu(1500);
@@ -165,9 +165,9 @@ int main(int argc, char** argv)
     else if (mode == "tap")
     {
         tunnel::tap_interface iface1;
+        iface1.create({});
         iface1.set_log_callback(log1);
         iface1.monitor().enable_log();
-        iface1.create({});
         iface1.set_ipv4(tunnel_address);
         iface1.set_ipv4_netmask("255.255.255.0");
         iface1.set_mtu(1500);

diff --git a/src/tunnel/tap_interface.cpp b/src/tunnel/tap_interface.cpp
@@ -66,7 +66,7 @@ void tap_interface::create(const config& config)
 void tap_interface::create(const config& config, std::error_code& error)
 {
     assert(m_impl);
-    create(config, error);
+    m_impl->create(config, error);
 }
 
 void tap_interface::rename(const std::string& interface_name) const

diff --git a/src/tunnel/tap_interface.hpp b/src/tunnel/tap_interface.hpp
@@ -10,24 +10,12 @@
 #include <system_error>
 
 #include "monitor.hpp"
+#include "interface_config.hpp"
 
 namespace tunnel
 {
 class tap_interface
 {
-public:
-    struct config
-    {
-        /// The name of the interface
-        std::string m_interface_name;
-
-        /// If true the interface will be created with Virtual Network
-        /// Device Header enabled.
-        bool m_vnet_hdr = false;
-
-        /// If true the interface will be created with IFF_NO_PI enabled.
-        bool m_iff_no_pi = false;
-    };
 
 public:
     /// Constructor