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

* Replaced the remaining AF_DLI references with AF_LINK.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34487 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-12-04 09:34:35 +00:00
parent 1f11333149
commit 82aa4a0f4e
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/network/datalink_protocols/arp/arp.cpp
+4 -4
View File
@@ -327,7 +327,7 @@ ipv4_to_ether_multicast(sockaddr_dl *destination, const sockaddr_in *source)
// 01-00-5E-00-00-00 (hex).'' // 01-00-5E-00-00-00 (hex).''
destination->sdl_len = sizeof(sockaddr_dl); destination->sdl_len = sizeof(sockaddr_dl);
destination->sdl_family = AF_DLI; destination->sdl_family = AF_LINK;
destination->sdl_index = 0; destination->sdl_index = 0;
destination->sdl_type = IFT_ETHER; destination->sdl_type = IFT_ETHER;
destination->sdl_e_type = ETHER_TYPE_IP; destination->sdl_e_type = ETHER_TYPE_IP;
@@ -424,7 +424,7 @@ arp_update_local(arp_protocol *protocol)
sockaddr_dl address; sockaddr_dl address;
address.sdl_len = sizeof(sockaddr_dl); address.sdl_len = sizeof(sockaddr_dl);
address.sdl_family = AF_DLI; address.sdl_family = AF_LINK;
address.sdl_type = IFT_ETHER; address.sdl_type = IFT_ETHER;
address.sdl_e_type = ETHER_TYPE_IP; address.sdl_e_type = ETHER_TYPE_IP;
address.sdl_nlen = 0; address.sdl_nlen = 0;
@@ -703,7 +703,7 @@ arp_start_resolve(net_datalink_protocol *protocol, in_addr_t address,
struct sockaddr_dl &source = *(struct sockaddr_dl *) struct sockaddr_dl &source = *(struct sockaddr_dl *)
entry->request_buffer->source; entry->request_buffer->source;
source.sdl_len = sizeof(sockaddr_dl); source.sdl_len = sizeof(sockaddr_dl);
source.sdl_family = AF_DLI; source.sdl_family = AF_LINK;
source.sdl_index = device->index; source.sdl_index = device->index;
source.sdl_type = IFT_ETHER; source.sdl_type = IFT_ETHER;
source.sdl_e_type = ETHER_TYPE_ARP; source.sdl_e_type = ETHER_TYPE_ARP;
@@ -742,7 +742,7 @@ arp_control(const char *subsystem, uint32 function, void *buffer,
sockaddr_dl hardwareAddress; sockaddr_dl hardwareAddress;
hardwareAddress.sdl_len = sizeof(sockaddr_dl); hardwareAddress.sdl_len = sizeof(sockaddr_dl);
hardwareAddress.sdl_family = AF_DLI; hardwareAddress.sdl_family = AF_LINK;
hardwareAddress.sdl_index = 0; hardwareAddress.sdl_index = 0;
hardwareAddress.sdl_type = IFT_ETHER; hardwareAddress.sdl_type = IFT_ETHER;
hardwareAddress.sdl_e_type = ETHER_TYPE_IP; hardwareAddress.sdl_e_type = ETHER_TYPE_IP;
src/add-ons/kernel/network/datalink_protocols/ethernet_frame/ethernet_frame.cpp
+2 -2
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2006, Haiku, Inc. All Rights Reserved. * Copyright 2006-2009, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
@@ -122,7 +122,7 @@ ethernet_frame_send_data(net_datalink_protocol *protocol,
struct sockaddr_dl &source = *(struct sockaddr_dl *)buffer->source; struct sockaddr_dl &source = *(struct sockaddr_dl *)buffer->source;
struct sockaddr_dl &destination = *(struct sockaddr_dl *)buffer->destination; struct sockaddr_dl &destination = *(struct sockaddr_dl *)buffer->destination;
if (source.sdl_family != AF_DLI || source.sdl_type != IFT_ETHER) if (source.sdl_family != AF_LINK || source.sdl_type != IFT_ETHER)
return B_ERROR; return B_ERROR;
NetBufferPrepend<ether_header> bufferHeader(buffer); NetBufferPrepend<ether_header> bufferHeader(buffer);
src/add-ons/kernel/network/devices/ethernet/ethernet.cpp
+7 -7
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2006-2007, Haiku, Inc. All Rights Reserved. * Copyright 2006-2009, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
@@ -384,12 +384,12 @@ ethernet_add_multicast(struct net_device *_device, const sockaddr *_address)
{ {
ethernet_device *device = (ethernet_device *)_device; ethernet_device *device = (ethernet_device *)_device;
if (_address->sa_family != AF_DLI) if (_address->sa_family != AF_LINK)
return EINVAL; return B_BAD_VALUE;
const sockaddr_dl *address = (const sockaddr_dl *)_address; const sockaddr_dl *address = (const sockaddr_dl *)_address;
if (address->sdl_type != IFT_ETHER) if (address->sdl_type != IFT_ETHER)
return EINVAL; return B_BAD_VALUE;
return ioctl(device->fd, ETHER_ADDMULTI, LLADDR(address), 6); return ioctl(device->fd, ETHER_ADDMULTI, LLADDR(address), 6);
} }
@@ -400,12 +400,12 @@ ethernet_remove_multicast(struct net_device *_device, const sockaddr *_address)
{ {
ethernet_device *device = (ethernet_device *)_device; ethernet_device *device = (ethernet_device *)_device;
if (_address->sa_family != AF_DLI) if (_address->sa_family != AF_LINK)
return EINVAL; return B_BAD_VALUE;
const sockaddr_dl *address = (const sockaddr_dl *)_address; const sockaddr_dl *address = (const sockaddr_dl *)_address;
if (address->sdl_type != IFT_ETHER) if (address->sdl_type != IFT_ETHER)
return EINVAL; return B_BAD_VALUE;
return ioctl(device->fd, ETHER_REMMULTI, LLADDR(address), 6); return ioctl(device->fd, ETHER_REMMULTI, LLADDR(address), 6);
} }