Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* The driver did not handle any non-networking opcodes - including B_SET_NONBLOCKING_IO

Browse Source 
and friends; the correct behaviour is to not let those opcodes go deeper in the stack
  (ie. when calling control() on the socket).
* Fixed compilation with debugging output turned on.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19410 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2006-12-01 12:54:54 +00:00
parent 379cdb69ee
commit d081f61f0c
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/add-ons/kernel/drivers/network/stack/kernel_stack.cpp
View File

@ -238,15 +238,10 @@ static status_t
net_stack_control(void *_cookie, uint32 op, void *data, size_t length)
{
net_stack_cookie *cookie = (net_stack_cookie *)_cookie;
status_t status = B_BAD_VALUE;
status_t status;
TRACE("net_stack_control(%p, %s (0x%lX), %p, %ld)\n",
_cookie, opcode_name(op), op, data, len);
if (op < NET_STACK_IOCTL_BASE || op > NET_STACK_IOCTL_END) {
// we only accept networking ioctl()s to get into our stack
return B_BAD_VALUE;
}
_cookie, opcode_name(op), op, data, length);
if (cookie->socket == NULL) {
switch (op) {
@ -266,6 +261,9 @@ net_stack_control(void *_cookie, uint32 op, void *data, size_t length)
// in NET_STACK_ACCEPT opcode the cookie (aka the net_stack_cookie!)
// of the file descriptor to use for the new accepted socket
return user_memcpy(data, cookie, sizeof(void *));
default:
return B_BAD_VALUE;
}
} else {
switch (op) {
@ -456,11 +454,16 @@ net_stack_control(void *_cookie, uint32 op, void *data, size_t length)
}
default:
if (op < NET_STACK_IOCTL_BASE || op > NET_STACK_IOCTL_END) {
// we only accept networking ioctl()s to get into our stack
return B_BAD_VALUE;
}
return sSocket->control(cookie->socket, op, data, length);
}
}
return status;
return B_BAD_VALUE;
}