diff options
author | Andrew Tridgell <tridge@samba.org> | 2004-10-27 03:15:42 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:04:49 -0500 |
commit | 9d055846f225bea4953822f40fab1d2f1a2e2d07 (patch) | |
tree | 9a513f3eeb7223a96e1df1d65060b095002e534e /source4/ntvfs | |
parent | 5ae448116165a6bb9d792686db825b8b47f27201 (diff) | |
download | samba-9d055846f225bea4953822f40fab1d2f1a2e2d07.tar.gz samba-9d055846f225bea4953822f40fab1d2f1a2e2d07.tar.bz2 samba-9d055846f225bea4953822f40fab1d2f1a2e2d07.zip |
r3278: - rewrote the client side rpc connection code to use lib/socket/
rather than doing everything itself. This greatly simplifies the
code, although I really don't like the socket_recv() interface (it
always allocates memory for you, which means an extra memcpy in this
code)
- fixed several bugs in the socket_ipv4.c code, in particular client
side code used a non-blocking connect but didn't handle EINPROGRESS,
so it had no chance of working. Also fixed the error codes, using
map_nt_error_from_unix()
- cleaned up and expanded map_nt_error_from_unix()
- changed interpret_addr2() to not take a mem_ctx. It makes absolutely
no sense to allocate a fixed size 4 byte structure like this. Dozens
of places in the code were also using interpret_addr2() incorrectly
(precisely because the allocation made no sense)
(This used to be commit 7f2c771b0e0e98c5c9e5cf662592d64d34ff1205)
Diffstat (limited to 'source4/ntvfs')
-rw-r--r-- | source4/ntvfs/posix/pvfs_wait.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/ntvfs/posix/pvfs_wait.c b/source4/ntvfs/posix/pvfs_wait.c index 2a4a1d286b..071ecbce15 100644 --- a/source4/ntvfs/posix/pvfs_wait.c +++ b/source4/ntvfs/posix/pvfs_wait.c @@ -29,7 +29,7 @@ struct pvfs_wait { void *private; struct timed_event *te; int msg_type; - void *msg_ctx; + struct messaging_context *msg_ctx; struct event_context *ev; struct smbsrv_request *req; BOOL timed_out; @@ -51,7 +51,7 @@ NTSTATUS pvfs_async_setup(struct ntvfs_module_context *ntvfs, /* receive a completion message for a wait */ -static void pvfs_wait_dispatch(void *msg_ctx, void *private, uint32_t msg_type, +static void pvfs_wait_dispatch(struct messaging_context *msg, void *private, uint32_t msg_type, servid_t src, DATA_BLOB *data) { struct pvfs_wait *pwait = private; |