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

* Removed two superfluous newlines from debug output.

Browse Source 
* Automatic whitespace cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41287 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2011-04-28 18:10:42 +00:00
parent e5937bd21c
commit f505da5e20
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/network/protocols/ipv6/ipv6.cpp
+6 -6
View File
@@ -173,7 +173,7 @@ size_t
MulticastStateHash::HashKey(const KeyType &key) const MulticastStateHash::HashKey(const KeyType &key) const
{ {
size_t result = 0; size_t result = 0;
result = jenkins_hashword((const uint32*)&key.first, result = jenkins_hashword((const uint32*)&key.first,
sizeof(in6_addr) / sizeof(uint32), result); sizeof(in6_addr) / sizeof(uint32), result);
result = jenkins_hashword(&key.second, 1, result); result = jenkins_hashword(&key.second, 1, result);
return result; return result;
@@ -717,7 +717,7 @@ ip6_select_hoplimit(net_protocol* _protocol, net_buffer* buffer)
// 2. (If the outgoing interface is detected) the current // 2. (If the outgoing interface is detected) the current
// hop limit of the interface specified by router advertisement. // hop limit of the interface specified by router advertisement.
// 3. The system default hoplimit. // 3. The system default hoplimit.
ipv6_protocol* protocol = (ipv6_protocol*)_protocol; ipv6_protocol* protocol = (ipv6_protocol*)_protocol;
const bool isMulticast = buffer->flags & MSG_MCAST; const bool isMulticast = buffer->flags & MSG_MCAST;
@@ -790,7 +790,7 @@ ipv6_send_routed_data(net_protocol* _protocol, struct net_route* route,
// write the checksum for ICMPv6 sockets // write the checksum for ICMPv6 sockets
if (protocolNumber == IPPROTO_ICMPV6 if (protocolNumber == IPPROTO_ICMPV6
&& dataLength >= sizeof(struct icmp6_hdr)) { && dataLength >= sizeof(struct icmp6_hdr)) {
NetBufferField<uint16, NetBufferField<uint16,
sizeof(ip6_hdr) + offsetof(icmp6_hdr, icmp6_cksum)> sizeof(ip6_hdr) + offsetof(icmp6_hdr, icmp6_cksum)>
icmpChecksum(buffer); icmpChecksum(buffer);
// first make sure the existing checksum is zero // first make sure the existing checksum is zero
@@ -954,7 +954,7 @@ ipv6_receive_data(net_buffer* buffer)
TRACE(" ipv4_receive_data(): packet was not for us %s -> %s", TRACE(" ipv4_receive_data(): packet was not for us %s -> %s",
ip6_sprintf(&header.Src(), srcbuf), ip6_sprintf(&header.Src(), srcbuf),
ip6_sprintf(&header.Dst(), dstbuf)); ip6_sprintf(&header.Dst(), dstbuf));
// TODO: Send ICMPv6 error: Host unreachable // TODO: Send ICMPv6 error: Host unreachable
return B_ERROR; return B_ERROR;
} }
@@ -1139,7 +1139,7 @@ init_ipv6()
if (status != B_OK) if (status != B_OK)
goto err; goto err;
TRACE("init_ipv6: OK\n"); TRACE("init_ipv6: OK");
return B_OK; return B_OK;
err: err:
@@ -1147,7 +1147,7 @@ err:
mutex_destroy(&sReceivingProtocolLock); mutex_destroy(&sReceivingProtocolLock);
mutex_destroy(&sMulticastGroupsLock); mutex_destroy(&sMulticastGroupsLock);
mutex_destroy(&sRawSocketsLock); mutex_destroy(&sRawSocketsLock);
TRACE("init_ipv6: error %s\n", strerror(status)); TRACE("init_ipv6: error %s", strerror(status));
return status; return status;
} }