diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-10-28 08:15:12 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:04:53 -0500 |
| commit | c272e60955bff28ff6431fd50e94807aca1ea016 (patch) | |
| tree | 1a302560b0d5db6b7905c77faeda6ca48ba0b42a /source4/libcli/raw/clitransport.c | |
| parent | 990d76f7cbd4339c30f650781c40463234fc47e1 (diff) | |
| download | samba-c272e60955bff28ff6431fd50e94807aca1ea016.tar.gz samba-c272e60955bff28ff6431fd50e94807aca1ea016.tar.bz2 samba-c272e60955bff28ff6431fd50e94807aca1ea016.zip | |
r3315: converted the libcli/raw/ code to use the generic socket library. This
allows me to test with the socket:testnonblock option. It passes.
(This used to be commit 7cb4bf8662825d507d8246647ffb10aa08bad794)
Diffstat (limited to 'source4/libcli/raw/clitransport.c')
| -rw-r--r-- | source4/libcli/raw/clitransport.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/libcli/raw/clitransport.c b/source4/libcli/raw/clitransport.c index c84c025c74..d82d97a0d9 100644 --- a/source4/libcli/raw/clitransport.c +++ b/source4/libcli/raw/clitransport.c @@ -82,7 +82,7 @@ struct smbcli_transport *smbcli_transport_init(struct smbcli_socket *sock) ZERO_STRUCT(transport->called); - fde.fd = sock->fd; + fde.fd = socket_get_fd(sock->sock); fde.flags = EVENT_FD_READ; fde.handler = smbcli_transport_event_handler; fde.private = transport; @@ -501,7 +501,7 @@ BOOL smbcli_transport_process(struct smbcli_transport *transport) { smbcli_transport_process_send(transport); smbcli_transport_process_recv(transport); - if (transport->socket->fd == -1) { + if (transport->socket->sock == NULL) { return False; } return True; @@ -515,7 +515,7 @@ BOOL smbcli_transport_process(struct smbcli_transport *transport) void smbcli_transport_send(struct smbcli_request *req) { /* check if the transport is dead */ - if (req->transport->socket->fd == -1) { + if (req->transport->socket->sock == NULL) { req->state = SMBCLI_REQUEST_ERROR; req->status = NT_STATUS_NET_WRITE_FAULT; return; |