* Renamed THREAD_FLAGS_IOCTL_SYSCALL to THREAD_FLAGS_SYSCALL,
syscall_restart_ioctl_is_restarted() to syscall_restart_is_restarted, IoctlSyscallFlagUnsetter to SyscallFlagUnsetter, and IoctlSyscallRestartWrapper to SyscallRestartWrapper, as they are no longer only used for ioctl(). * Removed unused syscall_restart_ioctl_handle_post(). * Made SyscallRestartWrapper a lot fancier. Instead of storing a reference to the result value, it stores the value itself, and it features all the interesting operators that make it appear like that value. This simplifies the use of the class quite a bit. * THREAD_FLAGS_SYSCALL is now set for all socket function and the read[v](), write[v]() syscalls. * Added is_syscall() function and net_stack hook to the net stack. * Removed "kernel" parameter from all net_stack_interface and net_socket module hooks. They aren't need any longer, since is_syscall() can be used instead. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24914 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
|
||||
|
||||
/*
|
||||
* Copyright 2008, Ingo Weinhold, [email protected].
|
||||
* Distributed under the terms of the MIT License.
|
||||
*/
|
||||
|
||||
#include "stack_private.h"
|
||||
|
||||
@@ -31,9 +33,8 @@ stack_interface_free(net_socket* socket)
|
||||
|
||||
static status_t
|
||||
stack_interface_bind(net_socket* socket, const struct sockaddr* address,
|
||||
socklen_t addressLength, bool kernel)
|
||||
socklen_t addressLength)
|
||||
{
|
||||
// TODO: Pass kernel flag!
|
||||
return gNetSocketModule.bind(socket, address, addressLength);
|
||||
}
|
||||
|
||||
@@ -47,9 +48,8 @@ stack_interface_shutdown(net_socket* socket, int how)
|
||||
|
||||
static status_t
|
||||
stack_interface_connect(net_socket* socket, const struct sockaddr* address,
|
||||
socklen_t addressLength, bool kernel)
|
||||
socklen_t addressLength)
|
||||
{
|
||||
// TODO: Pass kernel flag!
|
||||
return gNetSocketModule.connect(socket, address, addressLength);
|
||||
}
|
||||
|
||||
@@ -71,17 +71,15 @@ stack_interface_accept(net_socket* socket, struct sockaddr* address,
|
||||
|
||||
|
||||
static ssize_t
|
||||
stack_interface_recv(net_socket* socket, void* data, size_t length, int flags,
|
||||
bool kernel)
|
||||
stack_interface_recv(net_socket* socket, void* data, size_t length, int flags)
|
||||
{
|
||||
// TODO: Pass kernel flag!
|
||||
return gNetSocketModule.receive(socket, NULL, data, length, flags);
|
||||
}
|
||||
|
||||
|
||||
static ssize_t
|
||||
stack_interface_recvfrom(net_socket* socket, void* data, size_t length,
|
||||
int flags, struct sockaddr* address, socklen_t* _addressLength, bool kernel)
|
||||
int flags, struct sockaddr* address, socklen_t* _addressLength)
|
||||
{
|
||||
msghdr message;
|
||||
iovec vecs[1] = { { data, length } };
|
||||
@@ -93,7 +91,6 @@ stack_interface_recvfrom(net_socket* socket, void* data, size_t length,
|
||||
message.msg_controllen = 0;
|
||||
message.msg_flags = 0;
|
||||
|
||||
// TODO: Pass kernel flag!
|
||||
status_t error = gNetSocketModule.receive(socket, &message, data, length,
|
||||
flags);
|
||||
if (error != B_OK)
|
||||
@@ -105,8 +102,7 @@ stack_interface_recvfrom(net_socket* socket, void* data, size_t length,
|
||||
|
||||
|
||||
static ssize_t
|
||||
stack_interface_recvmsg(net_socket* socket, struct msghdr* message, int flags,
|
||||
bool kernel)
|
||||
stack_interface_recvmsg(net_socket* socket, struct msghdr* message, int flags)
|
||||
{
|
||||
void* buffer = NULL;
|
||||
size_t len = 0;
|
||||
@@ -115,24 +111,21 @@ stack_interface_recvmsg(net_socket* socket, struct msghdr* message, int flags,
|
||||
len = message->msg_iov[0].iov_len;
|
||||
}
|
||||
|
||||
// TODO: Pass kernel flag!
|
||||
return gNetSocketModule.receive(socket, message, buffer, len, flags);
|
||||
}
|
||||
|
||||
|
||||
static ssize_t
|
||||
stack_interface_send(net_socket* socket, const void* data, size_t length,
|
||||
int flags, bool kernel)
|
||||
int flags)
|
||||
{
|
||||
// TODO: Pass kernel flag!
|
||||
return gNetSocketModule.send(socket, NULL, data, length, flags);
|
||||
}
|
||||
|
||||
|
||||
static ssize_t
|
||||
stack_interface_sendto(net_socket* socket, const void* data, size_t length,
|
||||
int flags, const struct sockaddr* address, socklen_t addressLength,
|
||||
bool kernel)
|
||||
int flags, const struct sockaddr* address, socklen_t addressLength)
|
||||
{
|
||||
msghdr message;
|
||||
iovec vecs[1] = { { (void*)data, length } };
|
||||
@@ -144,14 +137,13 @@ stack_interface_sendto(net_socket* socket, const void* data, size_t length,
|
||||
message.msg_controllen = 0;
|
||||
message.msg_flags = 0;
|
||||
|
||||
// TODO: Pass kernel flag!
|
||||
return gNetSocketModule.send(socket, &message, data, length, flags);
|
||||
}
|
||||
|
||||
|
||||
static ssize_t
|
||||
stack_interface_sendmsg(net_socket* socket, const struct msghdr* message,
|
||||
int flags, bool kernel)
|
||||
int flags)
|
||||
{
|
||||
void* buffer = NULL;
|
||||
size_t len = 0;
|
||||
@@ -160,7 +152,6 @@ stack_interface_sendmsg(net_socket* socket, const struct msghdr* message,
|
||||
len = message->msg_iov[0].iov_len;
|
||||
}
|
||||
|
||||
// TODO: Pass kernel flag!
|
||||
return gNetSocketModule.send(socket, (msghdr*)message, buffer, len, flags);
|
||||
}
|
||||
|
||||
@@ -219,9 +210,9 @@ stack_interface_socketpair(int family, int type, int protocol,
|
||||
|
||||
static status_t
|
||||
stack_interface_ioctl(net_socket* socket, uint32 op, void *buffer,
|
||||
size_t length, bool kernel)
|
||||
size_t length)
|
||||
{
|
||||
return gNetSocketModule.control(socket, op, buffer, length, kernel);
|
||||
return gNetSocketModule.control(socket, op, buffer, length);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user