summaryrefslogtreecommitdiff
path: root/source4/ntvfs
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-01-15 10:38:12 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:08:50 -0500
commite89fd49df7e63dcf37ee1aa7e2f50965851725c9 (patch)
tree8484d3930707d1e8f97496f5b58ca3c1a8291dba /source4/ntvfs
parentd327eb01bdc5ae196ece3707510629d95a8857b4 (diff)
downloadsamba-e89fd49df7e63dcf37ee1aa7e2f50965851725c9.tar.gz
samba-e89fd49df7e63dcf37ee1aa7e2f50965851725c9.tar.bz2
samba-e89fd49df7e63dcf37ee1aa7e2f50965851725c9.zip
r4757: added the ability of the clisocket level of libcli to handle async
socket connections. This was complicated by a few factors: - it meant moving the event context from clitransport to clisocket, so lots of structures changed - we need to asynchronously handle connection to lists of port numbers, not just one port number. The code internally tries each port in the list in turn, without ever blocking - the man page on how connect() is supposed to work asynchronously doesn't work in practice (now why doesn't this surprise me?). The getsockopt() for SOL_ERROR is supposed to retrieve the error, but in fact the next (unrelated) connect() call on the same socket also gets an error, though not the right error. To work around this I need to tear down the whole socket between each attempted port. I hate posix. Note that clisocket.c still does a blocking name resolution call in smbcli_sock_connect_byname(). That will be fixed when we add the async NBT resolution code. Also note that I arranged things so that every SMB connection is now async internally, so using plain smbclient or smbtorture tests all the async features of this new code. (This used to be commit 468f8ebbfdbdf37c757fdc4863626aa9946a8870)
Diffstat (limited to 'source4/ntvfs')
-rw-r--r--source4/ntvfs/cifs/vfs_cifs.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/ntvfs/cifs/vfs_cifs.c b/source4/ntvfs/cifs/vfs_cifs.c
index 2a76d245ac..1a5a5ac042 100644
--- a/source4/ntvfs/cifs/vfs_cifs.c
+++ b/source4/ntvfs/cifs/vfs_cifs.c
@@ -152,12 +152,12 @@ static NTSTATUS cvfs_connect(struct ntvfs_module_context *ntvfs,
smbcli_oplock_handler(private->transport, oplock_handler, private);
smbcli_transport_idle_handler(private->transport, idle_func, 50000, private);
- private->transport->event.fde->handler = cifs_socket_handler;
- private->transport->event.fde->private = private;
+ private->transport->socket->event.fde->handler = cifs_socket_handler;
+ private->transport->socket->event.fde->private = private;
- private->transport->event.ctx = event_context_merge(tcon->smb_conn->connection->event.ctx,
- private->transport->event.ctx);
- talloc_reference(private, private->transport->event.ctx);
+ private->transport->socket->event.ctx = event_context_merge(tcon->smb_conn->connection->event.ctx,
+ private->transport->socket->event.ctx);
+ talloc_reference(private, private->transport->socket->event.ctx);
private->map_generic = lp_parm_bool(req->tcon->service,
"cifs", "mapgeneric", False);