From aefaa18554a55da5b5d9fdb9815eb246b539c8a2 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 22 Jan 2005 02:51:39 +0000 Subject: r4924: continue the effort to simplify and generalise the composite interface. This patch removes the "stage" variable, which is really better suited to the backend state structures (This used to be commit 39da684ea8bc72d7a4a12c00eaad56b4f32890a9) --- source4/libcli/raw/clisocket.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'source4/libcli/raw') diff --git a/source4/libcli/raw/clisocket.c b/source4/libcli/raw/clisocket.c index e981049535..cbbd6490bd 100644 --- a/source4/libcli/raw/clisocket.c +++ b/source4/libcli/raw/clisocket.c @@ -30,6 +30,7 @@ this private structure is used during async connection handling */ struct clisocket_connect { + int port_num; int *iports; struct smbcli_socket *sock; const char *dest_host; @@ -95,8 +96,8 @@ static void smbcli_sock_connect_handler(struct event_context *ev, struct fd_even } /* that port failed - try the next port */ - for (i=c->stage+1;conn->iports[i];i++) { - c->stage = i; + for (i=conn->port_num+1;conn->iports[i];i++) { + conn->port_num = i; c->status = smbcli_sock_connect_one(conn->sock, conn->dest_host, conn->iports[i]); @@ -204,7 +205,7 @@ struct smbcli_composite *smbcli_sock_connect_send(struct smbcli_socket *sock, /* startup the connect process for each port in turn until one succeeds or tells us that it is pending */ for (i=0;conn->iports[i];i++) { - c->stage = i; + conn->port_num = i; conn->sock->port = conn->iports[i]; c->status = smbcli_sock_connect_one(sock, conn->dest_host, -- cgit