diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-08-18 10:30:40 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:02:11 -0500 |
| commit | 698e7c5f2ae23656c50b95b5ca7151396d215ffb (patch) | |
| tree | 3ab6af42a52429c24985b269f5b809b4472de5dd /source4/librpc/rpc | |
| parent | ce84ab9a83441845202e99f8ffd4512839926024 (diff) | |
| download | samba-698e7c5f2ae23656c50b95b5ca7151396d215ffb.tar.gz samba-698e7c5f2ae23656c50b95b5ca7151396d215ffb.tar.bz2 samba-698e7c5f2ae23656c50b95b5ca7151396d215ffb.zip | |
r24535: rename struct dcerpc_interface_call -> struct ndr_interface_call
and move it to librpc/ndr/libndr.h
metze
(This used to be commit abd5551aabae1820baaa52a963e8c7aa9605914e)
Diffstat (limited to 'source4/librpc/rpc')
| -rw-r--r-- | source4/librpc/rpc/dcerpc.c | 4 | ||||
| -rw-r--r-- | source4/librpc/rpc/dcerpc.h | 14 | ||||
| -rw-r--r-- | source4/librpc/rpc/dcerpc_util.c | 4 |
3 files changed, 5 insertions, 17 deletions
diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c index a687df86b0..1560719bb8 100644 --- a/source4/librpc/rpc/dcerpc.c +++ b/source4/librpc/rpc/dcerpc.c @@ -1317,7 +1317,7 @@ struct rpc_request *dcerpc_ndr_request_send(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, void *r) { - const struct dcerpc_interface_call *call; + const struct ndr_interface_call *call; struct ndr_push *push; NTSTATUS status; DATA_BLOB request; @@ -1391,7 +1391,7 @@ _PUBLIC_ NTSTATUS dcerpc_ndr_request_recv(struct rpc_request *req) void *r = req->ndr.struct_ptr; uint32_t opnum = req->ndr.opnum; const struct dcerpc_interface_table *table = req->ndr.table; - const struct dcerpc_interface_call *call = &table->calls[opnum]; + const struct ndr_interface_call *call = &table->calls[opnum]; /* make sure the recv code doesn't free the request, as we need to grab the flags element before it is freed */ diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h index 362c0f9c25..29f1ad013c 100644 --- a/source4/librpc/rpc/dcerpc.h +++ b/source4/librpc/rpc/dcerpc.h @@ -158,18 +158,6 @@ struct dcerpc_pipe { /* this triggers the DCERPC_PFC_FLAG_CONC_MPX flag in the bind request */ #define DCERPC_CONCURRENT_MULTIPLEX (1<<19) -/* - this is used to find pointers to calls -*/ -struct dcerpc_interface_call { - const char *name; - size_t struct_size; - ndr_push_flags_fn_t ndr_push; - ndr_pull_flags_fn_t ndr_pull; - ndr_print_function_t ndr_print; - BOOL async; -}; - struct dcerpc_endpoint_list { uint32_t count; const char * const *names; @@ -185,7 +173,7 @@ struct dcerpc_interface_table { struct ndr_syntax_id syntax_id; const char *helpstring; uint32_t num_calls; - const struct dcerpc_interface_call *calls; + const struct ndr_interface_call *calls; const struct dcerpc_endpoint_list *endpoints; const struct dcerpc_authservice_list *authservices; }; diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c index 3e18a66af5..684dd3d56b 100644 --- a/source4/librpc/rpc/dcerpc_util.c +++ b/source4/librpc/rpc/dcerpc_util.c @@ -33,8 +33,8 @@ /* find a dcerpc call on an interface by name */ -const struct dcerpc_interface_call *dcerpc_iface_find_call(const struct dcerpc_interface_table *iface, - const char *name) +const struct ndr_interface_call *dcerpc_iface_find_call(const struct dcerpc_interface_table *iface, + const char *name) { int i; for (i=0;i<iface->num_calls;i++) { |