diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-11-03 10:09:48 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:05:23 -0500 |
| commit | dde07058075d357cfdc63624c8dcaa67ebd40add (patch) | |
| tree | c3f29090e37f1bc103a3d6051e708d1ebbe305a5 /source4/smbd/process_single.c | |
| parent | 90a8c4acc7e673e6439197776d19cc4b095ac322 (diff) | |
| download | samba-dde07058075d357cfdc63624c8dcaa67ebd40add.tar.gz samba-dde07058075d357cfdc63624c8dcaa67ebd40add.tar.xz samba-dde07058075d357cfdc63624c8dcaa67ebd40add.zip | |
r3507: - added deferred replies on sharing violation in pvfs open. The
deferred reply is short-circuited immediately when the file is
closed by another user, allowing it to be opened by the waiting user.
- added a sane set of timeval manipulation routines
- converted all the events code and code that uses it to use struct
timeval instead of time_t, which allows for microsecond resolution
instead of 1 second resolution. This was needed for doing the pvfs
deferred open code, and is why the patch is so big.
(This used to be commit 0d51511d408d91eb5f68a35e980e0875299b1831)
Diffstat (limited to 'source4/smbd/process_single.c')
| -rw-r--r-- | source4/smbd/process_single.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/smbd/process_single.c b/source4/smbd/process_single.c index 6ce0479b0c6..66074d166d6 100644 --- a/source4/smbd/process_single.c +++ b/source4/smbd/process_single.c @@ -38,7 +38,8 @@ static void single_start_server(void) /* called when a listening socket becomes readable */ -static void single_accept_connection(struct event_context *ev, struct fd_event *srv_fde, time_t t, uint16_t flags) +static void single_accept_connection(struct event_context *ev, struct fd_event *srv_fde, + struct timeval t, uint16_t flags) { NTSTATUS status; struct socket_context *sock; @@ -55,7 +56,7 @@ static void single_accept_connection(struct event_context *ev, struct fd_event * conn = server_setup_connection(ev, server_socket, sock, t, socket_get_fd(sock)); if (!conn) { - DEBUG(0,("server_setup_connection(ev, server_socket, sock, t) failed\n")); + DEBUG(0,("server_setup_connection failed\n")); return; } |