From bab977dad76e9204278c7afe0bb905cda064f488 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 16 Jun 2005 05:39:40 +0000
Subject: r7626: a new ldap client library. Main features are:

 - hooked into events system, so requests can be truly async and won't
   interfere with other processing happening at the same time

 - uses NTSTATUS codes for errors (previously errors were mostly
   ignored). In a similar fashion to the DOS error handling, I have
   reserved a range of the NTSTATUS code 32 bit space for LDAP error
   codes, so a function can return a LDAP error code in a NTSTATUS

 - much cleaner packet handling
(This used to be commit 2e3c660b2fc20e046d82bf1cc296422b6e7dfad0)
---
 source4/lib/socket/connect.c | 74 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 source4/lib/socket/connect.c

(limited to 'source4/lib/socket/connect.c')

diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c
new file mode 100644
index 0000000000..f3f9134f26
--- /dev/null
+++ b/source4/lib/socket/connect.c
@@ -0,0 +1,74 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   implements a non-blocking connect operation that is aware of the samba4 events
+   system
+
+   Copyright (C) Andrew Tridgell 2005
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+#include "lib/socket/socket.h"
+#include "lib/events/events.h"
+
+
+/*
+  handle write events on connect completion
+*/
+static void socket_connect_handler(struct event_context *ev, struct fd_event *fde, 
+				   uint16_t flags, void *private)
+{
+	NTSTATUS *status = (NTSTATUS *)private;
+	*status = NT_STATUS_OK;
+}
+
+
+/*
+  just like socket_connect() but other events can happen while the
+  connect is ongoing. This isn't as good as making the calling code
+  fully async during its connect phase, but at least it means that any
+  calling code that uses this won't interfere with code that is
+  properly async
+ */
+NTSTATUS socket_connect_ev(struct socket_context *sock,
+			   const char *my_address, int my_port,
+			   const char *server_address, int server_port,
+			   uint32_t flags, struct event_context *ev)
+{
+	TALLOC_CTX *tmp_ctx = talloc_new(sock);
+	NTSTATUS status;
+	
+	set_blocking(socket_get_fd(sock), False);
+
+	status = socket_connect(sock, my_address, my_port, 
+				server_address, server_port, flags);
+
+	event_add_fd(ev, tmp_ctx, socket_get_fd(sock), EVENT_FD_WRITE, 
+		     socket_connect_handler, &status);
+
+	while (NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES)) {
+		if (event_loop_once(ev) != 0) {
+			talloc_free(tmp_ctx);
+			return NT_STATUS_INTERNAL_ERROR;
+		}
+	}
+
+	status = socket_connect_complete(sock, flags);
+
+	talloc_free(tmp_ctx);
+	return status;
+}
-- 
cgit 


From 11bc3f3589007cfc3dcce1a37d824a8c83b01d1a Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 17 Jun 2005 00:10:13 +0000
Subject: r7660: improved error handling in socket_connect_ev() (it matters
 when name resolution fails) (This used to be commit
 4013c2ddea0cd03f875e2acf40d2a34344017d05)

---
 source4/lib/socket/connect.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source4/lib/socket/connect.c')

diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c
index f3f9134f26..e7f2a11daf 100644
--- a/source4/lib/socket/connect.c
+++ b/source4/lib/socket/connect.c
@@ -56,6 +56,9 @@ NTSTATUS socket_connect_ev(struct socket_context *sock,
 
 	status = socket_connect(sock, my_address, my_port, 
 				server_address, server_port, flags);
+	if (NT_STATUS_IS_ERR(status)) {
+		return status;
+	}
 
 	event_add_fd(ev, tmp_ctx, socket_get_fd(sock), EVENT_FD_WRITE, 
 		     socket_connect_handler, &status);
-- 
cgit 


From 44a04d74cdcc4b4dc75312a40b34d60e1d9a001b Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 17 Jun 2005 02:48:48 +0000
Subject: r7668: - setup HAVE_ILDAP to enable the ildap backend in ldb

- fixed a bug in socket_connect_ev()
(This used to be commit 3f77b879a035929a843e02b798d54eba6625bde7)
---
 source4/lib/socket/connect.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source4/lib/socket/connect.c')

diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c
index e7f2a11daf..abe474720c 100644
--- a/source4/lib/socket/connect.c
+++ b/source4/lib/socket/connect.c
@@ -56,7 +56,8 @@ NTSTATUS socket_connect_ev(struct socket_context *sock,
 
 	status = socket_connect(sock, my_address, my_port, 
 				server_address, server_port, flags);
-	if (NT_STATUS_IS_ERR(status)) {
+	if (NT_STATUS_IS_ERR(status) && 
+	    !NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
 		return status;
 	}
 
-- 
cgit 


From c98c6aa5611f26ab591c50fcded1fc55e81a0d07 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 28 Aug 2005 02:37:14 +0000
Subject: r9702:  r9680@blu:  tridge | 2005-08-27 18:45:08 +1000  - fixed
 ncacn_ip_tcp to use the generic async name resolution methods,    so NBT
 names now work (as requested several times by abartlet!)

 - changed resolve_name() to take an event_context, so it doesn't cause
   the whole process to block

 - cleaned up the talloc_find_parent_bytype() calls to go via a cleaner
   event_context_find() call
(This used to be commit b3d491b210a8b889a25efcb273e70fefbd01b7f7)
---
 source4/lib/socket/connect.c | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

(limited to 'source4/lib/socket/connect.c')

diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c
index abe474720c..567c8f41d2 100644
--- a/source4/lib/socket/connect.c
+++ b/source4/lib/socket/connect.c
@@ -24,6 +24,29 @@
 #include "includes.h"
 #include "lib/socket/socket.h"
 #include "lib/events/events.h"
+#include "librpc/gen_ndr/nbt.h"
+
+
+/*
+  async name resolution handler for socket_connect_ev, returnes either
+  an IP address or 'localhost' (which is specially recognised)
+*/
+static NTSTATUS connect_resolve(TALLOC_CTX *mem_ctx, const char *address, 
+				struct event_context *ev, const char **ret_address)
+{
+	struct nbt_name name;
+
+	if (is_ipaddress(address) || strcasecmp("localhost", address) == 0) {
+		*ret_address = address;
+		return NT_STATUS_OK;
+	}
+
+	name.name = address;
+	name.scope = NULL;
+	name.type = NBT_NAME_CLIENT;
+
+	return resolve_name(&name, mem_ctx, ret_address, ev);
+}
 
 
 /*
@@ -52,6 +75,16 @@ NTSTATUS socket_connect_ev(struct socket_context *sock,
 	TALLOC_CTX *tmp_ctx = talloc_new(sock);
 	NTSTATUS status;
 	
+	/*
+	  we resolve separately to ensure that the name resolutions happens
+	  asynchronously
+	*/
+	status = connect_resolve(tmp_ctx, server_address, ev, &server_address);
+	if (!NT_STATUS_IS_OK(status)) {
+		talloc_free(tmp_ctx);
+		return status;
+	}
+
 	set_blocking(socket_get_fd(sock), False);
 
 	status = socket_connect(sock, my_address, my_port, 
-- 
cgit 


From 75c29073ce12723598e4e204ccb616cd52fa2c13 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 28 Aug 2005 02:37:38 +0000
Subject: r9704:  r9684@blu:  tridge | 2005-08-27 19:38:31 +1000  don't try to
 call the name resolver on non-ipv4 names! (This used to be commit
 4bb3d36fe6705bc625fe4122500f681ab7f2dc53)

---
 source4/lib/socket/connect.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'source4/lib/socket/connect.c')

diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c
index 567c8f41d2..bb4d7cc843 100644
--- a/source4/lib/socket/connect.c
+++ b/source4/lib/socket/connect.c
@@ -74,15 +74,20 @@ NTSTATUS socket_connect_ev(struct socket_context *sock,
 {
 	TALLOC_CTX *tmp_ctx = talloc_new(sock);
 	NTSTATUS status;
-	
+
 	/*
 	  we resolve separately to ensure that the name resolutions happens
 	  asynchronously
+
+	  the check for ipv4 is ugly, but how to do it better? We don't want
+	  to try to resolve unix pathnames here
 	*/
-	status = connect_resolve(tmp_ctx, server_address, ev, &server_address);
-	if (!NT_STATUS_IS_OK(status)) {
-		talloc_free(tmp_ctx);
-		return status;
+	if (strcmp(sock->backend_name, "ipv4") == 0) {
+		status = connect_resolve(tmp_ctx, server_address, ev, &server_address);
+		if (!NT_STATUS_IS_OK(status)) {
+			talloc_free(tmp_ctx);
+			return status;
+		}
 	}
 
 	set_blocking(socket_get_fd(sock), False);
-- 
cgit 


From 45f760973d9b5c0663608e779eb337c0648e9313 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 13 Sep 2005 12:46:03 +0000
Subject: r10200: added a composite_trigger_done() call that allows a composite
 function to cause an event to happen immediately. This allows metzes patch
 for recognising IPs in resolve_name() to work, and also allows us to remove
 some of the other code where we currently do specific checks for
 is_ipaddress(). (This used to be commit
 9cc000d868e1257ef6429f6f6f1f9d3c28ca330f)

---
 source4/lib/socket/connect.c | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'source4/lib/socket/connect.c')

diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c
index bb4d7cc843..04902442e3 100644
--- a/source4/lib/socket/connect.c
+++ b/source4/lib/socket/connect.c
@@ -36,11 +36,6 @@ static NTSTATUS connect_resolve(TALLOC_CTX *mem_ctx, const char *address,
 {
 	struct nbt_name name;
 
-	if (is_ipaddress(address) || strcasecmp("localhost", address) == 0) {
-		*ret_address = address;
-		return NT_STATUS_OK;
-	}
-
 	name.name = address;
 	name.scope = NULL;
 	name.type = NBT_NAME_CLIENT;
-- 
cgit 


From d6e070b74af8891c5e6ee15d57f8c0db3aac2f14 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Mon, 24 Oct 2005 09:34:12 +0000
Subject: r11274: Start a connection attempt to the DC's port 389. To do this
 properly, make socket_connect and ldap_connect properly async.

Volker
(This used to be commit bcc71fc1deeed443d7cf00220ce264011ddf588d)
---
 source4/lib/socket/connect.c | 230 +++++++++++++++++++++++++++++++------------
 1 file changed, 167 insertions(+), 63 deletions(-)

(limited to 'source4/lib/socket/connect.c')

diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c
index 04902442e3..244fdcbb06 100644
--- a/source4/lib/socket/connect.c
+++ b/source4/lib/socket/connect.c
@@ -1,10 +1,11 @@
 /* 
    Unix SMB/CIFS implementation.
 
-   implements a non-blocking connect operation that is aware of the samba4 events
-   system
+   implements a non-blocking connect operation that is aware of the samba4
+   events system
 
    Copyright (C) Andrew Tridgell 2005
+   Copyright (C) Volker Lendecke 2005
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -25,87 +26,190 @@
 #include "lib/socket/socket.h"
 #include "lib/events/events.h"
 #include "librpc/gen_ndr/nbt.h"
+#include "libcli/composite/composite.h"
+
+
+struct connect_state {
+	struct composite_context *ctx;
+	struct socket_context *sock;
+	const char *my_address;
+	int my_port;
+	const char *server_address;
+	int server_port;
+	uint32_t flags;
+	struct fd_event *connect_ev;
+};
+
+static void socket_connect_handler(struct event_context *ev,
+				   struct fd_event *fde, 
+				   uint16_t flags, void *private);
+static void socket_connect_recv_addr(struct composite_context *ctx);
+static void socket_connect_recv_conn(struct composite_context *ctx);
+
+struct composite_context *socket_connect_send(struct socket_context *sock,
+					      const char *my_address,
+					      int my_port,
+					      const char *server_address,
+					      int server_port,
+					      uint32_t flags,
+					      struct event_context *event_ctx)
+{
+	struct composite_context *result, *ctx;
+	struct connect_state *state;
+
+	result = talloc_zero(NULL, struct composite_context);
+	if (result == NULL) goto failed;
+	result->state = COMPOSITE_STATE_IN_PROGRESS;
+	result->async.fn = NULL;
+	result->event_ctx = event_ctx;
+
+	state = talloc(result, struct connect_state);
+	if (state == NULL) goto failed;
+	state->ctx = result;
+	result->private_data = state;
+
+	state->sock = talloc_reference(state, sock);
+	if (state->sock == NULL) goto failed;
+	state->my_address = talloc_strdup(state, my_address);
+	if (state->sock == NULL) goto failed;
+	state->my_port = my_port;
+	state->server_address = talloc_strdup(state, server_address);
+	if (state->sock == NULL) goto failed;
+	state->server_port = server_port;
+	state->flags = flags;
 
+	set_blocking(socket_get_fd(sock), False);
 
-/*
-  async name resolution handler for socket_connect_ev, returnes either
-  an IP address or 'localhost' (which is specially recognised)
-*/
-static NTSTATUS connect_resolve(TALLOC_CTX *mem_ctx, const char *address, 
-				struct event_context *ev, const char **ret_address)
-{
-	struct nbt_name name;
+	if (strcmp(sock->backend_name, "ipv4") == 0) {
+		struct nbt_name name;
+		make_nbt_name_client(&name, server_address);
+		ctx = resolve_name_send(&name, result->event_ctx,
+					lp_name_resolve_order());
+		if (ctx == NULL) goto failed;
+		ctx->async.fn = socket_connect_recv_addr;
+		ctx->async.private_data = state;
+		return result;
+	}
 
-	name.name = address;
-	name.scope = NULL;
-	name.type = NBT_NAME_CLIENT;
+	ctx = talloc_zero(state, struct composite_context);
+	if (ctx == NULL) goto failed;
+	ctx->state = COMPOSITE_STATE_IN_PROGRESS;
+	ctx->event_ctx = event_ctx;
+	ctx->async.fn = socket_connect_recv_conn;
+	ctx->async.private_data = state;
+
+	state->ctx->status = socket_connect(sock, my_address, my_port, 
+					    server_address, server_port,
+					    flags);
+	if (NT_STATUS_IS_ERR(state->ctx->status) && 
+	    !NT_STATUS_EQUAL(state->ctx->status,
+			     NT_STATUS_MORE_PROCESSING_REQUIRED)) {
+		composite_trigger_error(state->ctx);
+		return result;
+	}
 
-	return resolve_name(&name, mem_ctx, ret_address, ev);
-}
+	state->connect_ev = event_add_fd(state->ctx->event_ctx, state,
+					 socket_get_fd(sock), EVENT_FD_WRITE, 
+					 socket_connect_handler, ctx);
+	if (state->connect_ev == NULL) {
+		state->ctx->status = NT_STATUS_NO_MEMORY;
+		composite_trigger_error(state->ctx);
+		return result;
+	}
 
+	return result;
+
+ failed:
+	talloc_free(result);
+	return NULL;
+}
 
 /*
   handle write events on connect completion
 */
-static void socket_connect_handler(struct event_context *ev, struct fd_event *fde, 
+static void socket_connect_handler(struct event_context *ev,
+				   struct fd_event *fde, 
 				   uint16_t flags, void *private)
 {
-	NTSTATUS *status = (NTSTATUS *)private;
-	*status = NT_STATUS_OK;
-}
+	struct composite_context *ctx =
+		talloc_get_type(private, struct composite_context);
+	struct connect_state *state =
+		talloc_get_type(ctx->async.private_data,
+				struct connect_state);
 
+	ctx->status = socket_connect_complete(state->sock, state->flags);
+	if (!composite_is_ok(ctx)) return;
 
-/*
-  just like socket_connect() but other events can happen while the
-  connect is ongoing. This isn't as good as making the calling code
-  fully async during its connect phase, but at least it means that any
-  calling code that uses this won't interfere with code that is
-  properly async
- */
-NTSTATUS socket_connect_ev(struct socket_context *sock,
-			   const char *my_address, int my_port,
-			   const char *server_address, int server_port,
-			   uint32_t flags, struct event_context *ev)
-{
-	TALLOC_CTX *tmp_ctx = talloc_new(sock);
-	NTSTATUS status;
-
-	/*
-	  we resolve separately to ensure that the name resolutions happens
-	  asynchronously
+	composite_done(ctx);
+}
 
-	  the check for ipv4 is ugly, but how to do it better? We don't want
-	  to try to resolve unix pathnames here
-	*/
-	if (strcmp(sock->backend_name, "ipv4") == 0) {
-		status = connect_resolve(tmp_ctx, server_address, ev, &server_address);
-		if (!NT_STATUS_IS_OK(status)) {
-			talloc_free(tmp_ctx);
-			return status;
-		}
+static void socket_connect_recv_addr(struct composite_context *ctx)
+{
+	struct connect_state *state =
+		talloc_get_type(ctx->async.private_data, struct connect_state);
+	const char *addr;
+
+	state->ctx->status = resolve_name_recv(ctx, state, &addr);
+	if (!composite_is_ok(state->ctx)) return;
+
+	ctx = talloc_zero(state, struct composite_context);
+	if (composite_nomem(ctx, state->ctx)) return;
+	ctx->state = COMPOSITE_STATE_IN_PROGRESS;
+	ctx->event_ctx = state->ctx->event_ctx;
+	ctx->async.fn = socket_connect_recv_conn;
+	ctx->async.private_data = state;
+
+	state->ctx->status = socket_connect(state->sock,
+					    state->my_address,
+					    state->my_port, 
+					    state->server_address,
+					    state->server_port,
+					    state->flags);
+	if (NT_STATUS_IS_ERR(state->ctx->status) && 
+	    !NT_STATUS_EQUAL(state->ctx->status,
+			     NT_STATUS_MORE_PROCESSING_REQUIRED)) {
+		composite_error(state->ctx, state->ctx->status);
+		return;
 	}
 
-	set_blocking(socket_get_fd(sock), False);
+	state->connect_ev = event_add_fd(ctx->event_ctx, state,
+					 socket_get_fd(state->sock),
+					 EVENT_FD_WRITE, 
+					 socket_connect_handler, ctx);
+	if (composite_nomem(state->connect_ev, state->ctx)) return;
 
-	status = socket_connect(sock, my_address, my_port, 
-				server_address, server_port, flags);
-	if (NT_STATUS_IS_ERR(status) && 
-	    !NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
-		return status;
-	}
+	return;
+}
 
-	event_add_fd(ev, tmp_ctx, socket_get_fd(sock), EVENT_FD_WRITE, 
-		     socket_connect_handler, &status);
+static void socket_connect_recv_conn(struct composite_context *ctx)
+{
+	struct connect_state *state =
+		talloc_get_type(ctx->async.private_data, struct connect_state);
 
-	while (NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES)) {
-		if (event_loop_once(ev) != 0) {
-			talloc_free(tmp_ctx);
-			return NT_STATUS_INTERNAL_ERROR;
-		}
-	}
+	state->ctx->status = ctx->status;
+	if (!composite_is_ok(state->ctx)) return;
 
-	status = socket_connect_complete(sock, flags);
+	/* We have to free the event context here because the continuation
+	 * function might add an event for this socket directly. */
+	talloc_free(state->connect_ev);
 
-	talloc_free(tmp_ctx);
+	composite_done(state->ctx);
+}
+
+NTSTATUS socket_connect_recv(struct composite_context *ctx)
+{
+	NTSTATUS status = composite_wait(ctx);
+	talloc_free(ctx);
 	return status;
 }
+
+NTSTATUS socket_connect_ev(struct socket_context *sock,
+			   const char *my_address, int my_port,
+			   const char *server_address, int server_port,
+			   uint32_t flags, struct event_context *ev)
+{
+	struct composite_context *ctx;
+	ctx = socket_connect_send(sock, my_address, my_port,
+				  server_address, server_port, flags, ev);
+	return socket_connect_recv(ctx);
+}
-- 
cgit 


From 218ea5a5c77aab2d572b400c8605e0e67ab741e0 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Sun, 20 Nov 2005 16:27:41 +0000
Subject: r11808: Fix socket_connect_ev (This used to be commit
 95bd3ffaf7efb117206c83f7c75c302b54e6d059)

---
 source4/lib/socket/connect.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/lib/socket/connect.c')

diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c
index 244fdcbb06..f174b7c09d 100644
--- a/source4/lib/socket/connect.c
+++ b/source4/lib/socket/connect.c
@@ -147,9 +147,9 @@ static void socket_connect_recv_addr(struct composite_context *ctx)
 {
 	struct connect_state *state =
 		talloc_get_type(ctx->async.private_data, struct connect_state);
-	const char *addr;
 
-	state->ctx->status = resolve_name_recv(ctx, state, &addr);
+	state->ctx->status = resolve_name_recv(ctx, state,
+					       &state->server_address);
 	if (!composite_is_ok(state->ctx)) return;
 
 	ctx = talloc_zero(state, struct composite_context);
-- 
cgit 


From b31fe2d42b87d797d5f208946029cf8965bf0049 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Sun, 20 Nov 2005 17:33:08 +0000
Subject: r11811: Revert 11808, this broke the selftest. No idea why though.
 Why do we to the resolve_name if it's not used?

I know this is my code, but I don't understand why it breaks tests.

Volker
(This used to be commit 577a5639d3fc008480e988864bb4fb59939bc2d8)
---
 source4/lib/socket/connect.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/lib/socket/connect.c')

diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c
index f174b7c09d..244fdcbb06 100644
--- a/source4/lib/socket/connect.c
+++ b/source4/lib/socket/connect.c
@@ -147,9 +147,9 @@ static void socket_connect_recv_addr(struct composite_context *ctx)
 {
 	struct connect_state *state =
 		talloc_get_type(ctx->async.private_data, struct connect_state);
+	const char *addr;
 
-	state->ctx->status = resolve_name_recv(ctx, state,
-					       &state->server_address);
+	state->ctx->status = resolve_name_recv(ctx, state, &addr);
 	if (!composite_is_ok(state->ctx)) return;
 
 	ctx = talloc_zero(state, struct composite_context);
-- 
cgit 


From 37279b1363db5d02d48e56b6a8b16e4b70180b2a Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 21 Nov 2005 07:23:36 +0000
Subject: r11820: fixed some problems with the socket socket.c code.

 - removed the duplicate calls to socket_connect(), instead creating a
   common function socket_send_connect() used by both code paths

 - fixed some NULL ptr checks (probably was cut-and-paste bugs)

 - ensure we use the result of the name resolution

 - added a few comments

 - use 'fde' for the file description event. The variable name
  'connect_ev' immediately made me think of an event context, not a
  fde. Using common variable name conventions makes code a bit easier
  to read
(This used to be commit 37b73521b4c858c78013279daaa71352c704551d)
---
 source4/lib/socket/connect.c | 140 ++++++++++++++++++++++---------------------
 1 file changed, 72 insertions(+), 68 deletions(-)

(limited to 'source4/lib/socket/connect.c')

diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c
index 244fdcbb06..1a29667d1c 100644
--- a/source4/lib/socket/connect.c
+++ b/source4/lib/socket/connect.c
@@ -37,7 +37,7 @@ struct connect_state {
 	const char *server_address;
 	int server_port;
 	uint32_t flags;
-	struct fd_event *connect_ev;
+	struct fd_event *fde;
 };
 
 static void socket_connect_handler(struct event_context *ev,
@@ -46,6 +46,44 @@ static void socket_connect_handler(struct event_context *ev,
 static void socket_connect_recv_addr(struct composite_context *ctx);
 static void socket_connect_recv_conn(struct composite_context *ctx);
 
+/*
+  call the real socket_connect() call, and setup event handler
+*/
+static void socket_send_connect(struct connect_state *state)
+{
+	struct composite_context *ctx;
+
+	ctx = talloc_zero(state, struct composite_context);
+	if (composite_nomem(ctx, state->ctx)) return;
+	ctx->state = COMPOSITE_STATE_IN_PROGRESS;
+	ctx->event_ctx = state->ctx->event_ctx;
+	ctx->async.fn = socket_connect_recv_conn;
+	ctx->async.private_data = state;
+
+	state->ctx->status = socket_connect(state->sock,
+					    state->my_address,
+					    state->my_port, 
+					    state->server_address,
+					    state->server_port,
+					    state->flags);
+	if (NT_STATUS_IS_ERR(state->ctx->status) && 
+	    !NT_STATUS_EQUAL(state->ctx->status,
+			     NT_STATUS_MORE_PROCESSING_REQUIRED)) {
+		composite_error(state->ctx, state->ctx->status);
+		return;
+	}
+
+	state->fde = event_add_fd(ctx->event_ctx, state,
+				  socket_get_fd(state->sock),
+				  EVENT_FD_WRITE, 
+				  socket_connect_handler, ctx);
+	composite_nomem(state->fde, state->ctx);
+}
+
+
+/*
+  send a socket connect, potentially doing some name resolution first
+*/
 struct composite_context *socket_connect_send(struct socket_context *sock,
 					      const char *my_address,
 					      int my_port,
@@ -57,24 +95,29 @@ struct composite_context *socket_connect_send(struct socket_context *sock,
 	struct composite_context *result, *ctx;
 	struct connect_state *state;
 
-	result = talloc_zero(NULL, struct composite_context);
-	if (result == NULL) goto failed;
+	result = talloc_zero(sock, struct composite_context);
+	if (result == NULL) return NULL;
 	result->state = COMPOSITE_STATE_IN_PROGRESS;
 	result->async.fn = NULL;
 	result->event_ctx = event_ctx;
 
-	state = talloc(result, struct connect_state);
-	if (state == NULL) goto failed;
+	state = talloc_zero(result, struct connect_state);
+	if (composite_nomem(state, result)) goto failed;
 	state->ctx = result;
 	result->private_data = state;
 
 	state->sock = talloc_reference(state, sock);
-	if (state->sock == NULL) goto failed;
-	state->my_address = talloc_strdup(state, my_address);
-	if (state->sock == NULL) goto failed;
+	if (composite_nomem(state->sock, result)) goto failed;
+
+	if (my_address) {
+		state->my_address = talloc_strdup(state, my_address);
+		if (composite_nomem(state->my_address, result)) goto failed;
+	}
 	state->my_port = my_port;
+
 	state->server_address = talloc_strdup(state, server_address);
-	if (state->sock == NULL) goto failed;
+	if (composite_nomem(state->server_address, result)) goto failed;
+
 	state->server_port = server_port;
 	state->flags = flags;
 
@@ -91,37 +134,13 @@ struct composite_context *socket_connect_send(struct socket_context *sock,
 		return result;
 	}
 
-	ctx = talloc_zero(state, struct composite_context);
-	if (ctx == NULL) goto failed;
-	ctx->state = COMPOSITE_STATE_IN_PROGRESS;
-	ctx->event_ctx = event_ctx;
-	ctx->async.fn = socket_connect_recv_conn;
-	ctx->async.private_data = state;
-
-	state->ctx->status = socket_connect(sock, my_address, my_port, 
-					    server_address, server_port,
-					    flags);
-	if (NT_STATUS_IS_ERR(state->ctx->status) && 
-	    !NT_STATUS_EQUAL(state->ctx->status,
-			     NT_STATUS_MORE_PROCESSING_REQUIRED)) {
-		composite_trigger_error(state->ctx);
-		return result;
-	}
-
-	state->connect_ev = event_add_fd(state->ctx->event_ctx, state,
-					 socket_get_fd(sock), EVENT_FD_WRITE, 
-					 socket_connect_handler, ctx);
-	if (state->connect_ev == NULL) {
-		state->ctx->status = NT_STATUS_NO_MEMORY;
-		composite_trigger_error(state->ctx);
-		return result;
-	}
+	socket_send_connect(state);
 
 	return result;
 
- failed:
-	talloc_free(result);
-	return NULL;
+failed:
+	composite_trigger_error(result);
+	return result;
 }
 
 /*
@@ -143,6 +162,9 @@ static void socket_connect_handler(struct event_context *ev,
 	composite_done(ctx);
 }
 
+/*
+  recv name resolution reply then send the connect
+*/
 static void socket_connect_recv_addr(struct composite_context *ctx)
 {
 	struct connect_state *state =
@@ -152,35 +174,14 @@ static void socket_connect_recv_addr(struct composite_context *ctx)
 	state->ctx->status = resolve_name_recv(ctx, state, &addr);
 	if (!composite_is_ok(state->ctx)) return;
 
-	ctx = talloc_zero(state, struct composite_context);
-	if (composite_nomem(ctx, state->ctx)) return;
-	ctx->state = COMPOSITE_STATE_IN_PROGRESS;
-	ctx->event_ctx = state->ctx->event_ctx;
-	ctx->async.fn = socket_connect_recv_conn;
-	ctx->async.private_data = state;
-
-	state->ctx->status = socket_connect(state->sock,
-					    state->my_address,
-					    state->my_port, 
-					    state->server_address,
-					    state->server_port,
-					    state->flags);
-	if (NT_STATUS_IS_ERR(state->ctx->status) && 
-	    !NT_STATUS_EQUAL(state->ctx->status,
-			     NT_STATUS_MORE_PROCESSING_REQUIRED)) {
-		composite_error(state->ctx, state->ctx->status);
-		return;
-	}
-
-	state->connect_ev = event_add_fd(ctx->event_ctx, state,
-					 socket_get_fd(state->sock),
-					 EVENT_FD_WRITE, 
-					 socket_connect_handler, ctx);
-	if (composite_nomem(state->connect_ev, state->ctx)) return;
+	state->server_address = addr;
 
-	return;
+	socket_send_connect(state);
 }
 
+/*
+  called when a connect has finished. Complete the top level composite context
+*/
 static void socket_connect_recv_conn(struct composite_context *ctx)
 {
 	struct connect_state *state =
@@ -188,14 +189,13 @@ static void socket_connect_recv_conn(struct composite_context *ctx)
 
 	state->ctx->status = ctx->status;
 	if (!composite_is_ok(state->ctx)) return;
-
-	/* We have to free the event context here because the continuation
-	 * function might add an event for this socket directly. */
-	talloc_free(state->connect_ev);
-
 	composite_done(state->ctx);
 }
 
+
+/*
+  wait for a socket_connect_send() to finish
+*/
 NTSTATUS socket_connect_recv(struct composite_context *ctx)
 {
 	NTSTATUS status = composite_wait(ctx);
@@ -203,6 +203,10 @@ NTSTATUS socket_connect_recv(struct composite_context *ctx)
 	return status;
 }
 
+
+/*
+  like socket_connect() but takes an event context, doing a semi-async connect
+*/
 NTSTATUS socket_connect_ev(struct socket_context *sock,
 			   const char *my_address, int my_port,
 			   const char *server_address, int server_port,
-- 
cgit 


From 84866065766cd288e68c8c83feadfab41a2fe3a8 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 21 Nov 2005 09:17:00 +0000
Subject: r11821: got rid of two more unnecessary variables and made the
 variable names a bit more consistent (This used to be commit
 4b6e9c7c978dfca54c05ed2d8995d1333ed21b02)

---
 source4/lib/socket/connect.c | 118 +++++++++++++++++++++----------------------
 1 file changed, 58 insertions(+), 60 deletions(-)

(limited to 'source4/lib/socket/connect.c')

diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c
index 1a29667d1c..1ab4892128 100644
--- a/source4/lib/socket/connect.c
+++ b/source4/lib/socket/connect.c
@@ -30,54 +30,55 @@
 
 
 struct connect_state {
-	struct composite_context *ctx;
 	struct socket_context *sock;
 	const char *my_address;
 	int my_port;
 	const char *server_address;
 	int server_port;
 	uint32_t flags;
-	struct fd_event *fde;
 };
 
 static void socket_connect_handler(struct event_context *ev,
 				   struct fd_event *fde, 
 				   uint16_t flags, void *private);
-static void socket_connect_recv_addr(struct composite_context *ctx);
-static void socket_connect_recv_conn(struct composite_context *ctx);
+static void continue_resolve_name(struct composite_context *ctx);
+static void continue_socket_connect(struct composite_context *creq);
 
 /*
   call the real socket_connect() call, and setup event handler
 */
-static void socket_send_connect(struct connect_state *state)
+static void socket_send_connect(struct composite_context *result)
 {
-	struct composite_context *ctx;
-
-	ctx = talloc_zero(state, struct composite_context);
-	if (composite_nomem(ctx, state->ctx)) return;
-	ctx->state = COMPOSITE_STATE_IN_PROGRESS;
-	ctx->event_ctx = state->ctx->event_ctx;
-	ctx->async.fn = socket_connect_recv_conn;
-	ctx->async.private_data = state;
-
-	state->ctx->status = socket_connect(state->sock,
-					    state->my_address,
-					    state->my_port, 
-					    state->server_address,
-					    state->server_port,
-					    state->flags);
-	if (NT_STATUS_IS_ERR(state->ctx->status) && 
-	    !NT_STATUS_EQUAL(state->ctx->status,
+	struct composite_context *creq;
+	struct fd_event *fde;
+	struct connect_state *state = talloc_get_type(result->private_data, 
+						      struct connect_state);
+
+	creq = talloc_zero(state, struct composite_context);
+	if (composite_nomem(creq, result)) return;
+	creq->state = COMPOSITE_STATE_IN_PROGRESS;
+	creq->event_ctx = result->event_ctx;
+	creq->async.fn = continue_socket_connect;
+	creq->async.private_data = result;
+
+	result->status = socket_connect(state->sock,
+					state->my_address,
+					state->my_port, 
+					state->server_address,
+					state->server_port,
+					state->flags);
+	if (NT_STATUS_IS_ERR(result->status) && 
+	    !NT_STATUS_EQUAL(result->status,
 			     NT_STATUS_MORE_PROCESSING_REQUIRED)) {
-		composite_error(state->ctx, state->ctx->status);
+		composite_error(result, result->status);
 		return;
 	}
 
-	state->fde = event_add_fd(ctx->event_ctx, state,
-				  socket_get_fd(state->sock),
-				  EVENT_FD_WRITE, 
-				  socket_connect_handler, ctx);
-	composite_nomem(state->fde, state->ctx);
+	fde = event_add_fd(result->event_ctx, result,
+			   socket_get_fd(state->sock),
+			   EVENT_FD_WRITE, 
+			   socket_connect_handler, result);
+	composite_nomem(fde, result);
 }
 
 
@@ -92,18 +93,16 @@ struct composite_context *socket_connect_send(struct socket_context *sock,
 					      uint32_t flags,
 					      struct event_context *event_ctx)
 {
-	struct composite_context *result, *ctx;
+	struct composite_context *result;
 	struct connect_state *state;
 
 	result = talloc_zero(sock, struct composite_context);
 	if (result == NULL) return NULL;
 	result->state = COMPOSITE_STATE_IN_PROGRESS;
-	result->async.fn = NULL;
 	result->event_ctx = event_ctx;
 
 	state = talloc_zero(result, struct connect_state);
 	if (composite_nomem(state, result)) goto failed;
-	state->ctx = result;
 	result->private_data = state;
 
 	state->sock = talloc_reference(state, sock);
@@ -125,16 +124,16 @@ struct composite_context *socket_connect_send(struct socket_context *sock,
 
 	if (strcmp(sock->backend_name, "ipv4") == 0) {
 		struct nbt_name name;
+		struct composite_context *creq;
 		make_nbt_name_client(&name, server_address);
-		ctx = resolve_name_send(&name, result->event_ctx,
-					lp_name_resolve_order());
-		if (ctx == NULL) goto failed;
-		ctx->async.fn = socket_connect_recv_addr;
-		ctx->async.private_data = state;
+		creq = resolve_name_send(&name, result->event_ctx,
+					 lp_name_resolve_order());
+		if (composite_nomem(creq, result)) goto failed;
+		composite_continue(result, creq, continue_resolve_name, result);
 		return result;
 	}
 
-	socket_send_connect(state);
+	socket_send_connect(result);
 
 	return result;
 
@@ -150,56 +149,55 @@ static void socket_connect_handler(struct event_context *ev,
 				   struct fd_event *fde, 
 				   uint16_t flags, void *private)
 {
-	struct composite_context *ctx =
+	struct composite_context *result =
 		talloc_get_type(private, struct composite_context);
-	struct connect_state *state =
-		talloc_get_type(ctx->async.private_data,
-				struct connect_state);
+	struct connect_state *state = talloc_get_type(result->private_data,
+						      struct connect_state);
 
-	ctx->status = socket_connect_complete(state->sock, state->flags);
-	if (!composite_is_ok(ctx)) return;
+	result->status = socket_connect_complete(state->sock, state->flags);
+	if (!composite_is_ok(result)) return;
 
-	composite_done(ctx);
+	composite_done(result);
 }
 
 /*
   recv name resolution reply then send the connect
 */
-static void socket_connect_recv_addr(struct composite_context *ctx)
+static void continue_resolve_name(struct composite_context *creq)
 {
-	struct connect_state *state =
-		talloc_get_type(ctx->async.private_data, struct connect_state);
+	struct composite_context *result = talloc_get_type(creq->async.private_data, 
+							   struct composite_context);
+	struct connect_state *state = talloc_get_type(result->private_data, struct connect_state);
 	const char *addr;
 
-	state->ctx->status = resolve_name_recv(ctx, state, &addr);
-	if (!composite_is_ok(state->ctx)) return;
+	result->status = resolve_name_recv(creq, state, &addr);
+	if (!composite_is_ok(result)) return;
 
 	state->server_address = addr;
 
-	socket_send_connect(state);
+	socket_send_connect(result);
 }
 
 /*
   called when a connect has finished. Complete the top level composite context
 */
-static void socket_connect_recv_conn(struct composite_context *ctx)
+static void continue_socket_connect(struct composite_context *creq)
 {
-	struct connect_state *state =
-		talloc_get_type(ctx->async.private_data, struct connect_state);
-
-	state->ctx->status = ctx->status;
-	if (!composite_is_ok(state->ctx)) return;
-	composite_done(state->ctx);
+	struct composite_context *result = talloc_get_type(creq->async.private_data, 
+							   struct composite_context);
+	result->status = creq->status;
+	if (!composite_is_ok(result)) return;
+	composite_done(result);
 }
 
 
 /*
   wait for a socket_connect_send() to finish
 */
-NTSTATUS socket_connect_recv(struct composite_context *ctx)
+NTSTATUS socket_connect_recv(struct composite_context *result)
 {
-	NTSTATUS status = composite_wait(ctx);
-	talloc_free(ctx);
+	NTSTATUS status = composite_wait(result);
+	talloc_free(result);
 	return status;
 }
 
-- 
cgit 


From 111a920fdb92ccef32f89b2f992bdd3051e5ac54 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 8 Dec 2005 01:13:45 +0000
Subject: r12116: got rid of composite_trigger_done() and
 composite_trigger_error(), and instead make the normal composite_done() and
 composite_error() functions automatically trigger a delayed callback if the
 caller has had no opportunity to setup a async callback

this removes one of the common mistakes in writing a composite function
(This used to be commit f9413ce792ded682e05134b66d433eeec293e6f1)
---
 source4/lib/socket/connect.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/lib/socket/connect.c')

diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c
index 1ab4892128..116a8c67d8 100644
--- a/source4/lib/socket/connect.c
+++ b/source4/lib/socket/connect.c
@@ -138,7 +138,7 @@ struct composite_context *socket_connect_send(struct socket_context *sock,
 	return result;
 
 failed:
-	composite_trigger_error(result);
+	composite_error(result, result->status);
 	return result;
 }
 
-- 
cgit 


From bdc2a850daa7f0c4636df7548a748309f95fc417 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 14 Dec 2005 18:24:59 +0000
Subject: r12239: as we only get error from our events system when we wait for
 read events, we need to initialy ask for read events too, otherwise we'll
 never get an error back from socket_connect()

metze
(This used to be commit 7d94054d0fc954e6d810573430f2c5d35b73125d)
---
 source4/lib/socket/connect.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/lib/socket/connect.c')

diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c
index 116a8c67d8..4dc1053021 100644
--- a/source4/lib/socket/connect.c
+++ b/source4/lib/socket/connect.c
@@ -76,7 +76,7 @@ static void socket_send_connect(struct composite_context *result)
 
 	fde = event_add_fd(result->event_ctx, result,
 			   socket_get_fd(state->sock),
-			   EVENT_FD_WRITE, 
+			   EVENT_FD_READ|EVENT_FD_WRITE, 
 			   socket_connect_handler, result);
 	composite_nomem(fde, result);
 }
-- 
cgit 


From d4de4c2d210d2e8c9b5aedf70695594809ad6a0b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 30 Dec 2005 13:16:54 +0000
Subject: r12608: Remove some unused #include lines. (This used to be commit
 70e7449318aa0e9d2639c76730a7d1683b2f4981)

---
 source4/lib/socket/connect.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source4/lib/socket/connect.c')

diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c
index 4dc1053021..dd3a6047a6 100644
--- a/source4/lib/socket/connect.c
+++ b/source4/lib/socket/connect.c
@@ -25,7 +25,6 @@
 #include "includes.h"
 #include "lib/socket/socket.h"
 #include "lib/events/events.h"
-#include "librpc/gen_ndr/nbt.h"
 #include "libcli/composite/composite.h"
 
 
-- 
cgit 


From f55ea8bb3dca868e21663cd90eaea7a35cd7886c Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 9 Jan 2006 22:12:53 +0000
Subject: r12804: This patch reworks the Samba4 sockets layer to use a
 socket_address structure that is more generic than just 'IP/port'.

It now passes make test, and has been reviewed and updated by
metze. (Thankyou *very* much).

This passes 'make test' as well as kerberos use (not currently in the
testsuite).

The original purpose of this patch was to have Samba able to pass a
socket address stucture from the BSD layer into the kerberos routines
and back again.   It also removes nbt_peer_addr, which was being used
for a similar purpose.

It is a large change, but worthwhile I feel.

Andrew Bartlett
(This used to be commit 88198c4881d8620a37086f80e4da5a5b71c5bbb2)
---
 source4/lib/socket/connect.c | 58 +++++++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 30 deletions(-)

(limited to 'source4/lib/socket/connect.c')

diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c
index dd3a6047a6..dc64198caa 100644
--- a/source4/lib/socket/connect.c
+++ b/source4/lib/socket/connect.c
@@ -30,10 +30,8 @@
 
 struct connect_state {
 	struct socket_context *sock;
-	const char *my_address;
-	int my_port;
-	const char *server_address;
-	int server_port;
+	const struct socket_address *my_address;
+	const struct socket_address *server_address;
 	uint32_t flags;
 };
 
@@ -62,9 +60,7 @@ static void socket_send_connect(struct composite_context *result)
 
 	result->status = socket_connect(state->sock,
 					state->my_address,
-					state->my_port, 
 					state->server_address,
-					state->server_port,
 					state->flags);
 	if (NT_STATUS_IS_ERR(result->status) && 
 	    !NT_STATUS_EQUAL(result->status,
@@ -85,10 +81,8 @@ static void socket_send_connect(struct composite_context *result)
   send a socket connect, potentially doing some name resolution first
 */
 struct composite_context *socket_connect_send(struct socket_context *sock,
-					      const char *my_address,
-					      int my_port,
-					      const char *server_address,
-					      int server_port,
+					      struct socket_address *my_address,
+					      struct socket_address *server_address, 
 					      uint32_t flags,
 					      struct event_context *event_ctx)
 {
@@ -101,33 +95,39 @@ struct composite_context *socket_connect_send(struct socket_context *sock,
 	result->event_ctx = event_ctx;
 
 	state = talloc_zero(result, struct connect_state);
-	if (composite_nomem(state, result)) goto failed;
+	if (composite_nomem(state, result)) return result;
 	result->private_data = state;
 
 	state->sock = talloc_reference(state, sock);
-	if (composite_nomem(state->sock, result)) goto failed;
+	if (composite_nomem(state->sock, result)) return result;
 
 	if (my_address) {
-		state->my_address = talloc_strdup(state, my_address);
-		if (composite_nomem(state->my_address, result)) goto failed;
+		void *ref = talloc_reference(state, my_address);
+		if (composite_nomem(ref, result)) {
+			return result;
+		}
+		state->my_address = my_address;
 	}
-	state->my_port = my_port;
 
-	state->server_address = talloc_strdup(state, server_address);
-	if (composite_nomem(state->server_address, result)) goto failed;
+	{
+		void *ref = talloc_reference(state, server_address);
+		if (composite_nomem(ref, result)) {
+			return result;
+		}
+		state->server_address = server_address;
+	}
 
-	state->server_port = server_port;
 	state->flags = flags;
 
 	set_blocking(socket_get_fd(sock), False);
 
-	if (strcmp(sock->backend_name, "ipv4") == 0) {
+	if (server_address->addr && strcmp(sock->backend_name, "ipv4") == 0) {
 		struct nbt_name name;
 		struct composite_context *creq;
-		make_nbt_name_client(&name, server_address);
+		make_nbt_name_client(&name, server_address->addr);
 		creq = resolve_name_send(&name, result->event_ctx,
 					 lp_name_resolve_order());
-		if (composite_nomem(creq, result)) goto failed;
+		if (composite_nomem(creq, result)) return result;
 		composite_continue(result, creq, continue_resolve_name, result);
 		return result;
 	}
@@ -135,10 +135,6 @@ struct composite_context *socket_connect_send(struct socket_context *sock,
 	socket_send_connect(result);
 
 	return result;
-
-failed:
-	composite_error(result, result->status);
-	return result;
 }
 
 /*
@@ -172,7 +168,9 @@ static void continue_resolve_name(struct composite_context *creq)
 	result->status = resolve_name_recv(creq, state, &addr);
 	if (!composite_is_ok(result)) return;
 
-	state->server_address = addr;
+	state->server_address = socket_address_from_strings(state, state->sock->backend_name,
+							    addr, state->server_address->port);
+	if (composite_nomem(state->server_address, result)) return;
 
 	socket_send_connect(result);
 }
@@ -205,12 +203,12 @@ NTSTATUS socket_connect_recv(struct composite_context *result)
   like socket_connect() but takes an event context, doing a semi-async connect
 */
 NTSTATUS socket_connect_ev(struct socket_context *sock,
-			   const char *my_address, int my_port,
-			   const char *server_address, int server_port,
+			   struct socket_address *my_address,
+			   struct socket_address *server_address, 
 			   uint32_t flags, struct event_context *ev)
 {
 	struct composite_context *ctx;
-	ctx = socket_connect_send(sock, my_address, my_port,
-				  server_address, server_port, flags, ev);
+	ctx = socket_connect_send(sock, my_address, 
+				  server_address, flags, ev);
 	return socket_connect_recv(ctx);
 }
-- 
cgit 


From 4ac2be99588b48b0652a524bf12fb1aa9c3f5fbb Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 7 Mar 2006 11:07:23 +0000
Subject: r13924: Split more prototypes out of include/proto.h + initial work
 on header file dependencies (This used to be commit
 122835876748a3eaf5e8d31ad1abddab9acb8781)

---
 source4/lib/socket/connect.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/lib/socket/connect.c')

diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c
index dc64198caa..a74e2a67e6 100644
--- a/source4/lib/socket/connect.c
+++ b/source4/lib/socket/connect.c
@@ -26,6 +26,7 @@
 #include "lib/socket/socket.h"
 #include "lib/events/events.h"
 #include "libcli/composite/composite.h"
+#include "libcli/resolve/resolve.h"
 
 
 struct connect_state {
-- 
cgit 


From 0479a2f1cbae51fcd8dbdc3c148c808421fb4d25 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 10 Jul 2007 02:07:03 +0000
Subject: r23792: convert Samba4 to GPLv3

There are still a few tidyups of old FSF addresses to come (in both s3
and s4). More commits soon.
(This used to be commit fcf38a38ac691abd0fa51b89dc951a08e89fdafa)
---
 source4/lib/socket/connect.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'source4/lib/socket/connect.c')

diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c
index a74e2a67e6..dd2440b0a8 100644
--- a/source4/lib/socket/connect.c
+++ b/source4/lib/socket/connect.c
@@ -9,7 +9,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -18,8 +18,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
-- 
cgit 


From ffeee68e4b72dd94fee57366bd8d38b8c284c3d4 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 8 Sep 2007 12:42:09 +0000
Subject: r25026: Move param/param.h out of includes.h (This used to be commit
 abe8349f9b4387961ff3665d8c589d61cd2edf31)

---
 source4/lib/socket/connect.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/lib/socket/connect.c')

diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c
index dd2440b0a8..fe8bc5cf13 100644
--- a/source4/lib/socket/connect.c
+++ b/source4/lib/socket/connect.c
@@ -26,6 +26,7 @@
 #include "lib/events/events.h"
 #include "libcli/composite/composite.h"
 #include "libcli/resolve/resolve.h"
+#include "param/param.h"
 
 
 struct connect_state {
-- 
cgit 


From 37d53832a4623653f706e77985a79d84bd7c6694 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 28 Sep 2007 01:17:46 +0000
Subject: r25398: Parse loadparm context to all lp_*() functions. (This used to
 be commit 3fcc960839c6e5ca4de2c3c042f12f369ac5f238)

---
 source4/lib/socket/connect.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/lib/socket/connect.c')

diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c
index fe8bc5cf13..eca2067df1 100644
--- a/source4/lib/socket/connect.c
+++ b/source4/lib/socket/connect.c
@@ -127,7 +127,7 @@ struct composite_context *socket_connect_send(struct socket_context *sock,
 		struct composite_context *creq;
 		make_nbt_name_client(&name, server_address->addr);
 		creq = resolve_name_send(&name, result->event_ctx,
-					 lp_name_resolve_order());
+					 lp_name_resolve_order(global_loadparm));
 		if (composite_nomem(creq, result)) return result;
 		composite_continue(result, creq, continue_resolve_name, result);
 		return result;
-- 
cgit 


From 719a4ae0d32ab9ba817fd01f2b8f4cba220a8c60 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 5 Oct 2007 18:03:01 +0000
Subject: r25522: Convert to standard bool types. (This used to be commit
 5e814287ba475e12f8cc934fdd09b199dcdfdb86)

---
 source4/lib/socket/connect.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/lib/socket/connect.c')

diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c
index eca2067df1..4a30fa3b92 100644
--- a/source4/lib/socket/connect.c
+++ b/source4/lib/socket/connect.c
@@ -120,7 +120,7 @@ struct composite_context *socket_connect_send(struct socket_context *sock,
 
 	state->flags = flags;
 
-	set_blocking(socket_get_fd(sock), False);
+	set_blocking(socket_get_fd(sock), false);
 
 	if (server_address->addr && strcmp(sock->backend_name, "ipv4") == 0) {
 		struct nbt_name name;
-- 
cgit 


From 01d2acfdb4c4c0349a28a18c5c0da5b960b02791 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 7 Dec 2007 16:04:17 +0100
Subject: r26335: Specify name_resolve_order to socket code. (This used to be
 commit b03e5d00110be3f1fe5809dad4eb6ca5cea7463d)

---
 source4/lib/socket/connect.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'source4/lib/socket/connect.c')

diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c
index 4a30fa3b92..cad8967dab 100644
--- a/source4/lib/socket/connect.c
+++ b/source4/lib/socket/connect.c
@@ -85,6 +85,7 @@ struct composite_context *socket_connect_send(struct socket_context *sock,
 					      struct socket_address *my_address,
 					      struct socket_address *server_address, 
 					      uint32_t flags,
+					      const char **name_resolve_order,
 					      struct event_context *event_ctx)
 {
 	struct composite_context *result;
@@ -206,10 +207,11 @@ NTSTATUS socket_connect_recv(struct composite_context *result)
 NTSTATUS socket_connect_ev(struct socket_context *sock,
 			   struct socket_address *my_address,
 			   struct socket_address *server_address, 
-			   uint32_t flags, struct event_context *ev)
+			   uint32_t flags, const char **name_resolve_order,
+			   struct event_context *ev)
 {
 	struct composite_context *ctx;
 	ctx = socket_connect_send(sock, my_address, 
-				  server_address, flags, ev);
+				  server_address, flags, name_resolve_order, ev);
 	return socket_connect_recv(ctx);
 }
-- 
cgit 


From 5f4842cf65ce64bfdf577cd549565da20ca818cf Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 10 Dec 2007 18:41:19 +0100
Subject: r26376: Add context for libcli_resolve. (This used to be commit
 459e1466a411d6f83b7372e248566e6e71c745fc)

---
 source4/lib/socket/connect.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'source4/lib/socket/connect.c')

diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c
index cad8967dab..e70d091275 100644
--- a/source4/lib/socket/connect.c
+++ b/source4/lib/socket/connect.c
@@ -85,7 +85,7 @@ struct composite_context *socket_connect_send(struct socket_context *sock,
 					      struct socket_address *my_address,
 					      struct socket_address *server_address, 
 					      uint32_t flags,
-					      const char **name_resolve_order,
+					      struct resolve_context *resolve_ctx,
 					      struct event_context *event_ctx)
 {
 	struct composite_context *result;
@@ -127,8 +127,7 @@ struct composite_context *socket_connect_send(struct socket_context *sock,
 		struct nbt_name name;
 		struct composite_context *creq;
 		make_nbt_name_client(&name, server_address->addr);
-		creq = resolve_name_send(&name, result->event_ctx,
-					 lp_name_resolve_order(global_loadparm));
+		creq = resolve_name_send(resolve_ctx, &name, result->event_ctx);
 		if (composite_nomem(creq, result)) return result;
 		composite_continue(result, creq, continue_resolve_name, result);
 		return result;
@@ -207,11 +206,11 @@ NTSTATUS socket_connect_recv(struct composite_context *result)
 NTSTATUS socket_connect_ev(struct socket_context *sock,
 			   struct socket_address *my_address,
 			   struct socket_address *server_address, 
-			   uint32_t flags, const char **name_resolve_order,
+			   uint32_t flags, struct resolve_context *resolve_ctx,
 			   struct event_context *ev)
 {
 	struct composite_context *ctx;
 	ctx = socket_connect_send(sock, my_address, 
-				  server_address, flags, name_resolve_order, ev);
+				  server_address, flags, resolve_ctx, ev);
 	return socket_connect_recv(ctx);
 }
-- 
cgit 


From 1ea47faa979ad2e4aa4cf1f4252aa33aef98dbd8 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 11 Dec 2007 13:38:54 +0100
Subject: r26397: Fix circular dependency in samba-socket. (This used to be
 commit 801c8c766cb6a104751be8829593e0e123508134)

---
 source4/lib/socket/connect.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/lib/socket/connect.c')

diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c
index e70d091275..bc3aca3c22 100644
--- a/source4/lib/socket/connect.c
+++ b/source4/lib/socket/connect.c
@@ -123,7 +123,7 @@ struct composite_context *socket_connect_send(struct socket_context *sock,
 
 	set_blocking(socket_get_fd(sock), false);
 
-	if (server_address->addr && strcmp(sock->backend_name, "ipv4") == 0) {
+	if (resolve_ctx && server_address->addr && strcmp(sock->backend_name, "ipv4") == 0) {
 		struct nbt_name name;
 		struct composite_context *creq;
 		make_nbt_name_client(&name, server_address->addr);
-- 
cgit 


From fc88ba4a7efe36b0db6a39f58eb5af2c8cba9b9c Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 11 Dec 2007 22:23:34 +0100
Subject: r26406: Make a copy to prevent modification of the loadparm
 configuration. (This used to be commit
 c0f2775fd8bd88aad3497d59a7857d7a8a0978c5)

---
 source4/lib/socket/connect.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/lib/socket/connect.c')

diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c
index bc3aca3c22..773bf41873 100644
--- a/source4/lib/socket/connect.c
+++ b/source4/lib/socket/connect.c
@@ -123,7 +123,7 @@ struct composite_context *socket_connect_send(struct socket_context *sock,
 
 	set_blocking(socket_get_fd(sock), false);
 
-	if (resolve_ctx && server_address->addr && strcmp(sock->backend_name, "ipv4") == 0) {
+	if (resolve_ctx != NULL && server_address->addr && strcmp(sock->backend_name, "ipv4") == 0) {
 		struct nbt_name name;
 		struct composite_context *creq;
 		make_nbt_name_client(&name, server_address->addr);
-- 
cgit