hrev53010 adds 2 changesets to branch 'master'
old head: fcf0b31fb90dd203148dab1c74b387f23fd9c95e
new head: 86ec5e3bf494a13141722a39cf8b3c90593842df
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=86ec5e3bf494+%5Efcf0b31fb90d
----------------------------------------------------------------------------
6d5e91f0c962: headers/posix: Make casts in netinet byteswap functions uniform.
86ec5e3bf494: Convert some more endian conversions to Haiku-style.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 8 insertions(+), 8 deletions(-)
headers/posix/netinet/in.h | 4 ++--
.../datalink_protocols/ethernet_frame/ethernet_frame.cpp | 2 +-
src/add-ons/kernel/network/protocols/tcp/tcp.h | 10 +++++-----
############################################################################
Commit: 6d5e91f0c9627942a22ef5d3b49a6370c7a41d92
URL: https://git.haiku-os.org/haiku/commit/?id=6d5e91f0c962
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Wed Mar 27 02:30:23 2019 UTC
headers/posix: Make casts in netinet byteswap functions uniform.
----------------------------------------------------------------------------
diff --git a/headers/posix/netinet/in.h b/headers/posix/netinet/in.h
index 786b978569..8ad0513fc7 100644
--- a/headers/posix/netinet/in.h
+++ b/headers/posix/netinet/in.h
@@ -26,8 +26,8 @@ typedef uint32_t in_addr_t;
* and we are not allowed to import all the BeOS types here. */
#if !defined(__swap_int32)
# if __GNUC__ >= 4
-# define __swap_int32(arg) (uint32)__builtin_bswap32(arg)
-# define __swap_int16(arg) (uint16)__builtin_bswap16(arg)
+# define __swap_int32(arg) (uint32_t)__builtin_bswap32(arg)
+# define __swap_int16(arg) (uint16_t)__builtin_bswap16(arg)
# else
extern unsigned long __swap_int32(unsigned long); /* private */
extern uint16_t __swap_int16(uint16_t); /* private */
############################################################################
Revision: hrev53010
Commit: 86ec5e3bf494a13141722a39cf8b3c90593842df
URL: https://git.haiku-os.org/haiku/commit/?id=86ec5e3bf494
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Wed Mar 27 02:34:20 2019 UTC
Convert some more endian conversions to Haiku-style.
----------------------------------------------------------------------------
diff --git
a/src/add-ons/kernel/network/datalink_protocols/ethernet_frame/ethernet_frame.cpp
b/src/add-ons/kernel/network/datalink_protocols/ethernet_frame/ethernet_frame.cpp
index a46b35da39..30db041904 100644
---
a/src/add-ons/kernel/network/datalink_protocols/ethernet_frame/ethernet_frame.cpp
+++
b/src/add-ons/kernel/network/datalink_protocols/ethernet_frame/ethernet_frame.cpp
@@ -43,7 +43,7 @@ ethernet_deframe(net_device* device, net_buffer* buffer)
return bufferHeader.Status();
ether_header& header = bufferHeader.Data();
- uint16 type = ntohs(header.type);
+ uint16 type = B_BENDIAN_TO_HOST_INT16(header.type);
struct sockaddr_dl& source = *(struct sockaddr_dl*)buffer->source;
struct sockaddr_dl& destination = *(struct
sockaddr_dl*)buffer->destination;
diff --git a/src/add-ons/kernel/network/protocols/tcp/tcp.h
b/src/add-ons/kernel/network/protocols/tcp/tcp.h
index 24890a32aa..8ffccccc6d 100644
--- a/src/add-ons/kernel/network/protocols/tcp/tcp.h
+++ b/src/add-ons/kernel/network/protocols/tcp/tcp.h
@@ -62,11 +62,11 @@ struct tcp_header {
uint16 urgent_offset;
uint32 HeaderLength() const { return (uint32)header_length << 2; }
- uint32 Sequence() const { return ntohl(sequence); }
- uint32 Acknowledge() const { return ntohl(acknowledge); }
- uint16 AdvertisedWindow() const { return ntohs(advertised_window); }
- uint16 Checksum() const { return ntohs(checksum); }
- uint16 UrgentOffset() const { return ntohs(urgent_offset); }
+ uint32 Sequence() const { return B_BENDIAN_TO_HOST_INT32(sequence); }
+ uint32 Acknowledge() const { return
B_BENDIAN_TO_HOST_INT32(acknowledge); }
+ uint16 AdvertisedWindow() const { return
B_BENDIAN_TO_HOST_INT16(advertised_window); }
+ uint16 Checksum() const { return B_BENDIAN_TO_HOST_INT16(checksum); }
+ uint16 UrgentOffset() const { return
B_BENDIAN_TO_HOST_INT16(urgent_offset); }
} _PACKED;
class tcp_sequence {
