Haiku/haiku
Haiku/haiku
1
0
Fork 0
mirror of https://review.haiku-os.org/haiku synced 2024-11-23 15:28:58 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: Rename IFT_TUN to IFT_TUNNEL as on BSD

Browse Source 
We already use their value, let's use the name too.

Change-Id: I5afbd69923ae3b5e702dfb935a709c3069de5365
Reviewed-on: https://review.haiku-os.org/c/haiku/+/7146
Reviewed-by: Adrien Destugues <pulkomandy@pulkomandy.tk>
Tested-by: Commit checker robot <no-reply+buildbot@haiku-os.org>
Reviewed-by: François Revol <revol@free.fr>
This commit is contained in:
François Revol 2023-11-18 23:48:17 +01:00 committed by Adrien Destugues
parent e26329ce22
commit 71522c937e
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
headers/posix/net/if_types.h
View File

@ -15,7 +15,7 @@
#define IFT_SLIP 0x1c
#define IFT_LOCALTALK 0x2a
#define IFT_MODEM 0x30
#define IFT_TUN 0x83
#define IFT_TUNNEL 0x83
#define IFT_L2VLAN 0x87
#define IFT_BRIDGE 0xd1

4
src/add-ons/kernel/network/datalink_protocols/loopback_frame/loopback_frame.cpp
View File

@ -50,7 +50,7 @@ status_t
loopback_frame_init(struct net_interface*interface, net_domain* domain,
net_datalink_protocol** _protocol)
{
if (interface->device->type != IFT_LOOP && interface->device->type != IFT_TUN)
if (interface->device->type != IFT_LOOP && interface->device->type != IFT_TUNNEL)
return B_BAD_TYPE;
loopback_frame_protocol* protocol;
@ -67,7 +67,7 @@ loopback_frame_init(struct net_interface*interface, net_domain* domain,
if (interface->device->type == IFT_LOOP) {
// Locally received buffers don't need a domain device handler, as the
// buffer reception is handled internally.
} else if (interface->device->type == IFT_TUN) {
} else if (interface->device->type == IFT_TUNNEL) {
status = stack->register_domain_device_handler(
interface->device, B_NET_FRAME_TYPE(IFT_ETHER, ETHER_TYPE_IP), domain);
if (status != B_OK)

2
src/add-ons/kernel/network/devices/tunnel/tunnel.cpp
View File

@ -362,7 +362,7 @@ tunnel_init(const char* name, net_device** _device)
device->address.length = ETHER_ADDRESS_LENGTH;
} else {
device->flags = IFF_POINTOPOINT | IFF_LINK;
device->type = IFT_TUN;
device->type = IFT_TUNNEL;
}
status_t status = gStackModule->init_fifo(&device->send_queue,

2
src/add-ons/kernel/network/stack/stack.cpp
View File

@ -833,7 +833,7 @@ init_stack()
// TODO: for now!
register_domain_datalink_protocols(AF_INET, IFT_LOOP,
"network/datalink_protocols/loopback_frame/v1", NULL);
register_domain_datalink_protocols(AF_INET, IFT_TUN,
register_domain_datalink_protocols(AF_INET, IFT_TUNNEL,
"network/datalink_protocols/loopback_frame/v1", NULL);
#if 0 // PPP is not (currently) included in the build
register_domain_datalink_protocols(AF_INET, IFT_PPP,