diff options
author | Stefan Metzmacher <metze@samba.org> | 2007-05-16 14:52:54 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:52:30 -0500 |
commit | 40cd2d778093d7799b27b6beb37166d8a53f965c (patch) | |
tree | df28b80a71dd74da23820d3989e322bcba56c580 /source4/librpc/rpc/dcerpc_sock.c | |
parent | 3e5335063a15dda4c21baab0961d766f30b21d84 (diff) | |
download | samba-40cd2d778093d7799b27b6beb37166d8a53f965c.tar.gz samba-40cd2d778093d7799b27b6beb37166d8a53f965c.tar.bz2 samba-40cd2d778093d7799b27b6beb37166d8a53f965c.zip |
r22944: fix bug #4618:
rename private -> private_data
metze
(This used to be commit 58551f2f28fce8f1fcd04736c47ecd7458f32ea2)
Diffstat (limited to 'source4/librpc/rpc/dcerpc_sock.c')
-rw-r--r-- | source4/librpc/rpc/dcerpc_sock.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source4/librpc/rpc/dcerpc_sock.c b/source4/librpc/rpc/dcerpc_sock.c index 547b3ffb43..f5f4f7c398 100644 --- a/source4/librpc/rpc/dcerpc_sock.c +++ b/source4/librpc/rpc/dcerpc_sock.c @@ -46,7 +46,7 @@ struct sock_private { */ static void sock_dead(struct dcerpc_connection *p, NTSTATUS status) { - struct sock_private *sock = p->transport.private; + struct sock_private *sock = p->transport.private_data; if (!sock) return; @@ -112,7 +112,7 @@ static NTSTATUS sock_process_recv(void *private, DATA_BLOB blob) { struct dcerpc_connection *p = talloc_get_type(private, struct dcerpc_connection); - struct sock_private *sock = p->transport.private; + struct sock_private *sock = p->transport.private_data; sock->pending_reads--; if (sock->pending_reads == 0) { packet_recv_disable(sock->packet); @@ -129,7 +129,7 @@ static void sock_io_handler(struct event_context *ev, struct fd_event *fde, { struct dcerpc_connection *p = talloc_get_type(private, struct dcerpc_connection); - struct sock_private *sock = p->transport.private; + struct sock_private *sock = p->transport.private_data; if (flags & EVENT_FD_WRITE) { packet_queue_run(sock->packet); @@ -150,7 +150,7 @@ static void sock_io_handler(struct event_context *ev, struct fd_event *fde, */ static NTSTATUS sock_send_read(struct dcerpc_connection *p) { - struct sock_private *sock = p->transport.private; + struct sock_private *sock = p->transport.private_data; sock->pending_reads++; if (sock->pending_reads == 1) { packet_recv_enable(sock->packet); @@ -164,7 +164,7 @@ static NTSTATUS sock_send_read(struct dcerpc_connection *p) static NTSTATUS sock_send_request(struct dcerpc_connection *p, DATA_BLOB *data, BOOL trigger_read) { - struct sock_private *sock = p->transport.private; + struct sock_private *sock = p->transport.private_data; DATA_BLOB blob; NTSTATUS status; @@ -194,7 +194,7 @@ static NTSTATUS sock_send_request(struct dcerpc_connection *p, DATA_BLOB *data, */ static NTSTATUS sock_shutdown_pipe(struct dcerpc_connection *p, NTSTATUS status) { - struct sock_private *sock = p->transport.private; + struct sock_private *sock = p->transport.private_data; if (sock && sock->sock) { sock_dead(p, status); @@ -208,7 +208,7 @@ static NTSTATUS sock_shutdown_pipe(struct dcerpc_connection *p, NTSTATUS status) */ static const char *sock_peer_name(struct dcerpc_connection *p) { - struct sock_private *sock = talloc_get_type(p->transport.private, struct sock_private); + struct sock_private *sock = talloc_get_type(p->transport.private_data, struct sock_private); return sock->server_name; } @@ -217,7 +217,7 @@ static const char *sock_peer_name(struct dcerpc_connection *p) */ static const char *sock_target_hostname(struct dcerpc_connection *p) { - struct sock_private *sock = talloc_get_type(p->transport.private, struct sock_private); + struct sock_private *sock = talloc_get_type(p->transport.private_data, struct sock_private); return sock->server_name; } @@ -258,7 +258,7 @@ static void continue_socket_connect(struct composite_context *ctx) fill in the transport methods */ conn->transport.transport = s->transport; - conn->transport.private = NULL; + conn->transport.private_data = NULL; conn->transport.send_request = sock_send_request; conn->transport.send_read = sock_send_read; @@ -275,7 +275,7 @@ static void continue_socket_connect(struct composite_context *ctx) sock->fde = event_add_fd(conn->event_ctx, sock->sock, socket_get_fd(sock->sock), EVENT_FD_READ, sock_io_handler, conn); - conn->transport.private = sock; + conn->transport.private_data = sock; sock->packet = packet_init(sock); if (sock->packet == NULL) { |