summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-02-02 09:55:58 +0100
committerStefan Metzmacher <metze@samba.org>2009-02-02 13:08:48 +0100
commite08dfe008e63789347cf7dc360b70ba1a1cb5b20 (patch)
treeb2721b2d79eeaedfa42d640bf308b6af1c069bb8
parent1bb0104070eb1188ed0256535907f2bed006a939 (diff)
downloadsamba-e08dfe008e63789347cf7dc360b70ba1a1cb5b20.tar.gz
samba-e08dfe008e63789347cf7dc360b70ba1a1cb5b20.tar.bz2
samba-e08dfe008e63789347cf7dc360b70ba1a1cb5b20.zip
s4:dgram: s/private/private_data
metze
-rw-r--r--source4/libcli/dgram/dgramsocket.c2
-rw-r--r--source4/libcli/dgram/libdgram.h4
-rw-r--r--source4/libcli/dgram/mailslot.c2
-rw-r--r--source4/nbt_server/dgram/netlogon.c2
-rw-r--r--source4/nbt_server/dgram/ntlogon.c2
-rw-r--r--source4/nbt_server/irpc.c2
-rw-r--r--source4/torture/nbt/dgram.c48
7 files changed, 31 insertions, 31 deletions
diff --git a/source4/libcli/dgram/dgramsocket.c b/source4/libcli/dgram/dgramsocket.c
index 1a5cc6dce8..751706d2c5 100644
--- a/source4/libcli/dgram/dgramsocket.c
+++ b/source4/libcli/dgram/dgramsocket.c
@@ -203,7 +203,7 @@ NTSTATUS dgram_set_incoming_handler(struct nbt_dgram_socket *dgmsock,
void *private_data)
{
dgmsock->incoming.handler = handler;
- dgmsock->incoming.private = private_data;
+ dgmsock->incoming.private_data = private_data;
EVENT_FD_READABLE(dgmsock->fde);
return NT_STATUS_OK;
}
diff --git a/source4/libcli/dgram/libdgram.h b/source4/libcli/dgram/libdgram.h
index b303afa6dc..a17a6042d9 100644
--- a/source4/libcli/dgram/libdgram.h
+++ b/source4/libcli/dgram/libdgram.h
@@ -55,7 +55,7 @@ struct nbt_dgram_socket {
struct {
void (*handler)(struct nbt_dgram_socket *, struct nbt_dgram_packet *,
struct socket_address *src);
- void *private;
+ void *private_data;
} incoming;
};
@@ -79,7 +79,7 @@ struct dgram_mailslot_handler {
const char *mailslot_name;
dgram_mailslot_handler_t handler;
- void *private;
+ void *private_data;
};
diff --git a/source4/libcli/dgram/mailslot.c b/source4/libcli/dgram/mailslot.c
index bc607e3b24..261946e458 100644
--- a/source4/libcli/dgram/mailslot.c
+++ b/source4/libcli/dgram/mailslot.c
@@ -66,7 +66,7 @@ struct dgram_mailslot_handler *dgram_mailslot_listen(struct nbt_dgram_socket *dg
return NULL;
}
dgmslot->handler = handler;
- dgmslot->private = private_data;
+ dgmslot->private_data = private_data;
DLIST_ADD(dgmsock->mailslot_handlers, dgmslot);
talloc_set_destructor(dgmslot, dgram_mailslot_destructor);
diff --git a/source4/nbt_server/dgram/netlogon.c b/source4/nbt_server/dgram/netlogon.c
index a3a7552f6a..e5c82280e3 100644
--- a/source4/nbt_server/dgram/netlogon.c
+++ b/source4/nbt_server/dgram/netlogon.c
@@ -161,7 +161,7 @@ void nbtd_mailslot_netlogon_handler(struct dgram_mailslot_handler *dgmslot,
{
NTSTATUS status = NT_STATUS_NO_MEMORY;
struct nbtd_interface *iface =
- talloc_get_type(dgmslot->private, struct nbtd_interface);
+ talloc_get_type(dgmslot->private_data, struct nbtd_interface);
struct nbt_netlogon_packet *netlogon =
talloc(dgmslot, struct nbt_netlogon_packet);
struct nbtd_iface_name *iname;
diff --git a/source4/nbt_server/dgram/ntlogon.c b/source4/nbt_server/dgram/ntlogon.c
index 352be34489..87e76e08ee 100644
--- a/source4/nbt_server/dgram/ntlogon.c
+++ b/source4/nbt_server/dgram/ntlogon.c
@@ -76,7 +76,7 @@ void nbtd_mailslot_ntlogon_handler(struct dgram_mailslot_handler *dgmslot,
{
NTSTATUS status = NT_STATUS_NO_MEMORY;
struct nbtd_interface *iface =
- talloc_get_type(dgmslot->private, struct nbtd_interface);
+ talloc_get_type(dgmslot->private_data, struct nbtd_interface);
struct nbt_ntlogon_packet *ntlogon =
talloc(dgmslot, struct nbt_ntlogon_packet);
struct nbtd_iface_name *iname;
diff --git a/source4/nbt_server/irpc.c b/source4/nbt_server/irpc.c
index 748f18dcfd..951f1d296a 100644
--- a/source4/nbt_server/irpc.c
+++ b/source4/nbt_server/irpc.c
@@ -65,7 +65,7 @@ static void getdc_recv_netlogon_reply(struct dgram_mailslot_handler *dgmslot,
struct socket_address *src)
{
struct getdc_state *s =
- talloc_get_type(dgmslot->private, struct getdc_state);
+ talloc_get_type(dgmslot->private_data, struct getdc_state);
const char *p;
struct nbt_netlogon_response netlogon;
NTSTATUS status;
diff --git a/source4/torture/nbt/dgram.c b/source4/torture/nbt/dgram.c
index 5d26d65e0c..8eb315127a 100644
--- a/source4/torture/nbt/dgram.c
+++ b/source4/torture/nbt/dgram.c
@@ -42,11 +42,11 @@ static void netlogon_handler(struct dgram_mailslot_handler *dgmslot,
struct socket_address *src)
{
NTSTATUS status;
- struct nbt_netlogon_response *netlogon = dgmslot->private;
+ struct nbt_netlogon_response *netlogon = dgmslot->private_data;
- dgmslot->private = netlogon = talloc(dgmslot, struct nbt_netlogon_response);
+ dgmslot->private_data = netlogon = talloc(dgmslot, struct nbt_netlogon_response);
- if (!dgmslot->private) {
+ if (!dgmslot->private_data) {
return;
}
@@ -139,11 +139,11 @@ static bool nbt_test_netlogon(struct torture_context *tctx)
&myname, &logon);
torture_assert_ntstatus_ok(tctx, status, "Failed to send netlogon request");
- while (timeval_elapsed(&tv) < 5 && !dgmslot->private) {
+ while (timeval_elapsed(&tv) < 5 && !dgmslot->private_data) {
event_loop_once(dgmsock->event_ctx);
}
- response = talloc_get_type(dgmslot->private, struct nbt_netlogon_response);
+ response = talloc_get_type(dgmslot->private_data, struct nbt_netlogon_response);
torture_assert(tctx, response != NULL, "Failed to receive a netlogon reply packet");
@@ -234,11 +234,11 @@ static bool nbt_test_netlogon2(struct torture_context *tctx)
&myname, &logon);
torture_assert_ntstatus_ok(tctx, status, "Failed to send netlogon request");
- while (timeval_elapsed(&tv) < 5 && dgmslot->private == NULL) {
+ while (timeval_elapsed(&tv) < 5 && dgmslot->private_data == NULL) {
event_loop_once(dgmsock->event_ctx);
}
- response = talloc_get_type(dgmslot->private, struct nbt_netlogon_response);
+ response = talloc_get_type(dgmslot->private_data, struct nbt_netlogon_response);
torture_assert(tctx, response != NULL, "Failed to receive a netlogon reply packet");
@@ -273,11 +273,11 @@ static bool nbt_test_netlogon2(struct torture_context *tctx)
&myname, &logon);
torture_assert_ntstatus_ok(tctx, status, "Failed to send netlogon request");
- while (timeval_elapsed(&tv) < 5 && dgmslot->private == NULL) {
+ while (timeval_elapsed(&tv) < 5 && dgmslot->private_data == NULL) {
event_loop_once(dgmsock->event_ctx);
}
- response = talloc_get_type(dgmslot->private, struct nbt_netlogon_response);
+ response = talloc_get_type(dgmslot->private_data, struct nbt_netlogon_response);
torture_assert(tctx, response != NULL, "Failed to receive a netlogon reply packet");
@@ -324,11 +324,11 @@ static bool nbt_test_netlogon2(struct torture_context *tctx)
torture_assert_ntstatus_ok(tctx, status, "Failed to send netlogon request");
- while (timeval_elapsed(&tv) < 5 && dgmslot->private == NULL) {
+ while (timeval_elapsed(&tv) < 5 && dgmslot->private_data == NULL) {
event_loop_once(dgmsock->event_ctx);
}
- response = talloc_get_type(dgmslot->private, struct nbt_netlogon_response);
+ response = talloc_get_type(dgmslot->private_data, struct nbt_netlogon_response);
torture_assert(tctx, response != NULL, "Failed to receive a netlogon reply packet");
@@ -365,11 +365,11 @@ static bool nbt_test_netlogon2(struct torture_context *tctx)
torture_assert_ntstatus_ok(tctx, status, "Failed to send netlogon request");
- while (timeval_elapsed(&tv) < 5 && dgmslot->private == NULL) {
+ while (timeval_elapsed(&tv) < 5 && dgmslot->private_data == NULL) {
event_loop_once(dgmsock->event_ctx);
}
- response = talloc_get_type(dgmslot->private, struct nbt_netlogon_response);
+ response = talloc_get_type(dgmslot->private_data, struct nbt_netlogon_response);
torture_assert(tctx, response != NULL, "Failed to receive a netlogon reply packet");
@@ -378,7 +378,7 @@ static bool nbt_test_netlogon2(struct torture_context *tctx)
torture_assert_int_equal(tctx, response->data.samlogon.data.nt5_ex.command, LOGON_SAM_LOGON_RESPONSE, "Got incorrect netlogon response command");
- dgmslot->private = NULL;
+ dgmslot->private_data = NULL;
ZERO_STRUCT(logon);
logon.command = LOGON_SAM_LOGON_REQUEST;
@@ -404,11 +404,11 @@ static bool nbt_test_netlogon2(struct torture_context *tctx)
torture_assert_ntstatus_ok(tctx, status, "Failed to send netlogon request");
- while (timeval_elapsed(&tv) < 5 && dgmslot->private == NULL) {
+ while (timeval_elapsed(&tv) < 5 && dgmslot->private_data == NULL) {
event_loop_once(dgmsock->event_ctx);
}
- response = talloc_get_type(dgmslot->private, struct nbt_netlogon_response);
+ response = talloc_get_type(dgmslot->private_data, struct nbt_netlogon_response);
torture_assert(tctx, response != NULL, "Failed to receive a netlogon reply packet");
@@ -513,11 +513,11 @@ static bool nbt_test_ntlogon(struct torture_context *tctx)
&myname, &logon);
torture_assert_ntstatus_ok(tctx, status, "Failed to send ntlogon request");
- while (timeval_elapsed(&tv) < 5 && dgmslot->private == NULL) {
+ while (timeval_elapsed(&tv) < 5 && dgmslot->private_data == NULL) {
event_loop_once(dgmsock->event_ctx);
}
- response = talloc_get_type(dgmslot->private, struct nbt_netlogon_response);
+ response = talloc_get_type(dgmslot->private_data, struct nbt_netlogon_response);
torture_assert(tctx, response != NULL, "Failed to receive a netlogon reply packet");
@@ -557,11 +557,11 @@ static bool nbt_test_ntlogon(struct torture_context *tctx)
&myname, &logon);
torture_assert_ntstatus_ok(tctx, status, "Failed to send ntlogon request");
- while (timeval_elapsed(&tv) < 5 && dgmslot->private == NULL) {
+ while (timeval_elapsed(&tv) < 5 && dgmslot->private_data == NULL) {
event_loop_once(dgmsock->event_ctx);
}
- response = talloc_get_type(dgmslot->private, struct nbt_netlogon_response);
+ response = talloc_get_type(dgmslot->private_data, struct nbt_netlogon_response);
torture_assert(tctx, response != NULL, "Failed to receive a netlogon reply packet");
@@ -597,11 +597,11 @@ static bool nbt_test_ntlogon(struct torture_context *tctx)
&myname, &logon);
torture_assert_ntstatus_ok(tctx, status, "Failed to send ntlogon request");
- while (timeval_elapsed(&tv) < 5 && !dgmslot->private) {
+ while (timeval_elapsed(&tv) < 5 && !dgmslot->private_data) {
event_loop_once(dgmsock->event_ctx);
}
- response = talloc_get_type(dgmslot->private, struct nbt_netlogon_response);
+ response = talloc_get_type(dgmslot->private_data, struct nbt_netlogon_response);
torture_assert(tctx, response != NULL, "Failed to receive a netlogon reply packet");
@@ -634,11 +634,11 @@ static bool nbt_test_ntlogon(struct torture_context *tctx)
&myname, &logon);
torture_assert_ntstatus_ok(tctx, status, "Failed to send ntlogon request");
- while (timeval_elapsed(&tv) < 5 && !dgmslot->private) {
+ while (timeval_elapsed(&tv) < 5 && !dgmslot->private_data) {
event_loop_once(dgmsock->event_ctx);
}
- response = talloc_get_type(dgmslot->private, struct nbt_netlogon_response);
+ response = talloc_get_type(dgmslot->private_data, struct nbt_netlogon_response);
torture_assert(tctx, response != NULL, "Failed to receive a netlogon reply packet");