i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tun/tap: Build fixes for tun add-on

Browse Source
This commit is contained in:
Alexander von Gluck IV
2019-04-17 14:12:59 +00:00
parent 23901a75de
commit 64948daae8
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/posix/net/if_types.h
+2
View File
@@ -12,5 +12,7 @@
#define IFT_LOOP 0x18 #define IFT_LOOP 0x18
#define IFT_SLIP 0x1c #define IFT_SLIP 0x1c
#define IFT_MODEM 0x30 #define IFT_MODEM 0x30
#define IFT_TUN 0x40
#endif /* _NET_IF_TYPES_H */ #endif /* _NET_IF_TYPES_H */
src/add-ons/kernel/network/devices/Jamfile
+1
View File
@@ -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 dialup ;
SubInclude HAIKU_TOP src add-ons kernel network devices ethernet ; 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 loopback ;
SubInclude HAIKU_TOP src add-ons kernel network devices tun ;
src/add-ons/kernel/network/devices/tun/tun.cpp
+4 -4
View File
@@ -6,6 +6,7 @@
* Axel Dörfler, [email protected] * Axel Dörfler, [email protected]
*/ */
#include <net_tun.h>
#include <net_buffer.h> #include <net_buffer.h>
#include <net_device.h> #include <net_device.h>
@@ -36,7 +37,6 @@ status_t
tun_init(const char *name, net_device **_device) tun_init(const char *name, net_device **_device)
{ {
tun_device *device; tun_device *device;
status_t status;
if (strncmp(name, "tun", 3) if (strncmp(name, "tun", 3)
&& strncmp(name, "tap", 3) && strncmp(name, "tap", 3)
@@ -146,23 +146,23 @@ tun_std_ops(int32 op, ...)
{ {
switch (op) { switch (op) {
case B_MODULE_INIT: case B_MODULE_INIT:
{
status_t status = get_module(NET_STACK_MODULE_NAME, status_t status = get_module(NET_STACK_MODULE_NAME,
(module_info **)&sStackModule); (module_info **)&sStackModule);
if (status < B_OK) if (status < B_OK)
return status; return status;
status = get_module(NET_BUFFER_MODULE_NAME, status = get_module(NET_BUFFER_MODULE_NAME,
(module_info **)&gBufferModule); (module_info **)&gBufferModule);
if (status < B_OK) { if (status < B_OK) {
put_module(NET_STACK_MODULE_NAME); put_module(NET_STACK_MODULE_NAME);
return status; return status;
} }
return B_OK;
}
case B_MODULE_UNINIT: case B_MODULE_UNINIT:
put_module(NET_BUFFER_MODULE_NAME); put_module(NET_BUFFER_MODULE_NAME);
put_module(NET_STACK_MODULE_NAME); put_module(NET_STACK_MODULE_NAME);
return B_OK; return B_OK;
default: default:
return B_ERROR; return B_ERROR;
} }