* net_protocol::bind() needs to set the socket's address. This now gives
the correct sender MAC address in outgoing link level packets. * SocketStatus() now also works correctly for bound protocols, ie. receiving data from a bound link level socket is now working as well. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39722 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -166,7 +166,7 @@ LinkProtocol::Bind(const sockaddr* address)
|
||||
sockaddr_dl& linkAddress = *(sockaddr_dl*)address;
|
||||
|
||||
if (linkAddress.sdl_type != 0) {
|
||||
fBoundType = B_NET_FRAME_TYPE(linkAddress.sdl_type,
|
||||
fBoundType = B_NET_FRAME_TYPE(linkAddress.sdl_type,
|
||||
linkAddress.sdl_e_type);
|
||||
// Bind to the type requested - this is needed in order to
|
||||
// receive any buffers
|
||||
@@ -182,6 +182,9 @@ LinkProtocol::Bind(const sockaddr* address)
|
||||
fBoundToDevice = boundTo;
|
||||
socket->bound_to_device = boundTo->device->index;
|
||||
|
||||
memcpy(&socket->address, address, sizeof(struct sockaddr_storage));
|
||||
socket->address.ss_len = sizeof(struct sockaddr_storage);
|
||||
|
||||
return B_OK;
|
||||
}
|
||||
|
||||
@@ -198,6 +201,7 @@ LinkProtocol::Unbind()
|
||||
put_device_interface(fBoundToDevice);
|
||||
|
||||
socket->bound_to_device = 0;
|
||||
socket->address.ss_len = 0;
|
||||
return B_OK;
|
||||
}
|
||||
|
||||
@@ -217,7 +221,7 @@ LinkProtocol::MTU()
|
||||
status_t
|
||||
LinkProtocol::SocketStatus(bool peek) const
|
||||
{
|
||||
if (fMonitoredDevice == NULL)
|
||||
if (fMonitoredDevice == NULL && !IsBound())
|
||||
return B_DEVICE_NOT_FOUND;
|
||||
|
||||
return LocalDatagramSocket::SocketStatus(peek);
|
||||
@@ -290,7 +294,7 @@ user_request_get_device_interface(void* value, struct ifreq& request,
|
||||
// #pragma mark - net_protocol module
|
||||
|
||||
|
||||
static net_protocol*
|
||||
static net_protocol*
|
||||
link_init_protocol(net_socket* socket)
|
||||
{
|
||||
LinkProtocol* protocol = new (std::nothrow) LinkProtocol(socket);
|
||||
@@ -580,7 +584,7 @@ link_read_avail(net_protocol* protocol)
|
||||
}
|
||||
|
||||
|
||||
static struct net_domain*
|
||||
static struct net_domain*
|
||||
link_get_domain(net_protocol* protocol)
|
||||
{
|
||||
return sDomain;
|
||||
|
||||
Reference in New Issue
Block a user