git.samba.org
/
metze
/
samba
/
wip.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "TODO s4:libcli/smb2: don't schedule idle handlers on a dead connection"
[metze/samba/wip.git]
/
source4
/
libcli
/
smb2
/
transport.c
diff --git
a/source4/libcli/smb2/transport.c
b/source4/libcli/smb2/transport.c
index b501b52ce51843e894c96f39cd8d1d61f4e7fd3d..166f34b82569d01702f3f6d5b91405e6d74fd929 100644
(file)
--- a/
source4/libcli/smb2/transport.c
+++ b/
source4/libcli/smb2/transport.c
@@
-456,14
+456,6
@@
static void idle_handler(struct tevent_context *ev,
transport->idle.func(transport, transport->idle.private_data);
transport->idle.func(transport, transport->idle.private_data);
- if (transport->idle.func == NULL) {
- return;
- }
-
- if (!smbXcli_conn_is_connected(transport->conn)) {
- return;
- }
-
next = timeval_current_ofs_usec(transport->idle.period);
transport->idle.te = tevent_add_timer(transport->ev,
transport,
next = timeval_current_ofs_usec(transport->idle.period);
transport->idle.te = tevent_add_timer(transport->ev,
transport,
@@
-482,15
+474,6
@@
void smb2_transport_idle_handler(struct smb2_transport *transport,
void *private_data)
{
TALLOC_FREE(transport->idle.te);
void *private_data)
{
TALLOC_FREE(transport->idle.te);
- ZERO_STRUCT(transport->idle);
-
- if (idle_func == NULL) {
- return;
- }
-
- if (!smbXcli_conn_is_connected(transport->conn)) {
- return;
- }
transport->idle.func = idle_func;
transport->idle.private_data = private_data;
transport->idle.func = idle_func;
transport->idle.private_data = private_data;