diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-02-03 11:25:52 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:09:30 -0500 |
| commit | 0798d54b4fc28be881e2c4012663b1461bc85ba7 (patch) | |
| tree | 532a93a578fd021c827bbb6bf5c65525b77671b7 /source4/smb_server/smb_server.c | |
| parent | 6e0a56f73b7f75e45d97a574cf6fd1fc4f4bff9b (diff) | |
| download | samba-0798d54b4fc28be881e2c4012663b1461bc85ba7.tar.gz samba-0798d54b4fc28be881e2c4012663b1461bc85ba7.tar.bz2 samba-0798d54b4fc28be881e2c4012663b1461bc85ba7.zip | |
r5195: most events don't need the time of the event, so save a gettimeofday() call
and just use timeval_current() when its actually needed
(This used to be commit 236403cc4dc2924ed6a898acae0bb44cc1688dcc)
Diffstat (limited to 'source4/smb_server/smb_server.c')
| -rw-r--r-- | source4/smb_server/smb_server.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index f1f73014f1..3946e9ab13 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -67,7 +67,7 @@ static void construct_reply(struct smbsrv_request *req); receive a SMB request header from the wire, forming a request_context from the result ****************************************************************************/ -static NTSTATUS receive_smb_request(struct smbsrv_connection *smb_conn, struct timeval t) +static NTSTATUS receive_smb_request(struct smbsrv_connection *smb_conn) { NTSTATUS status; ssize_t len; @@ -140,7 +140,7 @@ static NTSTATUS receive_smb_request(struct smbsrv_connection *smb_conn, struct t } /* we have a full packet */ - req->request_time = t; + req->request_time = timeval_current(); req->chained_fnum = -1; req->in.allocated = req->in.size; req->in.hdr = req->in.buffer + NBT_HDR_SIZE; @@ -653,14 +653,14 @@ void smbsrv_terminate_connection(struct smbsrv_connection *smb_conn, const char /* called when a SMB socket becomes readable */ -static void smbsrv_recv(struct stream_connection *conn, struct timeval t, uint16_t flags) +static void smbsrv_recv(struct stream_connection *conn, uint16_t flags) { struct smbsrv_connection *smb_conn = talloc_get_type(conn->private, struct smbsrv_connection); NTSTATUS status; DEBUG(10,("smbsrv_recv\n")); - status = receive_smb_request(smb_conn, t); + status = receive_smb_request(smb_conn); if (NT_STATUS_IS_ERR(status)) { talloc_free(conn->event.fde); conn->event.fde = NULL; @@ -675,7 +675,7 @@ static void smbsrv_recv(struct stream_connection *conn, struct timeval t, uint16 /* called when a SMB socket becomes writable */ -static void smbsrv_send(struct stream_connection *conn, struct timeval t, uint16_t flags) +static void smbsrv_send(struct stream_connection *conn, uint16_t flags) { struct smbsrv_connection *smb_conn = talloc_get_type(conn->private, struct smbsrv_connection); |