summaryrefslogtreecommitdiff
path: root/source4/smbd
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-02-03 11:25:52 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:09:30 -0500
commit0798d54b4fc28be881e2c4012663b1461bc85ba7 (patch)
tree532a93a578fd021c827bbb6bf5c65525b77671b7 /source4/smbd
parent6e0a56f73b7f75e45d97a574cf6fd1fc4f4bff9b (diff)
downloadsamba-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/smbd')
-rw-r--r--source4/smbd/service_stream.c8
-rw-r--r--source4/smbd/service_stream.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/source4/smbd/service_stream.c b/source4/smbd/service_stream.c
index 00fd9c470a..767f2052c3 100644
--- a/source4/smbd/service_stream.c
+++ b/source4/smbd/service_stream.c
@@ -61,17 +61,17 @@ void stream_terminate_connection(struct stream_connection *srv_conn, const char
the select loop has indicated that a stream is ready for IO
*/
static void stream_io_handler(struct event_context *ev, struct fd_event *fde,
- struct timeval t, uint16_t flags, void *private)
+ uint16_t flags, void *private)
{
struct stream_connection *conn = talloc_get_type(private,
struct stream_connection);
if (flags & EVENT_FD_WRITE) {
- conn->ops->send_handler(conn, t, flags);
+ conn->ops->send_handler(conn, flags);
return;
}
if (flags & EVENT_FD_READ) {
- conn->ops->recv_handler(conn, t, flags);
+ conn->ops->recv_handler(conn, flags);
}
}
@@ -126,7 +126,7 @@ static void stream_new_connection(struct event_context *ev,
called when someone opens a connection to one of our listening ports
*/
static void stream_accept_handler(struct event_context *ev, struct fd_event *fde,
- struct timeval t, uint16_t flags, void *private)
+ uint16_t flags, void *private)
{
struct stream_socket *stream_socket = talloc_get_type(private, struct stream_socket);
diff --git a/source4/smbd/service_stream.h b/source4/smbd/service_stream.h
index b9d4d4cc77..3ae7107419 100644
--- a/source4/smbd/service_stream.h
+++ b/source4/smbd/service_stream.h
@@ -52,6 +52,6 @@ struct stream_server_ops {
/* the name of the server_service */
const char *name;
void (*accept_connection)(struct stream_connection *);
- void (*recv_handler)(struct stream_connection *, struct timeval, uint16_t);
- void (*send_handler)(struct stream_connection *, struct timeval, uint16_t);
+ void (*recv_handler)(struct stream_connection *, uint16_t);
+ void (*send_handler)(struct stream_connection *, uint16_t);
};