summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--source4/libcli/composite/composite.c2
-rw-r--r--source4/libcli/finddcs.c2
-rw-r--r--source4/libcli/nbt/libnbt.h8
-rw-r--r--source4/libcli/nbt/namerefresh.c8
-rw-r--r--source4/libcli/nbt/nameregister.c14
-rw-r--r--source4/libcli/nbt/nbtsocket.c2
-rw-r--r--source4/libcli/resolve/nbtlist.c4
-rw-r--r--source4/nbt_server/defense.c2
-rw-r--r--source4/nbt_server/interfaces.c2
-rw-r--r--source4/nbt_server/nodestatus.c2
-rw-r--r--source4/nbt_server/packet.c14
-rw-r--r--source4/nbt_server/query.c2
-rw-r--r--source4/nbt_server/register.c4
-rw-r--r--source4/nbt_server/wins/wins_dns_proxy.c2
-rw-r--r--source4/nbt_server/wins/winsserver.c16
-rw-r--r--source4/nbt_server/wins/winswack.c8
-rw-r--r--source4/torture/nbt/query.c4
-rw-r--r--source4/torture/nbt/winsbench.c12
-rw-r--r--source4/torture/nbt/winsreplication.c6
19 files changed, 57 insertions, 57 deletions
diff --git a/source4/libcli/composite/composite.c b/source4/libcli/composite/composite.c
index 3e3f224f47..91a842706f 100644
--- a/source4/libcli/composite/composite.c
+++ b/source4/libcli/composite/composite.c
@@ -214,5 +214,5 @@ _PUBLIC_ void composite_continue_nbt(struct composite_context *ctx,
{
if (composite_nomem(new_req, ctx)) return;
new_req->async.fn = continuation;
- new_req->async.private = private_data;
+ new_req->async.private_data = private_data;
}
diff --git a/source4/libcli/finddcs.c b/source4/libcli/finddcs.c
index 56f931ce19..f12f1ac805 100644
--- a/source4/libcli/finddcs.c
+++ b/source4/libcli/finddcs.c
@@ -217,7 +217,7 @@ static void fallback_node_status(struct finddcs_state *state)
static void fallback_node_status_replied(struct nbt_name_request *name_req)
{
int i;
- struct finddcs_state *state = talloc_get_type(name_req->async.private, struct finddcs_state);
+ struct finddcs_state *state = talloc_get_type(name_req->async.private_data, struct finddcs_state);
state->ctx->status = nbt_name_status_recv(name_req, state, &state->node_status);
if (!composite_is_ok(state->ctx)) return;
diff --git a/source4/libcli/nbt/libnbt.h b/source4/libcli/nbt/libnbt.h
index 0b01365510..ff4fe65ac8 100644
--- a/source4/libcli/nbt/libnbt.h
+++ b/source4/libcli/nbt/libnbt.h
@@ -83,7 +83,7 @@ struct nbt_name_request {
/* information on what to do on completion */
struct {
void (*fn)(struct nbt_name_request *);
- void *private;
+ void *private_data;
} async;
};
@@ -113,14 +113,14 @@ struct nbt_name_socket {
struct {
void (*handler)(struct nbt_name_socket *, struct nbt_name_packet *,
struct socket_address *);
- void *private;
+ void *private_data;
} incoming;
/* what to do with unexpected replies */
struct {
void (*handler)(struct nbt_name_socket *, struct nbt_name_packet *,
struct socket_address *);
- void *private;
+ void *private_data;
} unexpected;
};
@@ -323,7 +323,7 @@ NTSTATUS nbt_name_refresh_recv(struct nbt_name_request *req,
NTSTATUS nbt_set_incoming_handler(struct nbt_name_socket *nbtsock,
void (*handler)(struct nbt_name_socket *, struct nbt_name_packet *,
struct socket_address *),
- void *private);
+ void *private_data);
NTSTATUS nbt_name_reply_send(struct nbt_name_socket *nbtsock,
struct socket_address *dest,
struct nbt_name_packet *request);
diff --git a/source4/libcli/nbt/namerefresh.c b/source4/libcli/nbt/namerefresh.c
index b372e4a3f3..b939c97740 100644
--- a/source4/libcli/nbt/namerefresh.c
+++ b/source4/libcli/nbt/namerefresh.c
@@ -159,7 +159,7 @@ struct refresh_wins_state {
*/
static void name_refresh_wins_handler(struct nbt_name_request *req)
{
- struct composite_context *c = talloc_get_type(req->async.private,
+ struct composite_context *c = talloc_get_type(req->async.private_data,
struct composite_context);
struct refresh_wins_state *state = talloc_get_type(c->private_data,
struct refresh_wins_state);
@@ -184,7 +184,7 @@ static void name_refresh_wins_handler(struct nbt_name_request *req)
c->status = NT_STATUS_NO_MEMORY;
} else {
state->req->async.fn = name_refresh_wins_handler;
- state->req->async.private = c;
+ state->req->async.private_data = c;
}
} else if (!NT_STATUS_IS_OK(status)) {
c->state = COMPOSITE_STATE_ERROR;
@@ -200,7 +200,7 @@ static void name_refresh_wins_handler(struct nbt_name_request *req)
c->status = NT_STATUS_NO_MEMORY;
} else {
state->req->async.fn = name_refresh_wins_handler;
- state->req->async.private = c;
+ state->req->async.private_data = c;
}
} else {
c->state = COMPOSITE_STATE_DONE;
@@ -259,7 +259,7 @@ _PUBLIC_ struct composite_context *nbt_name_refresh_wins_send(struct nbt_name_so
if (state->req == NULL) goto failed;
state->req->async.fn = name_refresh_wins_handler;
- state->req->async.private = c;
+ state->req->async.private_data = c;
c->private_data = state;
c->state = COMPOSITE_STATE_IN_PROGRESS;
diff --git a/source4/libcli/nbt/nameregister.c b/source4/libcli/nbt/nameregister.c
index 9c5ae43d40..c50f9b3b3a 100644
--- a/source4/libcli/nbt/nameregister.c
+++ b/source4/libcli/nbt/nameregister.c
@@ -161,7 +161,7 @@ struct register_bcast_state {
*/
static void name_register_bcast_handler(struct nbt_name_request *req)
{
- struct composite_context *c = talloc_get_type(req->async.private, struct composite_context);
+ struct composite_context *c = talloc_get_type(req->async.private_data, struct composite_context);
struct register_bcast_state *state = talloc_get_type(c->private_data, struct register_bcast_state);
NTSTATUS status;
@@ -183,7 +183,7 @@ static void name_register_bcast_handler(struct nbt_name_request *req)
c->status = NT_STATUS_NO_MEMORY;
} else {
state->req->async.fn = name_register_bcast_handler;
- state->req->async.private = c;
+ state->req->async.private_data = c;
}
} else if (!NT_STATUS_IS_OK(status)) {
c->state = COMPOSITE_STATE_ERROR;
@@ -241,7 +241,7 @@ _PUBLIC_ struct composite_context *nbt_name_register_bcast_send(struct nbt_name_
if (state->req == NULL) goto failed;
state->req->async.fn = name_register_bcast_handler;
- state->req->async.private = c;
+ state->req->async.private_data = c;
c->private_data = state;
c->state = COMPOSITE_STATE_IN_PROGRESS;
@@ -297,7 +297,7 @@ struct register_wins_state {
*/
static void name_register_wins_handler(struct nbt_name_request *req)
{
- struct composite_context *c = talloc_get_type(req->async.private,
+ struct composite_context *c = talloc_get_type(req->async.private_data,
struct composite_context);
struct register_wins_state *state = talloc_get_type(c->private_data,
struct register_wins_state);
@@ -322,7 +322,7 @@ static void name_register_wins_handler(struct nbt_name_request *req)
c->status = NT_STATUS_NO_MEMORY;
} else {
state->req->async.fn = name_register_wins_handler;
- state->req->async.private = c;
+ state->req->async.private_data = c;
}
} else if (!NT_STATUS_IS_OK(status)) {
c->state = COMPOSITE_STATE_ERROR;
@@ -338,7 +338,7 @@ static void name_register_wins_handler(struct nbt_name_request *req)
c->status = NT_STATUS_NO_MEMORY;
} else {
state->req->async.fn = name_register_wins_handler;
- state->req->async.private = c;
+ state->req->async.private_data = c;
}
} else {
c->state = COMPOSITE_STATE_DONE;
@@ -399,7 +399,7 @@ _PUBLIC_ struct composite_context *nbt_name_register_wins_send(struct nbt_name_s
if (state->req == NULL) goto failed;
state->req->async.fn = name_register_wins_handler;
- state->req->async.private = c;
+ state->req->async.private_data = c;
c->private_data = state;
c->state = COMPOSITE_STATE_IN_PROGRESS;
diff --git a/source4/libcli/nbt/nbtsocket.c b/source4/libcli/nbt/nbtsocket.c
index 5d4611e2d9..49f175b8a3 100644
--- a/source4/libcli/nbt/nbtsocket.c
+++ b/source4/libcli/nbt/nbtsocket.c
@@ -488,7 +488,7 @@ _PUBLIC_ NTSTATUS nbt_set_incoming_handler(struct nbt_name_socket *nbtsock,
void *private)
{
nbtsock->incoming.handler = handler;
- nbtsock->incoming.private = private;
+ nbtsock->incoming.private_data = private;
EVENT_FD_READABLE(nbtsock->fde);
return NT_STATUS_OK;
}
diff --git a/source4/libcli/resolve/nbtlist.c b/source4/libcli/resolve/nbtlist.c
index 8f085c5404..0cc2ee6726 100644
--- a/source4/libcli/resolve/nbtlist.c
+++ b/source4/libcli/resolve/nbtlist.c
@@ -46,7 +46,7 @@ struct nbtlist_state {
*/
static void nbtlist_handler(struct nbt_name_request *req)
{
- struct composite_context *c = talloc_get_type(req->async.private,
+ struct composite_context *c = talloc_get_type(req->async.private_data,
struct composite_context);
struct nbtlist_state *state = talloc_get_type(c->private_data, struct nbtlist_state);
struct nbt_name_query *q;
@@ -169,7 +169,7 @@ struct composite_context *resolve_name_nbtlist_send(TALLOC_CTX *mem_ctx,
if (composite_nomem(state->queries[i], c)) return c;
state->queries[i]->async.fn = nbtlist_handler;
- state->queries[i]->async.private = c;
+ state->queries[i]->async.private_data = c;
}
return c;
diff --git a/source4/nbt_server/defense.c b/source4/nbt_server/defense.c
index 2d7a126f5b..08eebe0c55 100644
--- a/source4/nbt_server/defense.c
+++ b/source4/nbt_server/defense.c
@@ -38,7 +38,7 @@ void nbtd_request_defense(struct nbt_name_socket *nbtsock,
{
struct nbtd_iface_name *iname;
struct nbt_name *name;
- struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private,
+ struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private_data,
struct nbtd_interface);
/*
diff --git a/source4/nbt_server/interfaces.c b/source4/nbt_server/interfaces.c
index e59475051b..76bc145903 100644
--- a/source4/nbt_server/interfaces.c
+++ b/source4/nbt_server/interfaces.c
@@ -38,7 +38,7 @@ static void nbtd_request_handler(struct nbt_name_socket *nbtsock,
struct nbt_name_packet *packet,
struct socket_address *src)
{
- struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private,
+ struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private_data,
struct nbtd_interface);
struct nbtd_server *nbtsrv = iface->nbtsrv;
diff --git a/source4/nbt_server/nodestatus.c b/source4/nbt_server/nodestatus.c
index a7bf67ad51..a5f1426f37 100644
--- a/source4/nbt_server/nodestatus.c
+++ b/source4/nbt_server/nodestatus.c
@@ -104,7 +104,7 @@ void nbtd_query_status(struct nbt_name_socket *nbtsock,
{
struct nbt_name *name;
struct nbtd_iface_name *iname;
- struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private,
+ struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private_data,
struct nbtd_interface);
NBTD_ASSERT_PACKET(packet, src, packet->qdcount == 1);
diff --git a/source4/nbt_server/packet.c b/source4/nbt_server/packet.c
index 07a309b633..ff4e94fef9 100644
--- a/source4/nbt_server/packet.c
+++ b/source4/nbt_server/packet.c
@@ -47,7 +47,7 @@ bool nbtd_self_packet_and_bcast(struct nbt_name_socket *nbtsock,
struct nbt_name_packet *packet,
const struct socket_address *src)
{
- struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private,
+ struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private_data,
struct nbtd_interface);
/* if its not a broadcast then its not considered a self packet */
@@ -74,7 +74,7 @@ bool nbtd_self_packet(struct nbt_name_socket *nbtsock,
struct nbt_name_packet *packet,
const struct socket_address *src)
{
- struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private,
+ struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private_data,
struct nbtd_interface);
struct nbtd_server *nbtsrv = iface->nbtsrv;
@@ -106,7 +106,7 @@ void nbtd_name_query_reply(struct nbt_name_socket *nbtsock,
{
struct nbt_name_packet *packet;
size_t num_addresses = str_list_length(addresses);
- struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private,
+ struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private_data,
struct nbtd_interface);
struct nbtd_server *nbtsrv = iface->nbtsrv;
int i;
@@ -168,7 +168,7 @@ void nbtd_negative_name_query_reply(struct nbt_name_socket *nbtsock,
{
struct nbt_name_packet *packet;
struct nbt_name *name = &request_packet->questions[0].name;
- struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private,
+ struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private_data,
struct nbtd_interface);
struct nbtd_server *nbtsrv = iface->nbtsrv;
@@ -212,7 +212,7 @@ void nbtd_name_registration_reply(struct nbt_name_socket *nbtsock,
{
struct nbt_name_packet *packet;
struct nbt_name *name = &request_packet->questions[0].name;
- struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private,
+ struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private_data,
struct nbtd_interface);
struct nbtd_server *nbtsrv = iface->nbtsrv;
@@ -260,7 +260,7 @@ void nbtd_name_release_reply(struct nbt_name_socket *nbtsock,
{
struct nbt_name_packet *packet;
struct nbt_name *name = &request_packet->questions[0].name;
- struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private,
+ struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private_data,
struct nbtd_interface);
struct nbtd_server *nbtsrv = iface->nbtsrv;
@@ -306,7 +306,7 @@ void nbtd_wack_reply(struct nbt_name_socket *nbtsock,
{
struct nbt_name_packet *packet;
struct nbt_name *name = &request_packet->questions[0].name;
- struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private,
+ struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private_data,
struct nbtd_interface);
struct nbtd_server *nbtsrv = iface->nbtsrv;
diff --git a/source4/nbt_server/query.c b/source4/nbt_server/query.c
index dfd742db5a..a8809e84a2 100644
--- a/source4/nbt_server/query.c
+++ b/source4/nbt_server/query.c
@@ -38,7 +38,7 @@ void nbtd_request_query(struct nbt_name_socket *nbtsock,
{
struct nbtd_iface_name *iname;
struct nbt_name *name;
- struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private,
+ struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private_data,
struct nbtd_interface);
/* see if its a node status query */
diff --git a/source4/nbt_server/register.c b/source4/nbt_server/register.c
index a17d503190..ebdb4dc0f8 100644
--- a/source4/nbt_server/register.c
+++ b/source4/nbt_server/register.c
@@ -38,7 +38,7 @@ static void nbtd_start_refresh_timer(struct nbtd_iface_name *iname);
*/
static void refresh_completion_handler(struct nbt_name_request *req)
{
- struct nbtd_iface_name *iname = talloc_get_type(req->async.private,
+ struct nbtd_iface_name *iname = talloc_get_type(req->async.private_data,
struct nbtd_iface_name);
NTSTATUS status;
struct nbt_name_refresh io;
@@ -108,7 +108,7 @@ static void name_refresh_handler(struct event_context *ev, struct timed_event *t
if (req == NULL) return;
req->async.fn = refresh_completion_handler;
- req->async.private = iname;
+ req->async.private_data = iname;
}
diff --git a/source4/nbt_server/wins/wins_dns_proxy.c b/source4/nbt_server/wins/wins_dns_proxy.c
index 3322ad55fd..cd605907a8 100644
--- a/source4/nbt_server/wins/wins_dns_proxy.c
+++ b/source4/nbt_server/wins/wins_dns_proxy.c
@@ -68,7 +68,7 @@ void nbtd_wins_dns_proxy_query(struct nbt_name_socket *nbtsock,
struct socket_address *src)
{
struct nbt_name *name = &packet->questions[0].name;
- struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private,
+ struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private_data,
struct nbtd_interface);
struct wins_dns_proxy_state *s;
struct composite_context *creq;
diff --git a/source4/nbt_server/wins/winsserver.c b/source4/nbt_server/wins/winsserver.c
index f8901ce09d..399530b4cf 100644
--- a/source4/nbt_server/wins/winsserver.c
+++ b/source4/nbt_server/wins/winsserver.c
@@ -68,7 +68,7 @@ static uint8_t wins_register_new(struct nbt_name_socket *nbtsock,
const struct socket_address *src,
enum wrepl_name_type type)
{
- struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private,
+ struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private_data,
struct nbtd_interface);
struct wins_server *winssrv = iface->nbtsrv->winssrv;
struct nbt_name *name = &packet->questions[0].name;
@@ -119,7 +119,7 @@ static uint8_t wins_update_ttl(struct nbt_name_socket *nbtsock,
struct winsdb_addr *winsdb_addr,
const struct socket_address *src)
{
- struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private,
+ struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private_data,
struct nbtd_interface);
struct wins_server *winssrv = iface->nbtsrv->winssrv;
uint32_t ttl = wins_server_ttl(winssrv, packet->additional[0].ttl);
@@ -158,7 +158,7 @@ static uint8_t wins_sgroup_merge(struct nbt_name_socket *nbtsock,
const char *address,
const struct socket_address *src)
{
- struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private,
+ struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private_data,
struct nbtd_interface);
struct wins_server *winssrv = iface->nbtsrv->winssrv;
uint32_t ttl = wins_server_ttl(winssrv, packet->additional[0].ttl);
@@ -357,7 +357,7 @@ static void wins_register_wack(struct nbt_name_socket *nbtsock,
struct socket_address *src,
enum wrepl_name_type new_type)
{
- struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private,
+ struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private_data,
struct nbtd_interface);
struct wins_server *winssrv = iface->nbtsrv->winssrv;
struct wack_state *s;
@@ -415,7 +415,7 @@ static void nbtd_winsserver_register(struct nbt_name_socket *nbtsock,
struct socket_address *src)
{
NTSTATUS status;
- struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private,
+ struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private_data,
struct nbtd_interface);
struct wins_server *winssrv = iface->nbtsrv->winssrv;
struct nbt_name *name = &packet->questions[0].name;
@@ -671,7 +671,7 @@ static void nbtd_winsserver_query(struct loadparm_context *lp_ctx,
struct socket_address *src)
{
NTSTATUS status;
- struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private,
+ struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private_data,
struct nbtd_interface);
struct wins_server *winssrv = iface->nbtsrv->winssrv;
struct nbt_name *name = &packet->questions[0].name;
@@ -813,7 +813,7 @@ static void nbtd_winsserver_release(struct nbt_name_socket *nbtsock,
struct socket_address *src)
{
NTSTATUS status;
- struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private,
+ struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private_data,
struct nbtd_interface);
struct wins_server *winssrv = iface->nbtsrv->winssrv;
struct nbt_name *name = &packet->questions[0].name;
@@ -928,7 +928,7 @@ void nbtd_winsserver_request(struct nbt_name_socket *nbtsock,
struct nbt_name_packet *packet,
struct socket_address *src)
{
- struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private,
+ struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private_data,
struct nbtd_interface);
struct wins_server *winssrv = iface->nbtsrv->winssrv;
if ((packet->operation & NBT_FLAG_BROADCAST) || winssrv == NULL) {
diff --git a/source4/nbt_server/wins/winswack.c b/source4/nbt_server/wins/winswack.c
index 43d2747ae7..7e0c73a810 100644
--- a/source4/nbt_server/wins/winswack.c
+++ b/source4/nbt_server/wins/winswack.c
@@ -37,7 +37,7 @@ struct wins_challenge_state {
static void wins_challenge_handler(struct nbt_name_request *req)
{
- struct composite_context *ctx = talloc_get_type(req->async.private, struct composite_context);
+ struct composite_context *ctx = talloc_get_type(req->async.private_data, struct composite_context);
struct wins_challenge_state *state = talloc_get_type(ctx->private_data, struct wins_challenge_state);
ctx->status = nbt_name_query_recv(req, state, &state->query);
@@ -123,7 +123,7 @@ struct composite_context *wins_challenge_send(TALLOC_CTX *mem_ctx, struct wins_c
if (req == NULL) goto failed;
req->async.fn = wins_challenge_handler;
- req->async.private = result;
+ req->async.private_data = result;
return result;
failed:
@@ -151,7 +151,7 @@ struct wins_release_demand_state {
static void wins_release_demand_handler(struct nbt_name_request *req)
{
- struct composite_context *ctx = talloc_get_type(req->async.private, struct composite_context);
+ struct composite_context *ctx = talloc_get_type(req->async.private_data, struct composite_context);
struct wins_release_demand_state *state = talloc_get_type(ctx->private_data, struct wins_release_demand_state);
ctx->status = nbt_name_release_recv(req, state, &state->release);
@@ -240,7 +240,7 @@ static struct composite_context *wins_release_demand_send(TALLOC_CTX *mem_ctx, s
if (req == NULL) goto failed;
req->async.fn = wins_release_demand_handler;
- req->async.private = result;
+ req->async.private_data = result;
return result;
failed:
diff --git a/source4/torture/nbt/query.c b/source4/torture/nbt/query.c
index 80027a1b68..b1b703a3c2 100644
--- a/source4/torture/nbt/query.c
+++ b/source4/torture/nbt/query.c
@@ -33,7 +33,7 @@ struct result_struct {
static void increment_handler(struct nbt_name_request *req)
{
- struct result_struct *v = talloc_get_type(req->async.private, struct result_struct);
+ struct result_struct *v = talloc_get_type(req->async.private_data, struct result_struct);
if (req->state != NBT_REQUEST_DONE) {
v->num_fail++;
} else {
@@ -76,7 +76,7 @@ static bool bench_namequery(struct torture_context *tctx)
req = nbt_name_query_send(nbtsock, &io);
torture_assert(tctx, req != NULL, "Failed to setup request!");
req->async.fn = increment_handler;
- req->async.private = result;
+ req->async.private_data = result;
num_sent++;
if (num_sent % 1000 == 0) {
if (torture_setting_bool(tctx, "progress", true)) {
diff --git a/source4/torture/nbt/winsbench.c b/source4/torture/nbt/winsbench.c
index a0d90fb653..bea3d4f9cf 100644
--- a/source4/torture/nbt/winsbench.c
+++ b/source4/torture/nbt/winsbench.c
@@ -56,7 +56,7 @@ static struct nbt_name generate_name(TALLOC_CTX *tctx, int idx)
static void register_handler(struct nbt_name_request *req)
{
- struct idx_state *istate = talloc_get_type(req->async.private, struct idx_state);
+ struct idx_state *istate = talloc_get_type(req->async.private_data, struct idx_state);
struct wins_state *state = istate->state;
struct nbt_name_register io;
NTSTATUS status;
@@ -100,7 +100,7 @@ static void generate_register(struct nbt_name_socket *nbtsock, struct wins_state
req = nbt_name_register_send(nbtsock, &io);
req->async.fn = register_handler;
- req->async.private = istate;
+ req->async.private_data = istate;
talloc_free(tmp_ctx);
}
@@ -108,7 +108,7 @@ static void generate_register(struct nbt_name_socket *nbtsock, struct wins_state
static void release_handler(struct nbt_name_request *req)
{
- struct idx_state *istate = talloc_get_type(req->async.private, struct idx_state);
+ struct idx_state *istate = talloc_get_type(req->async.private_data, struct idx_state);
struct wins_state *state = istate->state;
struct nbt_name_release io;
NTSTATUS status;
@@ -150,7 +150,7 @@ static void generate_release(struct nbt_name_socket *nbtsock, struct wins_state
req = nbt_name_release_send(nbtsock, &io);
req->async.fn = release_handler;
- req->async.private = istate;
+ req->async.private_data = istate;
talloc_free(tmp_ctx);
}
@@ -158,7 +158,7 @@ static void generate_release(struct nbt_name_socket *nbtsock, struct wins_state
static void query_handler(struct nbt_name_request *req)
{
- struct idx_state *istate = talloc_get_type(req->async.private, struct idx_state);
+ struct idx_state *istate = talloc_get_type(req->async.private_data, struct idx_state);
struct wins_state *state = istate->state;
struct nbt_name_query io;
NTSTATUS status;
@@ -197,7 +197,7 @@ static void generate_query(struct nbt_name_socket *nbtsock, struct wins_state *s
req = nbt_name_query_send(nbtsock, &io);
req->async.fn = query_handler;
- req->async.private = istate;
+ req->async.private_data = istate;
talloc_free(tmp_ctx);
}
diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c
index 6b600bd7cd..b688f1fbfe 100644
--- a/source4/torture/nbt/winsreplication.c
+++ b/source4/torture/nbt/winsreplication.c
@@ -9457,7 +9457,7 @@ static void test_conflict_owned_active_vs_replica_handler_query(struct nbt_name_
struct nbt_name *name;
struct nbt_name_packet *rep_packet;
struct test_conflict_owned_active_vs_replica_struct *rec =
- (struct test_conflict_owned_active_vs_replica_struct *)nbtsock->incoming.private;
+ (struct test_conflict_owned_active_vs_replica_struct *)nbtsock->incoming.private_data;
_NBT_ASSERT(req_packet->qdcount, 1);
_NBT_ASSERT(req_packet->questions[0].question_type, NBT_QTYPE_NETBIOS);
@@ -9556,7 +9556,7 @@ static void test_conflict_owned_active_vs_replica_handler_release(
struct nbt_name *name;
struct nbt_name_packet *rep_packet;
struct test_conflict_owned_active_vs_replica_struct *rec =
- (struct test_conflict_owned_active_vs_replica_struct *)nbtsock->incoming.private;
+ (struct test_conflict_owned_active_vs_replica_struct *)nbtsock->incoming.private_data;
_NBT_ASSERT(req_packet->qdcount, 1);
_NBT_ASSERT(req_packet->questions[0].question_type, NBT_QTYPE_NETBIOS);
@@ -9610,7 +9610,7 @@ static void test_conflict_owned_active_vs_replica_handler(struct nbt_name_socket
struct socket_address *src)
{
struct test_conflict_owned_active_vs_replica_struct *rec =
- (struct test_conflict_owned_active_vs_replica_struct *)nbtsock->incoming.private;
+ (struct test_conflict_owned_active_vs_replica_struct *)nbtsock->incoming.private_data;
rec->defend.ret = false;
generated by cgit (git 2.34.1) at 2024-06-13 13:16:25 +0000