[haiku-commits] r39928 - haiku/trunk/src/system/kernel/fs
- From: marcusoverhagen@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 24 Dec 2010 01:32:19 +0100 (CET)
Author: marcusoverhagen
Date: 2010-12-24 01:32:19 +0100 (Fri, 24 Dec 2010)
New Revision: 39928
Changeset: http://dev.haiku-os.org/changeset/39928
Modified:
haiku/trunk/src/system/kernel/fs/vfs_net_boot.cpp
Log:
The IN_CLASS* macros use host byte order.
This fixes netmask and broadcast ip for PXE booting.
Modified: haiku/trunk/src/system/kernel/fs/vfs_net_boot.cpp
===================================================================
--- haiku/trunk/src/system/kernel/fs/vfs_net_boot.cpp 2010-12-23 22:54:50 UTC
(rev 39927)
+++ haiku/trunk/src/system/kernel/fs/vfs_net_boot.cpp 2010-12-24 00:32:19 UTC
(rev 39928)
@@ -329,17 +329,16 @@
if (fBootVolume.FindInt32("net mask", (int32*)&netMask) != B_OK) {
// choose default netmask depending on the class of the address
- in_addr_t net = htonl(clientIP);
- if (IN_CLASSA(net)
- || (ntohl(net) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET) {
+ if (IN_CLASSA(clientIP)
+ || (clientIP >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET) {
// class A, or loopback
- netMask = ntohl(IN_CLASSA_NET);
- } else if (IN_CLASSB(net)) {
+ netMask = IN_CLASSA_NET;
+ } else if (IN_CLASSB(clientIP)) {
// class B
- netMask = ntohl(IN_CLASSB_NET);
+ netMask = IN_CLASSB_NET;
} else {
// class C and rest
- netMask = ntohl(IN_CLASSC_NET);
+ netMask = IN_CLASSC_NET;
}
}
Other related posts:
- » [haiku-commits] r39928 - haiku/trunk/src/system/kernel/fs - marcusoverhagen
