[haiku-commits] r37866 - haiku/trunk/headers/private/net
- From: axeld@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 3 Aug 2010 13:18:52 +0200 (CEST)
Author: axeld
Date: 2010-08-03 13:18:52 +0200 (Tue, 03 Aug 2010)
New Revision: 37866
Changeset: http://dev.haiku-os.org/changeset/37866
Modified:
haiku/trunk/headers/private/net/NetUtilities.h
Log:
* Cleanup, no functional change.
Modified: haiku/trunk/headers/private/net/NetUtilities.h
===================================================================
--- haiku/trunk/headers/private/net/NetUtilities.h 2010-08-03 11:15:05 UTC
(rev 37865)
+++ haiku/trunk/headers/private/net/NetUtilities.h 2010-08-03 11:18:52 UTC
(rev 37866)
@@ -1,91 +1,90 @@
/*
- * Copyright 2006, Haiku, Inc. All Rights Reserved.
+ * Copyright 2006-2010, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef NET_UTILITIES_H
#define NET_UTILITIES_H
+#include <netinet/in.h>
+#include <stdlib.h>
+
#include <net_buffer.h>
#include <net_datalink.h>
-#include <netinet/in.h> // for htons
-#include <stdlib.h>
-
class Checksum {
- public:
- struct BufferHelper {
- BufferHelper(net_buffer *_buffer,
net_buffer_module_info *_bufferModule)
- : buffer(_buffer),
- bufferModule(_bufferModule)
- {
- }
- net_buffer *buffer;
- net_buffer_module_info *bufferModule;
- };
+public:
+ struct BufferHelper {
+ BufferHelper(net_buffer* _buffer, net_buffer_module_info*
_bufferModule)
+ :
+ buffer(_buffer),
+ bufferModule(_bufferModule)
+ {
+ }
+
+ net_buffer* buffer;
+ net_buffer_module_info* bufferModule;
+ };
- Checksum();
-
- Checksum& operator<<(uint8 val);
- Checksum& operator<<(uint16 val);
- Checksum& operator<<(uint32 val);
- Checksum& operator<<(const BufferHelper &bufferHelper);
-
- operator uint16();
+ Checksum()
+ :
+ fSum(0)
+ {
+ }
- static uint16 PseudoHeader(net_address_module_info
*addressModule,
- net_buffer_module_info *bufferModule, net_buffer
*buffer,
- uint16 protocol);
-
- private:
- uint32 fSum;
-};
-
-inline Checksum::Checksum()
- : fSum(0)
-{
-}
-
-inline Checksum& Checksum::operator<<(uint8 _val) {
+ inline Checksum& operator<<(uint8 value)
+ {
#if B_HOST_IS_LENDIAN
- fSum += _val;
+ fSum += value;
#else
- uint16 val = _val;
- fSum += val << 8;
+ fSum += (uint16)value << 8;
#endif
- return *this;
-}
+ return *this;
+ }
-inline Checksum& Checksum::operator<<(uint16 val) {
- fSum += val;
- return *this;
-}
+ inline Checksum& operator<<(uint16 value)
+ {
+ fSum += value;
+ return *this;
+ }
-inline Checksum& Checksum::operator<<(uint32 val) {
- fSum += (val & 0xFFFF) + (val >> 16);
- return *this;
-}
+ inline Checksum& operator<<(uint32 value)
+ {
+ fSum += (value & 0xffff) + (value >> 16);
+ return *this;
+ }
-inline Checksum& Checksum::operator<<(const BufferHelper &bufferHelper) {
- net_buffer *buffer = bufferHelper.buffer;
- fSum += bufferHelper.bufferModule->checksum(buffer, 0, buffer->size,
false);
- return *this;
-}
+ inline Checksum& operator<<(const BufferHelper& bufferHelper)
+ {
+ net_buffer* buffer = bufferHelper.buffer;
+ fSum += bufferHelper.bufferModule->checksum(buffer, 0,
buffer->size,
+ false);
+ return *this;
+ }
-inline Checksum::operator uint16() {
- while (fSum >> 16) {
- fSum = (fSum & 0xffff) + (fSum >> 16);
+ inline operator uint16()
+ {
+ while (fSum >> 16) {
+ fSum = (fSum & 0xffff) + (fSum >> 16);
+ }
+ uint16 result = (uint16)fSum;
+ result ^= 0xFFFF;
+ return result;
}
- uint16 result = (uint16)fSum;
- result ^= 0xFFFF;
- return result;
-}
+ static uint16 PseudoHeader(net_address_module_info* addressModule,
+ net_buffer_module_info* bufferModule, net_buffer* buffer,
+ uint16 protocol);
+private:
+ uint32 fSum;
+};
+
+
inline uint16
-Checksum::PseudoHeader(net_address_module_info *addressModule,
- net_buffer_module_info *bufferModule, net_buffer *buffer, uint16
protocol)
+Checksum::PseudoHeader(net_address_module_info* addressModule,
+ net_buffer_module_info* bufferModule, net_buffer* buffer, uint16
protocol)
{
Checksum checksum;
addressModule->checksum_address(&checksum, buffer->source);
@@ -96,44 +95,48 @@
}
-// helper class that prints an address (and optionally a port) into a buffer
that
-// is automatically freed at end of scope:
+/*! Helper class that prints an address (and optionally a port) into a
buffer
+ that is automatically freed at end of scope.
+*/
class AddressString {
public:
- AddressString(net_domain *domain, const sockaddr *address,
+ AddressString(net_domain* domain, const sockaddr* address,
bool printPort = false)
- : fBuffer(NULL)
+ :
+ fBuffer(NULL)
{
domain->address_module->print_address(address, &fBuffer,
printPort);
}
- AddressString(net_domain *domain, const sockaddr &address,
+ AddressString(net_domain* domain, const sockaddr& address,
bool printPort = false)
- : fBuffer(NULL)
+ :
+ fBuffer(NULL)
{
domain->address_module->print_address(&address, &fBuffer,
printPort);
}
- AddressString(net_address_module_info *address_module,
- const sockaddr *address, bool printPort = false)
- : fBuffer(NULL)
+ AddressString(net_address_module_info* address_module,
+ const sockaddr* address, bool printPort = false)
+ :
+ fBuffer(NULL)
{
address_module->print_address(address, &fBuffer, printPort);
}
~AddressString()
{
- if (fBuffer)
- free(fBuffer);
+ free(fBuffer);
}
- const char *Data() const
+ const char* Data() const
{
return fBuffer;
}
private:
- char *fBuffer;
+ char* fBuffer;
};
+
#endif // NET_UTILITIES_H
Other related posts:
- » [haiku-commits] r37866 - haiku/trunk/headers/private/net - axeld
