svn commit: samba r19478 - in branches/SAMBA_4_0/source/librpc/rpc:
.
abartlet at samba.org
abartlet at samba.org
Tue Oct 24 07:56:59 GMT 2006
Author: abartlet
Date: 2006-10-24 07:56:59 +0000 (Tue, 24 Oct 2006)
New Revision: 19478
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19478
Log:
Remove unused functions, and make static functions used only in this
file. Everybody calls this via the dcerpc_pipe_connect() or
dcerpc_pipe_connect_b() functions.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/librpc/rpc/dcerpc_connect.c
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc_connect.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc_connect.c 2006-10-24 03:23:19 UTC (rev 19477)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc_connect.c 2006-10-24 07:56:59 UTC (rev 19478)
@@ -88,7 +88,7 @@
Initiate async open of a rpc connection to a rpc pipe on SMB using
the binding structure to determine the endpoint and options
*/
-struct composite_context *dcerpc_pipe_connect_ncacn_np_smb_send(TALLOC_CTX *mem_ctx,
+static struct composite_context *dcerpc_pipe_connect_ncacn_np_smb_send(TALLOC_CTX *mem_ctx,
struct dcerpc_pipe_connect *io)
{
struct composite_context *c;
@@ -141,7 +141,7 @@
/*
Receive result of a rpc connection to a rpc pipe on SMB
*/
-NTSTATUS dcerpc_pipe_connect_ncacn_np_smb_recv(struct composite_context *c)
+static NTSTATUS dcerpc_pipe_connect_ncacn_np_smb_recv(struct composite_context *c)
{
NTSTATUS status = composite_wait(c);
@@ -150,18 +150,6 @@
}
-/*
- Sync version of a rpc connection to a rpc pipe on SMB
-*/
-NTSTATUS dcerpc_pipe_connect_ncacn_np_smb(TALLOC_CTX *mem_ctx,
- struct dcerpc_pipe_connect *io)
-{
- struct composite_context *c;
- c = dcerpc_pipe_connect_ncacn_np_smb_send(mem_ctx, io);
- return dcerpc_pipe_connect_ncacn_np_smb_recv(c);
-}
-
-
struct pipe_np_smb2_state {
struct smb2_tree *tree;
struct dcerpc_pipe_connect io;
@@ -214,8 +202,8 @@
Initiate async open of a rpc connection request on SMB2 using
the binding structure to determine the endpoint and options
*/
-struct composite_context *dcerpc_pipe_connect_ncacn_np_smb2_send(TALLOC_CTX *mem_ctx,
- struct dcerpc_pipe_connect *io)
+static struct composite_context *dcerpc_pipe_connect_ncacn_np_smb2_send(TALLOC_CTX *mem_ctx,
+ struct dcerpc_pipe_connect *io)
{
struct composite_context *c;
struct pipe_np_smb2_state *s;
@@ -254,7 +242,7 @@
/*
Receive result of a rpc connection to a rpc pipe on SMB2
*/
-NTSTATUS dcerpc_pipe_connect_ncacn_np_smb2_recv(struct composite_context *c)
+static NTSTATUS dcerpc_pipe_connect_ncacn_np_smb2_recv(struct composite_context *c)
{
NTSTATUS status = composite_wait(c);
@@ -263,18 +251,6 @@
}
-/*
- Sync version of a rpc connection to a rpc pipe on SMB2
-*/
-NTSTATUS dcerpc_pipe_connect_ncacn_np_smb2(TALLOC_CTX *mem_ctx,
- struct dcerpc_pipe_connect *io)
-{
- struct composite_context *c;
- c = dcerpc_pipe_connect_ncacn_np_smb2_send(mem_ctx, io);
- return dcerpc_pipe_connect_ncacn_np_smb2_recv(c);
-}
-
-
struct pipe_ip_tcp_state {
struct dcerpc_pipe_connect io;
const char *host;
@@ -303,8 +279,8 @@
Initiate async open of a rpc connection to a rpc pipe on TCP/IP using
the binding structure to determine the endpoint and options
*/
-struct composite_context* dcerpc_pipe_connect_ncacn_ip_tcp_send(TALLOC_CTX *mem_ctx,
- struct dcerpc_pipe_connect *io)
+static struct composite_context* dcerpc_pipe_connect_ncacn_ip_tcp_send(TALLOC_CTX *mem_ctx,
+ struct dcerpc_pipe_connect *io)
{
struct composite_context *c;
struct pipe_ip_tcp_state *s;
@@ -336,7 +312,7 @@
/*
Receive result of a rpc connection to a rpc pipe on TCP/IP
*/
-NTSTATUS dcerpc_pipe_connect_ncacn_ip_tcp_recv(struct composite_context *c)
+static NTSTATUS dcerpc_pipe_connect_ncacn_ip_tcp_recv(struct composite_context *c)
{
NTSTATUS status = composite_wait(c);
@@ -345,18 +321,6 @@
}
-/*
- Sync version of rpc connection to a rpc pipe on TCP/IP
-*/
-NTSTATUS dcerpc_pipe_connect_ncacn_ip_tcp(TALLOC_CTX *mem_ctx,
- struct dcerpc_pipe_connect *io)
-{
- struct composite_context *c;
- c = dcerpc_pipe_connect_ncacn_ip_tcp_send(mem_ctx, io);
- return dcerpc_pipe_connect_ncacn_ip_tcp_recv(c);
-}
-
-
struct pipe_unix_state {
struct dcerpc_pipe_connect io;
const char *path;
@@ -383,8 +347,8 @@
Initiate async open of a rpc connection to a rpc pipe on unix socket using
the binding structure to determine the endpoint and options
*/
-struct composite_context* dcerpc_pipe_connect_ncacn_unix_stream_send(TALLOC_CTX *mem_ctx,
- struct dcerpc_pipe_connect *io)
+static struct composite_context* dcerpc_pipe_connect_ncacn_unix_stream_send(TALLOC_CTX *mem_ctx,
+ struct dcerpc_pipe_connect *io)
{
struct composite_context *c;
struct pipe_unix_state *s;
@@ -421,7 +385,7 @@
/*
Receive result of a rpc connection to a pipe on unix socket
*/
-NTSTATUS dcerpc_pipe_connect_ncacn_unix_stream_recv(struct composite_context *c)
+static NTSTATUS dcerpc_pipe_connect_ncacn_unix_stream_recv(struct composite_context *c)
{
NTSTATUS status = composite_wait(c);
@@ -430,22 +394,11 @@
}
-/*
- Sync version of a rpc connection to a rpc pipe on unix socket
-*/
-NTSTATUS dcerpc_pipe_connect_ncacn_unix_stream(TALLOC_CTX *mem_ctx,
- struct dcerpc_pipe_connect *io)
-{
- struct composite_context *c;
- c = dcerpc_pipe_connect_ncacn_unix_stream_send(mem_ctx, io);
- return dcerpc_pipe_connect_ncacn_unix_stream_recv(c);
-}
-
-
struct pipe_ncalrpc_state {
struct dcerpc_pipe_connect io;
};
+static NTSTATUS dcerpc_pipe_connect_ncalrpc_recv(struct composite_context *c);
/*
Stage 2 of ncalrpc: rpc pipe opened (or not)
@@ -467,8 +420,8 @@
Initiate async open of a rpc connection request on NCALRPC using
the binding structure to determine the endpoint and options
*/
-struct composite_context* dcerpc_pipe_connect_ncalrpc_send(TALLOC_CTX *mem_ctx,
- struct dcerpc_pipe_connect *io)
+static struct composite_context* dcerpc_pipe_connect_ncalrpc_send(TALLOC_CTX *mem_ctx,
+ struct dcerpc_pipe_connect *io)
{
struct composite_context *c;
struct pipe_ncalrpc_state *s;
@@ -495,7 +448,7 @@
/*
Receive result of a rpc connection to a rpc pipe on NCALRPC
*/
-NTSTATUS dcerpc_pipe_connect_ncalrpc_recv(struct composite_context *c)
+static NTSTATUS dcerpc_pipe_connect_ncalrpc_recv(struct composite_context *c)
{
NTSTATUS status = composite_wait(c);
@@ -504,17 +457,6 @@
}
-/*
- Sync version of a rpc connection to a rpc pipe on NCALRPC
-*/
-NTSTATUS dcerpc_pipe_connect_ncalrpc(TALLOC_CTX *mem_ctx,
- struct dcerpc_pipe_connect *io)
-{
- struct composite_context *c = dcerpc_pipe_connect_ncalrpc_send(mem_ctx, io);
- return dcerpc_pipe_connect_ncalrpc_recv(c);
-}
-
-
struct pipe_connect_state {
struct dcerpc_pipe *pipe;
struct dcerpc_binding *binding;
@@ -572,7 +514,7 @@
pc.binding = s->binding;
pc.interface = s->table;
pc.creds = s->credentials;
-
+
/* connect dcerpc pipe depending on required transport */
switch (s->binding->transport) {
case NCACN_NP:
More information about the samba-cvs
mailing list