* Do we have a complete ctdb packet in the queue?
*/
-static bool ctdb_req_complete(const struct data_blob *data,
+static bool ctdb_req_complete(const uint8_t *buf, size_t available,
size_t *length,
void *private_data)
{
uint32 msglen;
- if (data->length < sizeof(msglen)) {
+ if (available < sizeof(msglen)) {
return False;
}
- msglen = *((uint32 *)data->data);
+ msglen = *((uint32 *)buf);
DEBUG(10, ("msglen = %d\n", msglen));
cluster_fatal("ctdbd protocol error\n");
}
- if (data->length >= msglen) {
- *length = msglen;
- return True;
+ if (available < msglen) {
+ return false;
}
- return False;
+ *length = msglen;
+ return true;
}
/*
* Pull a ctdb request out of the incoming packet queue
*/
-static NTSTATUS ctdb_req_pull(const struct data_blob *data,
+static NTSTATUS ctdb_req_pull(uint8_t *buf, size_t length,
void *private_data)
{
struct req_pull_state *state = (struct req_pull_state *)private_data;
- state->req = data_blob_talloc(state->mem_ctx, data->data,
- data->length);
- if (state->req.data == NULL) {
- return NT_STATUS_NO_MEMORY;
- }
+ state->req.data = talloc_move(state->mem_ctx, &buf);
+ state->req.length = length;
return NT_STATUS_OK;
}
blob = data_blob_const(msg->data, msg->datalen);
ndr_err = ndr_pull_struct_blob(
- &blob, result, result,
+ &blob, result, NULL, result,
(ndr_pull_flags_fn_t)ndr_pull_messaging_rec);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
goto next_pkt;
}
+ if (msg->srvid == CTDB_SRVID_RECONFIGURE) {
+ DEBUG(0,("Got cluster reconfigure message in ctdb_read_req\n"));
+ messaging_send(conn->msg_ctx, procid_self(),
+ MSG_SMB_BRL_VALIDATE, &data_blob_null);
+ TALLOC_FREE(hdr);
+ goto next_pkt;
+ }
+
if (!(msg_state = TALLOC_P(NULL, struct deferred_msg_state))) {
DEBUG(0, ("talloc failed\n"));
TALLOC_FREE(hdr);
/*
* Packet handler to receive and handle a ctdb message
*/
-static NTSTATUS ctdb_handle_message(const struct data_blob *data,
+static NTSTATUS ctdb_handle_message(uint8_t *buf, size_t length,
void *private_data)
{
struct ctdbd_connection *conn = talloc_get_type_abort(
struct ctdb_req_message *msg;
struct messaging_rec *msg_rec;
- msg = (struct ctdb_req_message *)data->data;
+ msg = (struct ctdb_req_message *)buf;
if (msg->hdr.operation != CTDB_REQ_MESSAGE) {
DEBUG(0, ("Received async msg of type %u, discarding\n",
msg->hdr.operation));
+ TALLOC_FREE(buf);
return NT_STATUS_INVALID_PARAMETER;
}
DEBUG(10, ("received CTDB_SRVID_RELEASE_IP\n"));
conn->release_ip_handler((const char *)msg->data,
conn->release_ip_priv);
+ TALLOC_FREE(buf);
return NT_STATUS_OK;
}
*/
message_send_all(conn->msg_ctx, MSG_SMB_UNLOCK, NULL, 0, NULL);
+ TALLOC_FREE(buf);
+
return NT_STATUS_OK;
}
if (msg->srvid != sys_getpid() && msg->srvid != MSG_SRVID_SAMBA) {
DEBUG(0,("Got unexpected message with srvid=%llu\n",
(unsigned long long)msg->srvid));
+ TALLOC_FREE(buf);
return NT_STATUS_OK;
}
- if (!(msg_rec = ctdb_pull_messaging_rec(NULL, data->length, msg))) {
+ if (!(msg_rec = ctdb_pull_messaging_rec(NULL, length, msg))) {
DEBUG(10, ("ctdb_pull_messaging_rec failed\n"));
+ TALLOC_FREE(buf);
return NT_STATUS_NO_MEMORY;
}
messaging_dispatch_rec(conn->msg_ctx, msg_rec);
TALLOC_FREE(msg_rec);
+ TALLOC_FREE(buf);
return NT_STATUS_OK;
}
}
ndr_err = ndr_push_struct_blob(
- &blob, mem_ctx, msg,
+ &blob, mem_ctx, NULL, msg,
(ndr_push_flags_fn_t)ndr_push_messaging_rec);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
* Handle a traverse record coming in on the ctdbd connection
*/
-static NTSTATUS ctdb_traverse_handler(const struct data_blob *blob,
+static NTSTATUS ctdb_traverse_handler(uint8_t *buf, size_t length,
void *private_data)
{
struct ctdbd_traverse_state *state =
struct ctdb_rec_data *d;
TDB_DATA key, data;
- m = (struct ctdb_req_message *)blob->data;
+ m = (struct ctdb_req_message *)buf;
- if (blob->length < sizeof(*m) || m->hdr.length != blob->length) {
- DEBUG(0, ("Got invalid message of length %d\n",
- (int)blob->length));
+ if (length < sizeof(*m) || m->hdr.length != length) {
+ DEBUG(0, ("Got invalid message of length %d\n", (int)length));
+ TALLOC_FREE(buf);
return NT_STATUS_UNEXPECTED_IO_ERROR;
}
if (m->datalen < sizeof(uint32_t) || m->datalen != d->length) {
DEBUG(0, ("Got invalid traverse data of length %d\n",
(int)m->datalen));
+ TALLOC_FREE(buf);
return NT_STATUS_UNEXPECTED_IO_ERROR;
}
if (data.dsize < sizeof(struct ctdb_ltdb_header)) {
DEBUG(0, ("Got invalid ltdb header length %d\n",
(int)data.dsize));
+ TALLOC_FREE(buf);
return NT_STATUS_UNEXPECTED_IO_ERROR;
}
data.dsize -= sizeof(struct ctdb_ltdb_header);
state->fn(key, data, state->private_data);
}
+ TALLOC_FREE(buf);
return NT_STATUS_OK;
}
*/
NTSTATUS ctdbd_register_ips(struct ctdbd_connection *conn,
- const struct sockaddr_in *server,
- const struct sockaddr_in *client,
+ const struct sockaddr *server,
+ const struct sockaddr *client,
void (*release_ip_handler)(const char *ip_addr,
void *private_data),
void *private_data)
{
- struct ctdb_control_tcp p;
+ struct ctdb_control_tcp_vnn p;
TDB_DATA data;
NTSTATUS status;
*/
SMB_ASSERT(conn->release_ip_handler == NULL);
+ switch (client->sa_family) {
+ case AF_INET:
+ p.dest.ip = *(struct sockaddr_in *)server;
+ p.src.ip = *(struct sockaddr_in *)client;
+ break;
+#ifdef HAVE_IPV6
+ case AF_INET6:
+ p.dest.ip6 = *(struct sockaddr_in6 *)server;
+ p.src.ip6 = *(struct sockaddr_in6 *)client;
+ break;
+#endif
+ default:
+ return NT_STATUS_INTERNAL_ERROR;
+ }
+
+ conn->release_ip_handler = release_ip_handler;
+
/*
* We want to be told about IP releases
*/
return status;
}
- p.dest = *server;
- p.src = *client;
-
/*
* inform ctdb of our tcp connection, so if IP takeover happens ctdb
* can send an extra ack to trigger a reset for our client, so it
data.dsize = sizeof(p);
return ctdbd_control(conn, CTDB_CURRENT_NODE,
- CTDB_CONTROL_TCP_CLIENT, 0,
+ CTDB_CONTROL_TCP_ADD, 0,
CTDB_CTRL_FLAG_NOREPLY, data, NULL, NULL, NULL);
}
return register_with_ctdbd(conn, CTDB_SRVID_RECONFIGURE);
}
-/*
- persistent call. Used to start, store or cancel persistent updates.
- */
-static NTSTATUS ctdbd_persistent_call(struct ctdbd_connection *conn, uint32_t opcode, uint32_t db_id, TDB_DATA key, TDB_DATA data)
-{
- int cstatus=0;
- struct ctdb_rec_data *rec;
- TDB_DATA recdata;
- size_t length;
- NTSTATUS status;
-
- length = offsetof(struct ctdb_rec_data, data) + key.dsize + data.dsize;
-
- rec = (struct ctdb_rec_data *)talloc_size(conn, length);
- NT_STATUS_HAVE_NO_MEMORY(rec);
-
- rec->length = length;
- rec->reqid = db_id;
- rec->keylen = key.dsize;
- rec->datalen= data.dsize;
- memcpy(&rec->data[0], key.dptr, key.dsize);
- memcpy(&rec->data[key.dsize], data.dptr, data.dsize);
-
- recdata.dptr = (uint8_t *)rec;
- recdata.dsize = length;
-
- status = ctdbd_control(conn, CTDB_CURRENT_NODE, opcode,
- 0, 0, recdata, NULL, NULL, &cstatus);
- if (cstatus != 0) {
- return NT_STATUS_INTERNAL_DB_CORRUPTION;
- }
- return status;
-}
-
-/*
- persistent store. Used when we update a record in a persistent database
- */
-NTSTATUS ctdbd_persistent_store(struct ctdbd_connection *conn, uint32_t db_id, TDB_DATA key, TDB_DATA data)
-{
- return ctdbd_persistent_call(conn,
- CTDB_CONTROL_PERSISTENT_STORE,
- db_id, key, data);
-}
-
-/*
- tell the ctdb daemon that we are starting a persistent update operation.
- If we terminate/disconnect from the daemon without first performing
- either a persistent_store or a cancel ctdbd will perform recovery.
- */
-NTSTATUS ctdbd_start_persistent_update(struct ctdbd_connection *conn, uint32_t db_id, TDB_DATA key, TDB_DATA data)
-{
- return ctdbd_persistent_call(conn,
- CTDB_CONTROL_START_PERSISTENT_UPDATE,
- db_id, key, data);
-
-}
-
-/*
- Cancel a persistent update operation. This is used if we have started a
- persistent update but we want to abort it before we have made changes to
- the tdb database.
- */
-NTSTATUS ctdbd_cancel_persistent_update(struct ctdbd_connection *conn, uint32_t db_id, TDB_DATA key, TDB_DATA data)
-{
- return ctdbd_persistent_call(conn,
- CTDB_CONTROL_CANCEL_PERSISTENT_UPDATE,
- db_id, key, data);
-}
-
/*
call a control on the local node
*/
return ctdbd_control(conn, CTDB_CURRENT_NODE, opcode, srvid, flags, data, mem_ctx, outdata, cstatus);
}
-
-
-
#else
NTSTATUS ctdbd_init_connection(TALLOC_CTX *mem_ctx,
git.samba.org / ira / wip.git / blobdiff