From 64948daae87758e6c54bff5ce8ff7f7305fef6e0 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 17 Apr 2019 14:07:44 +0000 Subject: [PATCH] tun/tap: Build fixes for tun add-on --- headers/posix/net/if_types.h | 2 ++ src/add-ons/kernel/network/devices/Jamfile | 1 + src/add-ons/kernel/network/devices/tun/tun.cpp | 8 ++++---- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/headers/posix/net/if_types.h b/headers/posix/net/if_types.h index fda4534f03..f95dd24379 100644 --- a/headers/posix/net/if_types.h +++ b/headers/posix/net/if_types.h @@ -12,5 +12,7 @@ #define IFT_LOOP 0x18 #define IFT_SLIP 0x1c #define IFT_MODEM 0x30 +#define IFT_TUN 0x40 + #endif /* _NET_IF_TYPES_H */ diff --git a/src/add-ons/kernel/network/devices/Jamfile b/src/add-ons/kernel/network/devices/Jamfile index 78eb1fde15..a7147d8944 100644 --- a/src/add-ons/kernel/network/devices/Jamfile +++ b/src/add-ons/kernel/network/devices/Jamfile @@ -3,4 +3,5 @@ SubDir HAIKU_TOP src add-ons kernel network devices ; SubInclude HAIKU_TOP src add-ons kernel network devices dialup ; SubInclude HAIKU_TOP src add-ons kernel network devices ethernet ; SubInclude HAIKU_TOP src add-ons kernel network devices loopback ; +SubInclude HAIKU_TOP src add-ons kernel network devices tun ; diff --git a/src/add-ons/kernel/network/devices/tun/tun.cpp b/src/add-ons/kernel/network/devices/tun/tun.cpp index 298fb14196..4fa665a919 100644 --- a/src/add-ons/kernel/network/devices/tun/tun.cpp +++ b/src/add-ons/kernel/network/devices/tun/tun.cpp @@ -6,6 +6,7 @@ * Axel Dörfler, axeld@pinc-software.de */ +#include #include #include @@ -36,7 +37,6 @@ status_t tun_init(const char *name, net_device **_device) { tun_device *device; - status_t status; if (strncmp(name, "tun", 3) && strncmp(name, "tap", 3) @@ -146,23 +146,23 @@ tun_std_ops(int32 op, ...) { switch (op) { case B_MODULE_INIT: + { status_t status = get_module(NET_STACK_MODULE_NAME, (module_info **)&sStackModule); if (status < B_OK) return status; - status = get_module(NET_BUFFER_MODULE_NAME, (module_info **)&gBufferModule); if (status < B_OK) { put_module(NET_STACK_MODULE_NAME); return status; } - + return B_OK; + } case B_MODULE_UNINIT: put_module(NET_BUFFER_MODULE_NAME); put_module(NET_STACK_MODULE_NAME); return B_OK; - default: return B_ERROR; }