sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s3-messaging/ctdb: split messaging_ctdbd_init()

Browse Source 
Split out and internal function from messaging_ctdbd_init() that does
the connection setup. Keep the conn object allocation in
messaging_ctdbd_init().

This is in preperation of adding messaging_ctdbd_reinit() which will use
the new internal function as well.

messaging_ctdbd_init_internal() has a new reinit flag,
messaging_ctdbd_init() calls with reinit=false resulting in unmodified
behaviour.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
This commit is contained in:
Ralph Boehme 2016-07-09 13:20:01 +02:00
parent 84da49f89b
commit c6373aba00
1 changed files with 65 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
source3/lib/messages_ctdbd.c
View File

@ -174,14 +174,76 @@ static void messaging_ctdbd_readable(struct tevent_context *ev,
ctdbd_socket_readable(conn);
}
static int messaging_ctdbd_init_internal(struct messaging_context *msg_ctx,
TALLOC_CTX *mem_ctx,
struct messaging_ctdbd_context *ctx,
bool reinit)
{
struct tevent_context *ev;
int ret, ctdb_fd;
if (reinit) {
ret = ctdbd_reinit_connection(ctx,
lp_ctdbd_socket(),
lp_ctdb_timeout(),
ctx->conn);
if (ret != 0) {
DBG_ERR("ctdbd_reinit_connection failed: %s\n",
strerror(ret));
return ret;
}
} else {
ret = ctdbd_init_connection(ctx,
lp_ctdbd_socket(),
lp_ctdb_timeout(),
&ctx->conn);
if (ret != 0) {
DBG_ERR("ctdbd_init_connection failed: %s\n",
strerror(ret));
return ret;
}
}
ret = register_with_ctdbd(ctx->conn, MSG_SRVID_SAMBA, NULL, NULL);
if (ret != 0) {
DBG_DEBUG("Could not register MSG_SRVID_SAMBA: %s\n",
strerror(ret));
return ret;
}
ret = register_with_ctdbd(ctx->conn, getpid(),
messaging_ctdb_recv, msg_ctx);
if (ret != 0) {
DEBUG(10, ("register_with_ctdbd failed: %s\n",
strerror(ret)));
return ret;
}
ctdb_fd = ctdbd_conn_get_fd(ctx->conn);
ev = messaging_tevent_context(msg_ctx);
ctx->fde = tevent_add_fd(ev, ctx, ctdb_fd, TEVENT_FD_READ,
messaging_ctdbd_readable, ctx->conn);
if (ctx->fde == NULL) {
return ENOMEM;
}
global_ctdb_connection_pid = getpid();
global_ctdbd_connection = ctx->conn;
talloc_set_destructor(ctx, messaging_ctdbd_destructor);
set_my_vnn(ctdbd_vnn(ctx->conn));
return 0;
}
int messaging_ctdbd_init(struct messaging_context *msg_ctx,
TALLOC_CTX *mem_ctx,
struct messaging_backend **presult)
{
struct messaging_backend *result;
struct messaging_ctdbd_context *ctx;
struct tevent_context *ev;
int ret, ctdb_fd;
int ret;
if (!(result = talloc(mem_ctx, struct messaging_backend))) {
DEBUG(0, ("talloc failed\n"));
@ -194,49 +256,12 @@ int messaging_ctdbd_init(struct messaging_context *msg_ctx,
return ENOMEM;
}
ret = ctdbd_init_connection(ctx, lp_ctdbd_socket(),
lp_ctdb_timeout(), &ctx->conn);
ret = messaging_ctdbd_init_internal(msg_ctx, mem_ctx, ctx, false);
if (ret != 0) {
DBG_DEBUG("ctdbd_init_connection failed: %s\n",
strerror(ret));
TALLOC_FREE(result);
return ret;
}
ret = register_with_ctdbd(ctx->conn, MSG_SRVID_SAMBA, NULL, NULL);
if (ret != 0) {
DBG_DEBUG("Could not register MSG_SRVID_SAMBA: %s\n",
strerror(ret));
TALLOC_FREE(result);
return ret;
}
ret = register_with_ctdbd(ctx->conn, getpid(),
messaging_ctdb_recv, msg_ctx);
if (ret != 0) {
DEBUG(10, ("register_with_ctdbd failed: %s\n",
strerror(ret)));
TALLOC_FREE(result);
return ret;
}
ctdb_fd = ctdbd_conn_get_fd(ctx->conn);
ev = messaging_tevent_context(msg_ctx);
ctx->fde = tevent_add_fd(ev, ctx, ctdb_fd, TEVENT_FD_READ,
messaging_ctdbd_readable, ctx->conn);
if (ctx->fde == NULL) {
TALLOC_FREE(result);
return ENOMEM;
}
global_ctdb_connection_pid = getpid();
global_ctdbd_connection = ctx->conn;
talloc_set_destructor(ctx, messaging_ctdbd_destructor);
set_my_vnn(ctdbd_vnn(ctx->conn));
result->send_fn = messaging_ctdb_send;
result->private_data = (void *)ctx;