[haiku-commits] r34487 - in haiku/trunk/src/add-ons/kernel/network: datalink_protocols/arp datalink_protocols/ethernet_frame devices/ethernet
- From: axeld@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 4 Dec 2009 10:34:35 +0100 (CET)
Author: axeld
Date: 2009-12-04 10:34:35 +0100 (Fri, 04 Dec 2009)
New Revision: 34487
Changeset: http://dev.haiku-os.org/changeset/34487/haiku
Modified:
haiku/trunk/src/add-ons/kernel/network/datalink_protocols/arp/arp.cpp
haiku/trunk/src/add-ons/kernel/network/datalink_protocols/ethernet_frame/ethernet_frame.cpp
haiku/trunk/src/add-ons/kernel/network/devices/ethernet/ethernet.cpp
Log:
* Replaced the remaining AF_DLI references with AF_LINK.
Modified: haiku/trunk/src/add-ons/kernel/network/datalink_protocols/arp/arp.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/datalink_protocols/arp/arp.cpp
2009-12-04 07:41:35 UTC (rev 34486)
+++ haiku/trunk/src/add-ons/kernel/network/datalink_protocols/arp/arp.cpp
2009-12-04 09:34:35 UTC (rev 34487)
@@ -327,7 +327,7 @@
// 01-00-5E-00-00-00 (hex).''
destination->sdl_len = sizeof(sockaddr_dl);
- destination->sdl_family = AF_DLI;
+ destination->sdl_family = AF_LINK;
destination->sdl_index = 0;
destination->sdl_type = IFT_ETHER;
destination->sdl_e_type = ETHER_TYPE_IP;
@@ -424,7 +424,7 @@
sockaddr_dl address;
address.sdl_len = sizeof(sockaddr_dl);
- address.sdl_family = AF_DLI;
+ address.sdl_family = AF_LINK;
address.sdl_type = IFT_ETHER;
address.sdl_e_type = ETHER_TYPE_IP;
address.sdl_nlen = 0;
@@ -703,7 +703,7 @@
struct sockaddr_dl &source = *(struct sockaddr_dl *)
entry->request_buffer->source;
source.sdl_len = sizeof(sockaddr_dl);
- source.sdl_family = AF_DLI;
+ source.sdl_family = AF_LINK;
source.sdl_index = device->index;
source.sdl_type = IFT_ETHER;
source.sdl_e_type = ETHER_TYPE_ARP;
@@ -742,7 +742,7 @@
sockaddr_dl hardwareAddress;
hardwareAddress.sdl_len = sizeof(sockaddr_dl);
- hardwareAddress.sdl_family = AF_DLI;
+ hardwareAddress.sdl_family = AF_LINK;
hardwareAddress.sdl_index = 0;
hardwareAddress.sdl_type = IFT_ETHER;
hardwareAddress.sdl_e_type = ETHER_TYPE_IP;
Modified:
haiku/trunk/src/add-ons/kernel/network/datalink_protocols/ethernet_frame/ethernet_frame.cpp
===================================================================
---
haiku/trunk/src/add-ons/kernel/network/datalink_protocols/ethernet_frame/ethernet_frame.cpp
2009-12-04 07:41:35 UTC (rev 34486)
+++
haiku/trunk/src/add-ons/kernel/network/datalink_protocols/ethernet_frame/ethernet_frame.cpp
2009-12-04 09:34:35 UTC (rev 34487)
@@ -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.
*
* Authors:
@@ -122,7 +122,7 @@
struct sockaddr_dl &source = *(struct sockaddr_dl *)buffer->source;
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;
NetBufferPrepend<ether_header> bufferHeader(buffer);
Modified: haiku/trunk/src/add-ons/kernel/network/devices/ethernet/ethernet.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/devices/ethernet/ethernet.cpp
2009-12-04 07:41:35 UTC (rev 34486)
+++ haiku/trunk/src/add-ons/kernel/network/devices/ethernet/ethernet.cpp
2009-12-04 09:34:35 UTC (rev 34487)
@@ -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.
*
* Authors:
@@ -384,12 +384,12 @@
{
ethernet_device *device = (ethernet_device *)_device;
- if (_address->sa_family != AF_DLI)
- return EINVAL;
+ if (_address->sa_family != AF_LINK)
+ return B_BAD_VALUE;
const sockaddr_dl *address = (const sockaddr_dl *)_address;
if (address->sdl_type != IFT_ETHER)
- return EINVAL;
+ return B_BAD_VALUE;
return ioctl(device->fd, ETHER_ADDMULTI, LLADDR(address), 6);
}
@@ -400,12 +400,12 @@
{
ethernet_device *device = (ethernet_device *)_device;
- if (_address->sa_family != AF_DLI)
- return EINVAL;
+ if (_address->sa_family != AF_LINK)
+ return B_BAD_VALUE;
const sockaddr_dl *address = (const sockaddr_dl *)_address;
if (address->sdl_type != IFT_ETHER)
- return EINVAL;
+ return B_BAD_VALUE;
return ioctl(device->fd, ETHER_REMMULTI, LLADDR(address), 6);
}
Other related posts:
- » [haiku-commits] r34487 - in haiku/trunk/src/add-ons/kernel/network: datalink_protocols/arp datalink_protocols/ethernet_frame devices/ethernet - axeld
