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

* Made sure the sockaddr::sa_len field is set correctly for sendto(), and

Browse Source 
connect().
* This fixes not working connections whenever the incoming sa_len field happened
  to be zero.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34669 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-12-15 17:40:14 +00:00
parent d403ff624f
commit f8288ec75c
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/network/stack/net_socket.cpp
+6 -4
View File
@@ -266,17 +266,17 @@ process_ancillary_data(net_socket* socket,
messageHeader->msg_controllen = 0; messageHeader->msg_controllen = 0;
return B_OK; return B_OK;
} }
if (socket->first_info->process_ancillary_data_no_container == NULL) if (socket->first_info->process_ancillary_data_no_container == NULL)
return EOPNOTSUPP; return EOPNOTSUPP;
bytesWritten = socket->first_info->process_ancillary_data_no_container( bytesWritten = socket->first_info->process_ancillary_data_no_container(
socket->first_protocol, buffer, dataBuffer, socket->first_protocol, buffer, dataBuffer,
messageHeader->msg_controllen); messageHeader->msg_controllen);
if (bytesWritten < 0) if (bytesWritten < 0)
return bytesWritten; return bytesWritten;
messageHeader->msg_controllen = bytesWritten; messageHeader->msg_controllen = bytesWritten;
return B_OK; return B_OK;
} }
@@ -975,6 +975,7 @@ socket_bind(net_socket* socket, const struct sockaddr* address,
} }
memcpy(&socket->address, address, sizeof(sockaddr)); memcpy(&socket->address, address, sizeof(sockaddr));
socket->address.ss_len = sizeof(sockaddr_storage);
status_t status = socket->first_info->bind(socket->first_protocol, status_t status = socket->first_info->bind(socket->first_protocol,
(sockaddr*)address); (sockaddr*)address);
@@ -1201,7 +1202,7 @@ socket_receive(net_socket* socket, msghdr* header, void* data, size_t length,
= gNetBufferModule.get_ancillary_data(buffer); = gNetBufferModule.get_ancillary_data(buffer);
if (container != NULL) if (container != NULL)
status = process_ancillary_data(socket, container, header); status = process_ancillary_data(socket, container, header);
else else
status = process_ancillary_data(socket, buffer, header); status = process_ancillary_data(socket, buffer, header);
if (status != B_OK) { if (status != B_OK) {
gNetBufferModule.free(buffer); gNetBufferModule.free(buffer);
@@ -1424,6 +1425,7 @@ socket_send(net_socket* socket, msghdr* header, const void* data, size_t length,
buffer->flags = flags; buffer->flags = flags;
memcpy(buffer->source, &socket->address, socket->address.ss_len); memcpy(buffer->source, &socket->address, socket->address.ss_len);
memcpy(buffer->destination, address, addressLength); memcpy(buffer->destination, address, addressLength);
buffer->destination->sa_len = addressLength;
if (status == B_OK) { if (status == B_OK) {
status = socket->first_info->send_data(socket->first_protocol, status = socket->first_info->send_data(socket->first_protocol,