From 134b2488c82ae13392121f71e4960178a38f3e01 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 28 Oct 2005 11:02:42 +0000 Subject: r11369: Implement socket_connect_multi: Connect to multiple ipv4 tcp ports in sequence, with a 2-millisecond timeout between firing the syn packets. Build smbcli_sock_connect_send upon that. Volker (This used to be commit 5718df44d90d113304c5deed1e2e7f82ff9e928f) --- source4/lib/socket/connect_multi.c | 266 +++++++++++++++++++++++++++++++++++++ 1 file changed, 266 insertions(+) create mode 100644 source4/lib/socket/connect_multi.c (limited to 'source4/lib/socket/connect_multi.c') diff --git a/source4/lib/socket/connect_multi.c b/source4/lib/socket/connect_multi.c new file mode 100644 index 0000000000..2724601ad0 --- /dev/null +++ b/source4/lib/socket/connect_multi.c @@ -0,0 +1,266 @@ +/* + Unix SMB/CIFS implementation. + + Fire connect requests to a host and a number of ports, with a timeout + between the connect request. Return if the first connect comes back + successfully or return the last error. + + 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 + 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" +#include "libcli/composite/composite.h" + + +struct connect_multi_state { + struct composite_context *ctx; + const char *server_address; + int num_ports; + uint16_t *ports; + + struct socket_context *result; + uint16_t result_port; + + int num_connects_sent, num_connects_in_fly; + struct fd_event **write_events; + struct socket_context **sockets; + struct timed_event *next_timeout; +}; + +static void connect_multi_connect_handler(struct event_context *ev, + struct fd_event *fde, + uint16_t flags, void *p); +static NTSTATUS connect_multi_next_socket(struct connect_multi_state *state); +static void connect_multi_fire_next(struct event_context *ev, + struct timed_event *te, + struct timeval tv, void *p); + +struct composite_context *socket_connect_multi_send(TALLOC_CTX *mem_ctx, + const char *server_address, + int num_server_ports, + uint16_t *server_ports, + struct event_context *event_ctx) +{ + struct composite_context *result; + struct connect_multi_state *state; + int i; + + result = talloc_zero(mem_ctx, struct composite_context); + if (result == NULL) goto failed; + result->state = COMPOSITE_STATE_IN_PROGRESS; + result->event_ctx = event_ctx; + + state = talloc(result, struct connect_multi_state); + if (state == NULL) goto failed; + state->ctx = result; + result->private_data = state; + + state->server_address = talloc_strdup(state, server_address); + if (state->server_address == NULL) goto failed; + + state->num_ports = num_server_ports; + state->ports = talloc_array(state, uint16_t, state->num_ports); + if (state->ports == NULL) goto failed; + + for (i=0; inum_ports; i++) { + state->ports[i] = server_ports[i]; + } + + state->sockets = + talloc_array(state, struct socket_context *, state->num_ports); + if (state->sockets == NULL) goto failed; + + state->write_events = + talloc_array(state, struct fd_event *, state->num_ports); + if (state->write_events == NULL) goto failed; + + state->num_connects_sent = 0; + state->num_connects_in_fly = 0; + + result->status = connect_multi_next_socket(state); + + if (!NT_STATUS_IS_OK(result->status)) { + composite_trigger_error(result); + return result; + } + + return result; + + failed: + talloc_free(result); + return NULL; +} + +static NTSTATUS connect_multi_next_socket(struct connect_multi_state *state) +{ + NTSTATUS status; + int res, next = state->num_connects_sent; + + status = socket_create("ipv4", SOCKET_TYPE_STREAM, + &state->sockets[next], 0); + if (!NT_STATUS_IS_OK(status)) { + return status; + } + + res = set_blocking(socket_get_fd(state->sockets[next]), False); + if (res != 0) { + return map_nt_error_from_unix(errno); + } + + talloc_steal(state->sockets, state->sockets[next]); + + status = socket_connect(state->sockets[next], NULL, 0, + state->server_address, state->ports[next], 0); + + if (!NT_STATUS_IS_OK(status) && + !NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) { + return status; + } + + state->write_events[next] = + event_add_fd(state->ctx->event_ctx, state->write_events, + socket_get_fd(state->sockets[next]), + EVENT_FD_WRITE, + connect_multi_connect_handler, state); + + if (state->write_events[next] == NULL) { + return NT_STATUS_NO_MEMORY; + } + + state->num_connects_sent += 1; + state->num_connects_in_fly += 1; + + if (state->num_ports > state->num_connects_sent) { + state->next_timeout = + event_add_timed(state->ctx->event_ctx, state, + timeval_current_ofs(0, 2000), + connect_multi_fire_next, state); + if (state->next_timeout == NULL) { + talloc_free(state->sockets[next]); + state->sockets[next] = NULL; + talloc_free(state->write_events[next]); + state->write_events[next] = NULL; + return NT_STATUS_NO_MEMORY; + } + } + + return NT_STATUS_OK; +} + +static void connect_multi_fire_next(struct event_context *ev, + struct timed_event *te, + struct timeval tv, void *p) +{ + struct connect_multi_state *state = + talloc_get_type(p, struct connect_multi_state); + + state->ctx->status = connect_multi_next_socket(state); + if (!composite_is_ok(state->ctx)) return; +} + +static void connect_multi_connect_handler(struct event_context *ev, + struct fd_event *fde, + uint16_t flags, void *p) +{ + struct connect_multi_state *state = + talloc_get_type(p, struct connect_multi_state); + int i; + + for (i=0; inum_connects_sent; i++) { + if (fde == state->write_events[i]) { + break; + } + } + + if (i == state->num_connects_sent) { + composite_error(state->ctx, NT_STATUS_INTERNAL_ERROR); + return; + } + + state->num_connects_in_fly -= 1; + + state->ctx->status = socket_connect_complete(state->sockets[i], 0); + if (NT_STATUS_IS_OK(state->ctx->status)) { + state->result = talloc_steal(state, state->sockets[i]); + state->result_port = state->ports[i]; + talloc_free(state->sockets); + state->sockets = NULL; + talloc_free(state->write_events); + state->write_events = NULL; + composite_done(state->ctx); + return; + } + + talloc_free(state->sockets[i]); + state->sockets[i] = NULL; + + if ((state->num_connects_in_fly == 0) && + (state->num_connects_sent == state->num_ports)) { + composite_error(state->ctx, state->ctx->status); + return; + } + + if (state->num_connects_in_fly != 0) { + /* Waiting for something to happen on the net or the next + * timeout to trigger */ + return; + } + + SMB_ASSERT(state->num_connects_sent < state->num_ports); + SMB_ASSERT(state->next_timeout != NULL); + + /* There are ports left but nothing on the net, so trigger the next + * one immediately. */ + talloc_free(state->next_timeout); + state->next_timeout = + event_add_timed(state->ctx->event_ctx, state, timeval_zero(), + connect_multi_fire_next, state); + if (composite_nomem(state->next_timeout, state->ctx)) return; +} + +NTSTATUS socket_connect_multi_recv(struct composite_context *ctx, + TALLOC_CTX *mem_ctx, + struct socket_context **result, + uint16_t *port) +{ + NTSTATUS status = composite_wait(ctx); + if (NT_STATUS_IS_OK(status)) { + struct connect_multi_state *state = + talloc_get_type(ctx->private_data, + struct connect_multi_state); + *result = talloc_steal(mem_ctx, state->result); + *port = state->result_port; + } + talloc_free(ctx); + return status; +} + +NTSTATUS socket_connect_multi(TALLOC_CTX *mem_ctx, + const char *server_address, + int num_server_ports, uint16_t *server_ports, + struct event_context *event_ctx, + struct socket_context **result, + uint16_t *result_port) +{ + struct composite_context *ctx = + socket_connect_multi_send(mem_ctx, server_address, + num_server_ports, server_ports, + event_ctx); + return socket_connect_multi_recv(ctx, mem_ctx, result, result_port); +} -- cgit From eeb093f6a96221cc4c79cd311fac0d1326f2a0c9 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 21 Nov 2005 09:20:32 +0000 Subject: r11822: reworked the socket_connect_multi() code so it is built on top of socket_connect_send() rather than the lower level socket code. Also simplified the state structures a fair bit, and added name resolution, fixing a bug where the multi-port connect code did a separate name resolution for each port being tried. (This used to be commit 3e6888156c1b2d24fe0d46940773560d219498b3) --- source4/lib/socket/connect_multi.c | 293 +++++++++++++++++++------------------ 1 file changed, 149 insertions(+), 144 deletions(-) (limited to 'source4/lib/socket/connect_multi.c') diff --git a/source4/lib/socket/connect_multi.c b/source4/lib/socket/connect_multi.c index 2724601ad0..c52beaf4d0 100644 --- a/source4/lib/socket/connect_multi.c +++ b/source4/lib/socket/connect_multi.c @@ -26,31 +26,43 @@ #include "lib/socket/socket.h" #include "lib/events/events.h" #include "libcli/composite/composite.h" +#include "librpc/gen_ndr/nbt.h" +#define MULTI_PORT_DELAY 2000 /* microseconds */ +/* + overall state +*/ struct connect_multi_state { - struct composite_context *ctx; const char *server_address; int num_ports; uint16_t *ports; - struct socket_context *result; + struct socket_context *sock; uint16_t result_port; - int num_connects_sent, num_connects_in_fly; - struct fd_event **write_events; - struct socket_context **sockets; - struct timed_event *next_timeout; + int num_connects_sent, num_connects_recv; +}; + +/* + state of an individual socket_connect_send() call +*/ +struct connect_one_state { + struct composite_context *result; + struct socket_context *sock; + uint16_t port; }; -static void connect_multi_connect_handler(struct event_context *ev, - struct fd_event *fde, - uint16_t flags, void *p); -static NTSTATUS connect_multi_next_socket(struct connect_multi_state *state); -static void connect_multi_fire_next(struct event_context *ev, +static void continue_resolve_name(struct composite_context *creq); +static void connect_multi_timer(struct event_context *ev, struct timed_event *te, struct timeval tv, void *p); +static void connect_multi_next_socket(struct composite_context *result); +static void continue_one(struct composite_context *creq); +/* + setup an async socket_connect, with multiple ports +*/ struct composite_context *socket_connect_multi_send(TALLOC_CTX *mem_ctx, const char *server_address, int num_server_ports, @@ -58,194 +70,187 @@ struct composite_context *socket_connect_multi_send(TALLOC_CTX *mem_ctx, struct event_context *event_ctx) { struct composite_context *result; - struct connect_multi_state *state; + struct connect_multi_state *multi; int i; result = talloc_zero(mem_ctx, struct composite_context); - if (result == NULL) goto failed; + if (result == NULL) return NULL; result->state = COMPOSITE_STATE_IN_PROGRESS; result->event_ctx = event_ctx; - state = talloc(result, struct connect_multi_state); - if (state == NULL) goto failed; - state->ctx = result; - result->private_data = state; + multi = talloc_zero(result, struct connect_multi_state); + if (composite_nomem(multi, result)) goto failed; + result->private_data = multi; - state->server_address = talloc_strdup(state, server_address); - if (state->server_address == NULL) goto failed; + multi->server_address = talloc_strdup(multi, server_address); + if (composite_nomem(multi->server_address, result)) goto failed; - state->num_ports = num_server_ports; - state->ports = talloc_array(state, uint16_t, state->num_ports); - if (state->ports == NULL) goto failed; + multi->num_ports = num_server_ports; + multi->ports = talloc_array(multi, uint16_t, multi->num_ports); + if (composite_nomem(multi->ports, result)) goto failed; - for (i=0; inum_ports; i++) { - state->ports[i] = server_ports[i]; + for (i=0; inum_ports; i++) { + multi->ports[i] = server_ports[i]; } - state->sockets = - talloc_array(state, struct socket_context *, state->num_ports); - if (state->sockets == NULL) goto failed; - - state->write_events = - talloc_array(state, struct fd_event *, state->num_ports); - if (state->write_events == NULL) goto failed; - - state->num_connects_sent = 0; - state->num_connects_in_fly = 0; + if (!is_ipaddress(server_address)) { + /* + we don't want to do the name resolution separately + for each port, so start it now, then only start on + the real sockets once we have an IP + */ + struct nbt_name name; + struct composite_context *creq; + make_nbt_name_client(&name, server_address); + 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; + } - result->status = connect_multi_next_socket(state); + /* now we've setup the state we can process the first socket */ + connect_multi_next_socket(result); if (!NT_STATUS_IS_OK(result->status)) { - composite_trigger_error(result); - return result; + goto failed; } return result; failed: - talloc_free(result); - return NULL; + composite_trigger_error(result); + return result; } -static NTSTATUS connect_multi_next_socket(struct connect_multi_state *state) +/* + start connecting to the next socket/port in the list +*/ +static void connect_multi_next_socket(struct composite_context *result) { - NTSTATUS status; - int res, next = state->num_connects_sent; - - status = socket_create("ipv4", SOCKET_TYPE_STREAM, - &state->sockets[next], 0); - if (!NT_STATUS_IS_OK(status)) { - return status; + struct connect_multi_state *multi = talloc_get_type(result->private_data, + struct connect_multi_state); + struct connect_one_state *state; + struct composite_context *creq; + int next = multi->num_connects_sent; + + if (next == multi->num_ports) { + /* don't do anything, just wait for the existing ones to finish */ + return; } - res = set_blocking(socket_get_fd(state->sockets[next]), False); - if (res != 0) { - return map_nt_error_from_unix(errno); - } + multi->num_connects_sent += 1; - talloc_steal(state->sockets, state->sockets[next]); + state = talloc(multi, struct connect_one_state); + if (composite_nomem(state, result)) return; - status = socket_connect(state->sockets[next], NULL, 0, - state->server_address, state->ports[next], 0); + state->result = result; + state->port = multi->ports[next]; - if (!NT_STATUS_IS_OK(status) && - !NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) { - return status; - } - - state->write_events[next] = - event_add_fd(state->ctx->event_ctx, state->write_events, - socket_get_fd(state->sockets[next]), - EVENT_FD_WRITE, - connect_multi_connect_handler, state); - - if (state->write_events[next] == NULL) { - return NT_STATUS_NO_MEMORY; - } + result->status = socket_create("ipv4", SOCKET_TYPE_STREAM, &state->sock, 0); + if (!composite_is_ok(result)) return; - state->num_connects_sent += 1; - state->num_connects_in_fly += 1; - - if (state->num_ports > state->num_connects_sent) { - state->next_timeout = - event_add_timed(state->ctx->event_ctx, state, - timeval_current_ofs(0, 2000), - connect_multi_fire_next, state); - if (state->next_timeout == NULL) { - talloc_free(state->sockets[next]); - state->sockets[next] = NULL; - talloc_free(state->write_events[next]); - state->write_events[next] = NULL; - return NT_STATUS_NO_MEMORY; - } - } + talloc_steal(state, state->sock); + + creq = socket_connect_send(state->sock, NULL, 0, + multi->server_address, state->port, 0, result->event_ctx); + if (composite_nomem(creq, result)) return; + + composite_continue(result, creq, continue_one, state); - return NT_STATUS_OK; + /* if there are more ports to go then setup a timer to fire when we have waited + for a couple of milli-seconds, when that goes off we try the next port regardless + of whether this port has completed */ + if (multi->num_ports > multi->num_connects_sent) { + /* note that this timer is a child of the single + connect attempt state, so it will go away when this + request completes */ + event_add_timed(result->event_ctx, state, + timeval_current_ofs(0, MULTI_PORT_DELAY), + connect_multi_timer, result); + } } -static void connect_multi_fire_next(struct event_context *ev, - struct timed_event *te, - struct timeval tv, void *p) +/* + a timer has gone off telling us that we should try the next port +*/ +static void connect_multi_timer(struct event_context *ev, + struct timed_event *te, + struct timeval tv, void *p) { - struct connect_multi_state *state = - talloc_get_type(p, struct connect_multi_state); - - state->ctx->status = connect_multi_next_socket(state); - if (!composite_is_ok(state->ctx)) return; + struct composite_context *result = talloc_get_type(p, struct composite_context); + connect_multi_next_socket(result); } -static void connect_multi_connect_handler(struct event_context *ev, - struct fd_event *fde, - uint16_t flags, void *p) + +/* + recv name resolution reply then send the next connect +*/ +static void continue_resolve_name(struct composite_context *creq) { - struct connect_multi_state *state = - talloc_get_type(p, struct connect_multi_state); - int i; + struct composite_context *result = talloc_get_type(creq->async.private_data, + struct composite_context); + struct connect_multi_state *multi = talloc_get_type(result->private_data, + struct connect_multi_state); + const char *addr; - for (i=0; inum_connects_sent; i++) { - if (fde == state->write_events[i]) { - break; - } - } + result->status = resolve_name_recv(creq, multi, &addr); + if (!composite_is_ok(result)) return; - if (i == state->num_connects_sent) { - composite_error(state->ctx, NT_STATUS_INTERNAL_ERROR); - return; - } + multi->server_address = addr; - state->num_connects_in_fly -= 1; - - state->ctx->status = socket_connect_complete(state->sockets[i], 0); - if (NT_STATUS_IS_OK(state->ctx->status)) { - state->result = talloc_steal(state, state->sockets[i]); - state->result_port = state->ports[i]; - talloc_free(state->sockets); - state->sockets = NULL; - talloc_free(state->write_events); - state->write_events = NULL; - composite_done(state->ctx); - return; - } + connect_multi_next_socket(result); +} + +/* + one of our socket_connect_send() calls hash finished. If it got a + connection or there are none left then we are done +*/ +static void continue_one(struct composite_context *creq) +{ + struct connect_one_state *state = talloc_get_type(creq->async.private_data, + struct connect_one_state); + struct composite_context *result = state->result; + struct connect_multi_state *multi = talloc_get_type(result->private_data, + struct connect_multi_state); + NTSTATUS status; + multi->num_connects_recv++; - talloc_free(state->sockets[i]); - state->sockets[i] = NULL; + status = socket_connect_recv(creq); - if ((state->num_connects_in_fly == 0) && - (state->num_connects_sent == state->num_ports)) { - composite_error(state->ctx, state->ctx->status); - return; + if (NT_STATUS_IS_OK(status)) { + multi->sock = talloc_steal(multi, state->sock); + multi->result_port = state->port; } - if (state->num_connects_in_fly != 0) { - /* Waiting for something to happen on the net or the next - * timeout to trigger */ + talloc_free(state); + + if (NT_STATUS_IS_OK(status) || + multi->num_connects_recv == multi->num_ports) { + result->status = status; + composite_done(result); return; } - SMB_ASSERT(state->num_connects_sent < state->num_ports); - SMB_ASSERT(state->next_timeout != NULL); - - /* There are ports left but nothing on the net, so trigger the next - * one immediately. */ - talloc_free(state->next_timeout); - state->next_timeout = - event_add_timed(state->ctx->event_ctx, state, timeval_zero(), - connect_multi_fire_next, state); - if (composite_nomem(state->next_timeout, state->ctx)) return; + /* try the next port */ + connect_multi_next_socket(result); } +/* + async recv routine for socket_connect_multi() + */ NTSTATUS socket_connect_multi_recv(struct composite_context *ctx, TALLOC_CTX *mem_ctx, - struct socket_context **result, + struct socket_context **sock, uint16_t *port) { NTSTATUS status = composite_wait(ctx); if (NT_STATUS_IS_OK(status)) { - struct connect_multi_state *state = + struct connect_multi_state *multi = talloc_get_type(ctx->private_data, struct connect_multi_state); - *result = talloc_steal(mem_ctx, state->result); - *port = state->result_port; + *sock = talloc_steal(mem_ctx, multi->sock); + *port = multi->result_port; } talloc_free(ctx); return status; -- cgit From 93e83f4086384908107aea16d6df4819b4970f67 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 21 Nov 2005 09:31:36 +0000 Subject: r11823: make the socket_connect_send() context a child of the local state this fixes a valgrind error (This used to be commit db9c0887bd24de4d81b5afa2ff096b3ba65c9720) --- source4/lib/socket/connect_multi.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/lib/socket/connect_multi.c') diff --git a/source4/lib/socket/connect_multi.c b/source4/lib/socket/connect_multi.c index c52beaf4d0..3948c1e2a1 100644 --- a/source4/lib/socket/connect_multi.c +++ b/source4/lib/socket/connect_multi.c @@ -155,6 +155,7 @@ static void connect_multi_next_socket(struct composite_context *result) creq = socket_connect_send(state->sock, NULL, 0, multi->server_address, state->port, 0, result->event_ctx); if (composite_nomem(creq, result)) return; + talloc_steal(state, creq); composite_continue(result, creq, continue_one, state); -- cgit From 111a920fdb92ccef32f89b2f992bdd3051e5ac54 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell 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_multi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/lib/socket/connect_multi.c') diff --git a/source4/lib/socket/connect_multi.c b/source4/lib/socket/connect_multi.c index 3948c1e2a1..258560cec5 100644 --- a/source4/lib/socket/connect_multi.c +++ b/source4/lib/socket/connect_multi.c @@ -119,7 +119,7 @@ struct composite_context *socket_connect_multi_send(TALLOC_CTX *mem_ctx, return result; failed: - composite_trigger_error(result); + composite_error(result, result->status); return result; } -- cgit From d4de4c2d210d2e8c9b5aedf70695594809ad6a0b Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij 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_multi.c | 1 - 1 file changed, 1 deletion(-) (limited to 'source4/lib/socket/connect_multi.c') diff --git a/source4/lib/socket/connect_multi.c b/source4/lib/socket/connect_multi.c index 258560cec5..6a90ef9a05 100644 --- a/source4/lib/socket/connect_multi.c +++ b/source4/lib/socket/connect_multi.c @@ -26,7 +26,6 @@ #include "lib/socket/socket.h" #include "lib/events/events.h" #include "libcli/composite/composite.h" -#include "librpc/gen_ndr/nbt.h" #define MULTI_PORT_DELAY 2000 /* microseconds */ -- cgit From f55ea8bb3dca868e21663cd90eaea7a35cd7886c Mon Sep 17 00:00:00 2001 From: Andrew Bartlett 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_multi.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'source4/lib/socket/connect_multi.c') diff --git a/source4/lib/socket/connect_multi.c b/source4/lib/socket/connect_multi.c index 6a90ef9a05..7396435075 100644 --- a/source4/lib/socket/connect_multi.c +++ b/source4/lib/socket/connect_multi.c @@ -49,7 +49,7 @@ struct connect_multi_state { struct connect_one_state { struct composite_context *result; struct socket_context *sock; - uint16_t port; + struct socket_address *addr; }; static void continue_resolve_name(struct composite_context *creq); @@ -144,15 +144,18 @@ static void connect_multi_next_socket(struct composite_context *result) if (composite_nomem(state, result)) return; state->result = result; - state->port = multi->ports[next]; - result->status = socket_create("ipv4", SOCKET_TYPE_STREAM, &state->sock, 0); if (!composite_is_ok(result)) return; + /* Form up the particular address we are interested in */ + state->addr = socket_address_from_strings(state, state->sock->backend_name, + multi->server_address, multi->ports[next]); + if (composite_nomem(state->addr, result)) return; + talloc_steal(state, state->sock); - creq = socket_connect_send(state->sock, NULL, 0, - multi->server_address, state->port, 0, result->event_ctx); + creq = socket_connect_send(state->sock, NULL, + state->addr, 0, result->event_ctx); if (composite_nomem(creq, result)) return; talloc_steal(state, creq); @@ -220,7 +223,7 @@ static void continue_one(struct composite_context *creq) if (NT_STATUS_IS_OK(status)) { multi->sock = talloc_steal(multi, state->sock); - multi->result_port = state->port; + multi->result_port = state->addr->port; } talloc_free(state); -- cgit From 4ac2be99588b48b0652a524bf12fb1aa9c3f5fbb Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij 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_multi.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/lib/socket/connect_multi.c') diff --git a/source4/lib/socket/connect_multi.c b/source4/lib/socket/connect_multi.c index 7396435075..9f060767af 100644 --- a/source4/lib/socket/connect_multi.c +++ b/source4/lib/socket/connect_multi.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" #define MULTI_PORT_DELAY 2000 /* microseconds */ -- cgit From 1f5a8f892ff09f2633610c0f520d96f892674933 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 30 Apr 2006 00:40:04 +0000 Subject: r15344: Fix shared library build (This used to be commit 7113a16309a83225f3ab6ccbfe48778ae8fc52e8) --- source4/lib/socket/connect_multi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/lib/socket/connect_multi.c') diff --git a/source4/lib/socket/connect_multi.c b/source4/lib/socket/connect_multi.c index 9f060767af..6c3c6a5a66 100644 --- a/source4/lib/socket/connect_multi.c +++ b/source4/lib/socket/connect_multi.c @@ -63,7 +63,7 @@ static void continue_one(struct composite_context *creq); /* setup an async socket_connect, with multiple ports */ -struct composite_context *socket_connect_multi_send(TALLOC_CTX *mem_ctx, +_PUBLIC_ struct composite_context *socket_connect_multi_send(TALLOC_CTX *mem_ctx, const char *server_address, int num_server_ports, uint16_t *server_ports, @@ -243,7 +243,7 @@ static void continue_one(struct composite_context *creq) /* async recv routine for socket_connect_multi() */ -NTSTATUS socket_connect_multi_recv(struct composite_context *ctx, +_PUBLIC_ NTSTATUS socket_connect_multi_recv(struct composite_context *ctx, TALLOC_CTX *mem_ctx, struct socket_context **sock, uint16_t *port) -- cgit From 0479a2f1cbae51fcd8dbdc3c148c808421fb4d25 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell 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_multi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'source4/lib/socket/connect_multi.c') diff --git a/source4/lib/socket/connect_multi.c b/source4/lib/socket/connect_multi.c index 6c3c6a5a66..76e5034a58 100644 --- a/source4/lib/socket/connect_multi.c +++ b/source4/lib/socket/connect_multi.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 . */ #include "includes.h" -- cgit From 959915a8cbea0c598ef1f29ce666329a521ef2f6 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 7 Sep 2007 15:35:18 +0000 Subject: r25001: Fix more C++ and other warnings, fix some of the indentation with ts=4 lines that I accidently added earlier. (This used to be commit 0bcb21ed740fcec0f48ad36bbc2deee2948e8fc7) --- source4/lib/socket/connect_multi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source4/lib/socket/connect_multi.c') diff --git a/source4/lib/socket/connect_multi.c b/source4/lib/socket/connect_multi.c index 76e5034a58..6bf7ca4d3e 100644 --- a/source4/lib/socket/connect_multi.c +++ b/source4/lib/socket/connect_multi.c @@ -62,7 +62,8 @@ static void continue_one(struct composite_context *creq); /* setup an async socket_connect, with multiple ports */ -_PUBLIC_ struct composite_context *socket_connect_multi_send(TALLOC_CTX *mem_ctx, +_PUBLIC_ struct composite_context *socket_connect_multi_send( + TALLOC_CTX *mem_ctx, const char *server_address, int num_server_ports, uint16_t *server_ports, -- cgit From ffeee68e4b72dd94fee57366bd8d38b8c284c3d4 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij 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_multi.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/lib/socket/connect_multi.c') diff --git a/source4/lib/socket/connect_multi.c b/source4/lib/socket/connect_multi.c index 6bf7ca4d3e..445a1da782 100644 --- a/source4/lib/socket/connect_multi.c +++ b/source4/lib/socket/connect_multi.c @@ -26,6 +26,7 @@ #include "lib/events/events.h" #include "libcli/composite/composite.h" #include "libcli/resolve/resolve.h" +#include "param/param.h" #define MULTI_PORT_DELAY 2000 /* microseconds */ -- cgit From 37d53832a4623653f706e77985a79d84bd7c6694 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij 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_multi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/lib/socket/connect_multi.c') diff --git a/source4/lib/socket/connect_multi.c b/source4/lib/socket/connect_multi.c index 445a1da782..6d30141459 100644 --- a/source4/lib/socket/connect_multi.c +++ b/source4/lib/socket/connect_multi.c @@ -104,7 +104,7 @@ _PUBLIC_ struct composite_context *socket_connect_multi_send( struct composite_context *creq; make_nbt_name_client(&name, server_address); creq = resolve_name_send(&name, result->event_ctx, - lp_name_resolve_order()); + lp_name_resolve_order(global_loadparm)); if (composite_nomem(creq, result)) goto failed; composite_continue(result, creq, continue_resolve_name, result); return result; -- cgit From 01d2acfdb4c4c0349a28a18c5c0da5b960b02791 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij 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_multi.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'source4/lib/socket/connect_multi.c') diff --git a/source4/lib/socket/connect_multi.c b/source4/lib/socket/connect_multi.c index 6d30141459..58ab673965 100644 --- a/source4/lib/socket/connect_multi.c +++ b/source4/lib/socket/connect_multi.c @@ -38,6 +38,8 @@ struct connect_multi_state { int num_ports; uint16_t *ports; + const char **name_resolve_order; + struct socket_context *sock; uint16_t result_port; @@ -68,6 +70,7 @@ _PUBLIC_ struct composite_context *socket_connect_multi_send( const char *server_address, int num_server_ports, uint16_t *server_ports, + const char **name_resolve_order, struct event_context *event_ctx) { struct composite_context *result; @@ -87,6 +90,7 @@ _PUBLIC_ struct composite_context *socket_connect_multi_send( if (composite_nomem(multi->server_address, result)) goto failed; multi->num_ports = num_server_ports; + multi->name_resolve_order = str_list_copy(multi, name_resolve_order); multi->ports = talloc_array(multi, uint16_t, multi->num_ports); if (composite_nomem(multi->ports, result)) goto failed; @@ -104,7 +108,7 @@ _PUBLIC_ struct composite_context *socket_connect_multi_send( struct composite_context *creq; make_nbt_name_client(&name, server_address); creq = resolve_name_send(&name, result->event_ctx, - lp_name_resolve_order(global_loadparm)); + name_resolve_order); if (composite_nomem(creq, result)) goto failed; composite_continue(result, creq, continue_resolve_name, result); return result; @@ -157,7 +161,8 @@ static void connect_multi_next_socket(struct composite_context *result) talloc_steal(state, state->sock); creq = socket_connect_send(state->sock, NULL, - state->addr, 0, result->event_ctx); + state->addr, 0, multi->name_resolve_order, + result->event_ctx); if (composite_nomem(creq, result)) return; talloc_steal(state, creq); @@ -264,6 +269,7 @@ _PUBLIC_ NTSTATUS socket_connect_multi_recv(struct composite_context *ctx, NTSTATUS socket_connect_multi(TALLOC_CTX *mem_ctx, const char *server_address, int num_server_ports, uint16_t *server_ports, + const char **name_resolve_order, struct event_context *event_ctx, struct socket_context **result, uint16_t *result_port) @@ -271,6 +277,7 @@ NTSTATUS socket_connect_multi(TALLOC_CTX *mem_ctx, struct composite_context *ctx = socket_connect_multi_send(mem_ctx, server_address, num_server_ports, server_ports, + name_resolve_order, event_ctx); return socket_connect_multi_recv(ctx, mem_ctx, result, result_port); } -- cgit From 5f4842cf65ce64bfdf577cd549565da20ca818cf Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij 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_multi.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'source4/lib/socket/connect_multi.c') diff --git a/source4/lib/socket/connect_multi.c b/source4/lib/socket/connect_multi.c index 58ab673965..2f736a4b05 100644 --- a/source4/lib/socket/connect_multi.c +++ b/source4/lib/socket/connect_multi.c @@ -38,7 +38,7 @@ struct connect_multi_state { int num_ports; uint16_t *ports; - const char **name_resolve_order; + struct resolve_context *resolve_ctx; struct socket_context *sock; uint16_t result_port; @@ -70,7 +70,7 @@ _PUBLIC_ struct composite_context *socket_connect_multi_send( const char *server_address, int num_server_ports, uint16_t *server_ports, - const char **name_resolve_order, + struct resolve_context *resolve_ctx, struct event_context *event_ctx) { struct composite_context *result; @@ -90,7 +90,7 @@ _PUBLIC_ struct composite_context *socket_connect_multi_send( if (composite_nomem(multi->server_address, result)) goto failed; multi->num_ports = num_server_ports; - multi->name_resolve_order = str_list_copy(multi, name_resolve_order); + multi->resolve_ctx = talloc_reference(multi, resolve_ctx); multi->ports = talloc_array(multi, uint16_t, multi->num_ports); if (composite_nomem(multi->ports, result)) goto failed; @@ -107,8 +107,7 @@ _PUBLIC_ struct composite_context *socket_connect_multi_send( struct nbt_name name; struct composite_context *creq; make_nbt_name_client(&name, server_address); - creq = resolve_name_send(&name, result->event_ctx, - name_resolve_order); + creq = resolve_name_send(resolve_ctx, &name, result->event_ctx); if (composite_nomem(creq, result)) goto failed; composite_continue(result, creq, continue_resolve_name, result); return result; @@ -161,7 +160,7 @@ static void connect_multi_next_socket(struct composite_context *result) talloc_steal(state, state->sock); creq = socket_connect_send(state->sock, NULL, - state->addr, 0, multi->name_resolve_order, + state->addr, 0, multi->resolve_ctx, result->event_ctx); if (composite_nomem(creq, result)) return; talloc_steal(state, creq); @@ -269,7 +268,7 @@ _PUBLIC_ NTSTATUS socket_connect_multi_recv(struct composite_context *ctx, NTSTATUS socket_connect_multi(TALLOC_CTX *mem_ctx, const char *server_address, int num_server_ports, uint16_t *server_ports, - const char **name_resolve_order, + struct resolve_context *resolve_ctx, struct event_context *event_ctx, struct socket_context **result, uint16_t *result_port) @@ -277,7 +276,7 @@ NTSTATUS socket_connect_multi(TALLOC_CTX *mem_ctx, struct composite_context *ctx = socket_connect_multi_send(mem_ctx, server_address, num_server_ports, server_ports, - name_resolve_order, + resolve_ctx, event_ctx); return socket_connect_multi_recv(ctx, mem_ctx, result, result_port); } -- cgit