[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Sun Mar 7 10:33:47 MST 2010
The branch, master has been updated
via ae049c4... s4:libcli/wrepl: rewrite the low level request handling to use tevent_queue and tstream_context
via acd3a27... s4:wrepl_out_helpers: add a WREPLSRV_PUSH_NOTIFY_STAGE_WAIT_UPDATE stage
from 8c16d5e... s4:libcli/wrepl: add wrepl_socket_is_connected()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ae049c49df88fcbcce490cd81361912e67775b12
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Mar 5 18:30:10 2010 +0100
s4:libcli/wrepl: rewrite the low level request handling to use tevent_queue and tstream_context
metze
commit acd3a2729e02d765e31166c3211c3f3fcc3c6252
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Mar 7 16:59:12 2010 +0100
s4:wrepl_out_helpers: add a WREPLSRV_PUSH_NOTIFY_STAGE_WAIT_UPDATE stage
This makes the logic more consistent.
metze
-----------------------------------------------------------------------
Summary of changes:
source4/libcli/config.mk | 2 +-
source4/libcli/wrepl/winsrepl.c | 733 ++++++++++++----------------
source4/libcli/wrepl/winsrepl.h | 34 +--
source4/smbd/service_stream.c | 13 +-
source4/wrepl_server/wrepl_in_call.c | 37 +-
source4/wrepl_server/wrepl_in_connection.c | 18 +-
source4/wrepl_server/wrepl_out_helpers.c | 92 ++--
7 files changed, 371 insertions(+), 558 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index 68d4b74..716e23b 100644
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -58,7 +58,7 @@ LIBCLI_DGRAM_OBJ_FILES = $(addprefix $(libclisrcdir)/dgram/, \
browse.o)
[SUBSYSTEM::LIBCLI_WREPL]
-PUBLIC_DEPENDENCIES = NDR_WINSREPL samba_socket LIBEVENTS LIBPACKET UTIL_TEVENT
+PUBLIC_DEPENDENCIES = NDR_WINSREPL LIBEVENTS UTIL_TEVENT LIBTSOCKET LIBSAMBA_TSOCKET
LIBCLI_WREPL_OBJ_FILES = $(libclisrcdir)/wrepl/winsrepl.o
diff --git a/source4/libcli/wrepl/winsrepl.c b/source4/libcli/wrepl/winsrepl.c
index 5a5719f..380c79a 100644
--- a/source4/libcli/wrepl/winsrepl.c
+++ b/source4/libcli/wrepl/winsrepl.c
@@ -23,83 +23,34 @@
#include "includes.h"
#include "lib/events/events.h"
#include "../lib/util/dlinklist.h"
-#include "lib/socket/socket.h"
#include "libcli/wrepl/winsrepl.h"
#include "librpc/gen_ndr/ndr_winsrepl.h"
#include "lib/stream/packet.h"
-#include "libcli/composite/composite.h"
#include "system/network.h"
#include "lib/socket/netif.h"
#include "param/param.h"
#include "lib/util/tevent_ntstatus.h"
-
-enum wrepl_request_internal_state {
- WREPL_REQUEST_INIT = 0,
- WREPL_REQUEST_RECV = 1,
- WREPL_REQUEST_DONE = 2,
- WREPL_REQUEST_ERROR = 3
-};
+#include "lib/tsocket/tsocket.h"
+#include "libcli/util/tstream.h"
/*
- a WINS replication request
+ main context structure for the wins replication client library
*/
-struct wrepl_request {
- struct wrepl_request *next, *prev;
- struct wrepl_socket *wrepl_socket;
-
- enum wrepl_request_internal_state state;
- bool trigger;
- NTSTATUS status;
-
- struct tevent_timer *te;
-
- struct wrepl_packet *packet;
-
+struct wrepl_socket {
struct {
- void (*fn)(struct wrepl_request *);
- void *private_data;
- } async;
-};
-
-static struct wrepl_request *wrepl_request_finished(struct wrepl_request *req, NTSTATUS status);
+ struct tevent_context *ctx;
+ } event;
-/*
- mark all pending requests as dead - called when a socket error happens
-*/
-static void wrepl_socket_dead(struct wrepl_socket *wrepl_socket, NTSTATUS status)
-{
- wrepl_socket->dead = true;
-
- if (wrepl_socket->packet) {
- packet_recv_disable(wrepl_socket->packet);
- packet_set_fde(wrepl_socket->packet, NULL);
- packet_set_socket(wrepl_socket->packet, NULL);
- }
-
- if (wrepl_socket->event.fde) {
- talloc_free(wrepl_socket->event.fde);
- wrepl_socket->event.fde = NULL;
- }
+ /* the default timeout for requests, 0 means no timeout */
+#define WREPL_SOCKET_REQUEST_TIMEOUT (60)
+ uint32_t request_timeout;
- if (wrepl_socket->sock) {
- talloc_free(wrepl_socket->sock);
- wrepl_socket->sock = NULL;
- }
+ struct smb_iconv_convenience *iconv_convenience;
- if (NT_STATUS_EQUAL(NT_STATUS_UNSUCCESSFUL, status)) {
- status = NT_STATUS_UNEXPECTED_NETWORK_ERROR;
- }
- while (wrepl_socket->recv_queue) {
- struct wrepl_request *req = wrepl_socket->recv_queue;
- DLIST_REMOVE(wrepl_socket->recv_queue, req);
- wrepl_request_finished(req, status);
- }
+ struct tevent_queue *request_queue;
- talloc_set_destructor(wrepl_socket, NULL);
- if (wrepl_socket->free_skipped) {
- talloc_free(wrepl_socket);
- }
-}
+ struct tstream_context *stream;
+};
bool wrepl_socket_is_connected(struct wrepl_socket *wrepl_sock)
{
@@ -107,131 +58,43 @@ bool wrepl_socket_is_connected(struct wrepl_socket *wrepl_sock)
return false;
}
- if (wrepl_sock->dead) {
- return false;
- }
-
- if (!wrepl_sock->sock) {
+ if (!wrepl_sock->stream) {
return false;
}
return true;
}
-static void wrepl_request_timeout_handler(struct tevent_context *ev, struct tevent_timer *te,
- struct timeval t, void *ptr)
-{
- struct wrepl_request *req = talloc_get_type(ptr, struct wrepl_request);
- wrepl_socket_dead(req->wrepl_socket, NT_STATUS_IO_TIMEOUT);
-}
-
-/*
- handle recv events
-*/
-static NTSTATUS wrepl_finish_recv(void *private_data, DATA_BLOB packet_blob_in)
-{
- struct wrepl_socket *wrepl_socket = talloc_get_type(private_data, struct wrepl_socket);
- struct wrepl_request *req = wrepl_socket->recv_queue;
- DATA_BLOB blob;
- enum ndr_err_code ndr_err;
-
- if (!req) {
- DEBUG(1,("Received unexpected WINS packet of length %u!\n",
- (unsigned)packet_blob_in.length));
- return NT_STATUS_INVALID_NETWORK_RESPONSE;
- }
-
- req->packet = talloc(req, struct wrepl_packet);
- NT_STATUS_HAVE_NO_MEMORY(req->packet);
-
- blob.data = packet_blob_in.data + 4;
- blob.length = packet_blob_in.length - 4;
-
- /* we have a full request - parse it */
- ndr_err = ndr_pull_struct_blob(&blob, req->packet, wrepl_socket->iconv_convenience, req->packet,
- (ndr_pull_flags_fn_t)ndr_pull_wrepl_packet);
- if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
- NTSTATUS status = ndr_map_error2ntstatus(ndr_err);
- wrepl_request_finished(req, status);
- return NT_STATUS_OK;
- }
-
- if (DEBUGLVL(10)) {
- DEBUG(10,("Received WINS packet of length %u\n",
- (unsigned)packet_blob_in.length));
- NDR_PRINT_DEBUG(wrepl_packet, req->packet);
- }
-
- wrepl_request_finished(req, NT_STATUS_OK);
- return NT_STATUS_OK;
-}
-
-/*
- handler for winrepl events
-*/
-static void wrepl_handler(struct tevent_context *ev, struct tevent_fd *fde,
- uint16_t flags, void *private_data)
-{
- struct wrepl_socket *wrepl_socket = talloc_get_type(private_data,
- struct wrepl_socket);
- if (flags & EVENT_FD_READ) {
- packet_recv(wrepl_socket->packet);
- return;
- }
- if (flags & EVENT_FD_WRITE) {
- packet_queue_run(wrepl_socket->packet);
- }
-}
-
-static void wrepl_error(void *private_data, NTSTATUS status)
-{
- struct wrepl_socket *wrepl_socket = talloc_get_type(private_data,
- struct wrepl_socket);
- wrepl_socket_dead(wrepl_socket, status);
-}
-
-
-/*
- destroy a wrepl_socket destructor
-*/
-static int wrepl_socket_destructor(struct wrepl_socket *sock)
-{
- if (sock->dead) {
- sock->free_skipped = true;
- return -1;
- }
- wrepl_socket_dead(sock, NT_STATUS_LOCAL_DISCONNECT);
- return 0;
-}
-
/*
initialise a wrepl_socket. The event_ctx is optional, if provided then
operations will use that event context
*/
-struct wrepl_socket *wrepl_socket_init(TALLOC_CTX *mem_ctx,
+struct wrepl_socket *wrepl_socket_init(TALLOC_CTX *mem_ctx,
struct tevent_context *event_ctx,
struct smb_iconv_convenience *iconv_convenience)
{
struct wrepl_socket *wrepl_socket;
- NTSTATUS status;
wrepl_socket = talloc_zero(mem_ctx, struct wrepl_socket);
- if (!wrepl_socket) return NULL;
+ if (!wrepl_socket) {
+ return NULL;
+ }
wrepl_socket->event.ctx = event_ctx;
- if (!wrepl_socket->event.ctx) goto failed;
-
- wrepl_socket->iconv_convenience = iconv_convenience;
+ if (!wrepl_socket->event.ctx) {
+ goto failed;
+ }
- status = socket_create("ip", SOCKET_TYPE_STREAM, &wrepl_socket->sock, 0);
- if (!NT_STATUS_IS_OK(status)) goto failed;
+ wrepl_socket->request_queue = tevent_queue_create(wrepl_socket,
+ "wrepl request queue");
+ if (wrepl_socket->request_queue == NULL) {
+ goto failed;
+ }
- talloc_steal(wrepl_socket, wrepl_socket->sock);
+ wrepl_socket->iconv_convenience = iconv_convenience;
wrepl_socket->request_timeout = WREPL_SOCKET_REQUEST_TIMEOUT;
- talloc_set_destructor(wrepl_socket, wrepl_socket_destructor);
-
return wrepl_socket;
failed:
@@ -242,75 +105,37 @@ failed:
/*
initialise a wrepl_socket from an already existing connection
*/
-struct wrepl_socket *wrepl_socket_merge(TALLOC_CTX *mem_ctx,
- struct tevent_context *event_ctx,
- struct socket_context *sock,
- struct packet_context *pack)
+NTSTATUS wrepl_socket_donate_stream(struct wrepl_socket *wrepl_socket,
+ struct tstream_context **stream)
{
- struct wrepl_socket *wrepl_socket;
-
- wrepl_socket = talloc_zero(mem_ctx, struct wrepl_socket);
- if (wrepl_socket == NULL) goto failed;
-
- wrepl_socket->event.ctx = event_ctx;
- if (wrepl_socket->event.ctx == NULL) goto failed;
-
- wrepl_socket->sock = sock;
- talloc_steal(wrepl_socket, wrepl_socket->sock);
-
-
- wrepl_socket->request_timeout = WREPL_SOCKET_REQUEST_TIMEOUT;
-
- wrepl_socket->event.fde = event_add_fd(wrepl_socket->event.ctx, wrepl_socket,
- socket_get_fd(wrepl_socket->sock),
- EVENT_FD_READ,
- wrepl_handler, wrepl_socket);
- if (wrepl_socket->event.fde == NULL) {
- goto failed;
+ if (wrepl_socket->stream) {
+ return NT_STATUS_CONNECTION_ACTIVE;
}
- wrepl_socket->packet = pack;
- talloc_steal(wrepl_socket, wrepl_socket->packet);
- packet_set_private(wrepl_socket->packet, wrepl_socket);
- packet_set_socket(wrepl_socket->packet, wrepl_socket->sock);
- packet_set_callback(wrepl_socket->packet, wrepl_finish_recv);
- packet_set_full_request(wrepl_socket->packet, packet_full_request_u32);
- packet_set_error_handler(wrepl_socket->packet, wrepl_error);
- packet_set_event_context(wrepl_socket->packet, wrepl_socket->event.ctx);
- packet_set_fde(wrepl_socket->packet, wrepl_socket->event.fde);
- packet_set_serialise(wrepl_socket->packet);
-
- talloc_set_destructor(wrepl_socket, wrepl_socket_destructor);
-
- return wrepl_socket;
-
-failed:
- talloc_free(wrepl_socket);
- return NULL;
+ wrepl_socket->stream = talloc_move(wrepl_socket, stream);
+ return NT_STATUS_OK;
}
/*
- destroy a wrepl_request
+ initialise a wrepl_socket from an already existing connection
*/
-static int wrepl_request_destructor(struct wrepl_request *req)
+NTSTATUS wrepl_socket_split_stream(struct wrepl_socket *wrepl_socket,
+ TALLOC_CTX *mem_ctx,
+ struct tstream_context **stream)
{
- if (req->state == WREPL_REQUEST_RECV) {
- DLIST_REMOVE(req->wrepl_socket->recv_queue, req);
+ size_t num_requests;
+
+ if (!wrepl_socket->stream) {
+ return NT_STATUS_CONNECTION_INVALID;
}
- req->state = WREPL_REQUEST_ERROR;
- return 0;
-}
-/*
- wait for a request to complete
-*/
-static NTSTATUS wrepl_request_wait(struct wrepl_request *req)
-{
- NT_STATUS_HAVE_NO_MEMORY(req);
- while (req->state < WREPL_REQUEST_DONE) {
- event_loop_once(req->wrepl_socket->event.ctx);
+ num_requests = tevent_queue_length(wrepl_socket->request_queue);
+ if (num_requests > 0) {
+ return NT_STATUS_CONNECTION_IN_USE;
}
- return req->status;
+
+ *stream = talloc_move(wrepl_socket, &wrepl_socket->stream);
+ return NT_STATUS_OK;
}
const char *wrepl_best_ip(struct loadparm_context *lp_ctx, const char *peer_ip)
@@ -321,10 +146,17 @@ const char *wrepl_best_ip(struct loadparm_context *lp_ctx, const char *peer_ip)
}
struct wrepl_connect_state {
- struct wrepl_socket *wrepl_socket;
+ struct {
+ struct wrepl_socket *wrepl_socket;
+ struct tevent_context *ev;
+ } caller;
+ struct tsocket_address *local_address;
+ struct tsocket_address *remote_address;
+ struct tstream_context *stream;
};
-static void wrepl_connect_handler(struct composite_context *creq);
+static void wrepl_connect_trigger(struct tevent_req *req,
+ void *private_date);
struct tevent_req *wrepl_connect_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
@@ -333,8 +165,8 @@ struct tevent_req *wrepl_connect_send(TALLOC_CTX *mem_ctx,
{
struct tevent_req *req;
struct wrepl_connect_state *state;
- struct composite_context *subreq;
- struct socket_address *peer, *us;
+ int ret;
+ bool ok;
req = tevent_req_create(mem_ctx, &state,
struct wrepl_connect_state);
@@ -342,68 +174,91 @@ struct tevent_req *wrepl_connect_send(TALLOC_CTX *mem_ctx,
return NULL;
}
- state->wrepl_socket = wrepl_socket;
+ state->caller.wrepl_socket = wrepl_socket;
+ state->caller.ev = ev;
- us = socket_address_from_strings(state, wrepl_socket->sock->backend_name,
- our_ip, 0);
- if (tevent_req_nomem(us, req)) {
+ if (wrepl_socket->stream) {
+ tevent_req_nterror(req, NT_STATUS_CONNECTION_ACTIVE);
return tevent_req_post(req, ev);
}
- peer = socket_address_from_strings(state, wrepl_socket->sock->backend_name,
- peer_ip, WINS_REPLICATION_PORT);
- if (tevent_req_nomem(peer, req)) {
+ ret = tsocket_address_inet_from_strings(state, "ipv4",
+ our_ip, 0,
+ &state->local_address);
+ if (ret != 0) {
+ NTSTATUS status = map_nt_error_from_unix(errno);
+ tevent_req_nterror(req, status);
return tevent_req_post(req, ev);
}
- subreq = socket_connect_send(wrepl_socket->sock, us, peer,
- 0, wrepl_socket->event.ctx);
- if (tevent_req_nomem(subreq, req)) {
+ ret = tsocket_address_inet_from_strings(state, "ipv4",
+ peer_ip, WINS_REPLICATION_PORT,
+ &state->remote_address);
+ if (ret != 0) {
+ NTSTATUS status = map_nt_error_from_unix(errno);
+ tevent_req_nterror(req, status);
return tevent_req_post(req, ev);
}
- subreq->async.fn = wrepl_connect_handler;
- subreq->async.private_data = req;
+ ok = tevent_queue_add(wrepl_socket->request_queue,
+ ev,
+ req,
+ wrepl_connect_trigger,
+ NULL);
+ if (!ok) {
+ tevent_req_nomem(NULL, req);
+ return tevent_req_post(req, ev);
+ }
+
+ if (wrepl_socket->request_timeout > 0) {
+ struct timeval endtime;
+ endtime = tevent_timeval_current_ofs(wrepl_socket->request_timeout, 0);
+ ok = tevent_req_set_endtime(req, ev, endtime);
+ if (!ok) {
+ return tevent_req_post(req, ev);
+ }
+ }
return req;
}
-static void wrepl_connect_handler(struct composite_context *subreq)
+static void wrepl_connect_done(struct tevent_req *subreq);
+
+static void wrepl_connect_trigger(struct tevent_req *req,
+ void *private_date)
{
- struct tevent_req *req = talloc_get_type_abort(subreq->async.private_data,
- struct tevent_req);
struct wrepl_connect_state *state = tevent_req_data(req,
struct wrepl_connect_state);
- struct wrepl_socket *wrepl_socket = state->wrepl_socket;
- NTSTATUS status;
+ struct tevent_req *subreq;
- status = socket_connect_recv(subreq);
- if (!NT_STATUS_IS_OK(status)) {
- tevent_req_nterror(req, status);
+ subreq = tstream_inet_tcp_connect_send(state,
+ state->caller.ev,
+ state->local_address,
+ state->remote_address);
+ if (tevent_req_nomem(subreq, req)) {
return;
}
+ tevent_req_set_callback(subreq, wrepl_connect_done, req);
- wrepl_socket->event.fde = event_add_fd(wrepl_socket->event.ctx, wrepl_socket,
- socket_get_fd(wrepl_socket->sock),
- EVENT_FD_READ,
- wrepl_handler, wrepl_socket);
- if (tevent_req_nomem(wrepl_socket->event.fde, req)) {
- return;
- }
+ return;
+}
+
+static void wrepl_connect_done(struct tevent_req *subreq)
+{
+ struct tevent_req *req = tevent_req_callback_data(subreq,
+ struct tevent_req);
+ struct wrepl_connect_state *state = tevent_req_data(req,
+ struct wrepl_connect_state);
+ int ret;
+ int sys_errno;
- /* setup the stream -> packet parser */
- wrepl_socket->packet = packet_init(wrepl_socket);
- if (tevent_req_nomem(wrepl_socket->packet, req)) {
+ ret = tstream_inet_tcp_connect_recv(subreq, &sys_errno,
--
Samba Shared Repository
More information about the samba-cvs
mailing list