r4358: At metze's request, the Christmas elves have removed gensec_end in
[samba.git] / source4 / librpc / rpc / dcerpc.c
index beccac78ca5a933e52809367475ac9f1d317c0d1..f6c0ebc41328dff7801c5581c6f0ea8a84967b82 100644 (file)
@@ -4,6 +4,7 @@
 
    Copyright (C) Tim Potter 2003
    Copyright (C) Andrew Tridgell 2003
+   Copyright (C) Jelmer Vernooij 2004
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 #include "dlinklist.h"
 #include "librpc/gen_ndr/ndr_epmapper.h"
 
-NTSTATUS librpc_init(void)
+struct dcerpc_interface_list *dcerpc_pipes = NULL;
+
+NTSTATUS librpc_register_interface (const struct dcerpc_interface_table *interface)
 {
-       /* FIXME: Register module registration function here */
-       return NT_STATUS_OK;
+       struct dcerpc_interface_list *l = talloc_p(NULL, struct dcerpc_interface_list);
+               
+       if (idl_iface_by_name (interface->name) != NULL) {
+               DEBUG(0, ("Attempt to register interface %s twice\n", interface->name));
+               return NT_STATUS_OBJECT_NAME_COLLISION;
+       }
+       l->table = interface;
+       
+       DLIST_ADD(dcerpc_pipes, l);
+       
+       return NT_STATUS_OK;
 }
-
+  
 /* initialise a dcerpc pipe. */
 struct dcerpc_pipe *dcerpc_pipe_init(void)
 {
@@ -73,9 +85,6 @@ void dcerpc_pipe_close(struct dcerpc_pipe *p)
        if (!p) return;
        p->reference_count--;
        if (p->reference_count <= 0) {
-               if (p->security_state.generic_state) {
-                       gensec_end(&p->security_state.generic_state);
-               }
                p->transport.shutdown_pipe(p);
                talloc_free(p);
        }
@@ -321,6 +330,10 @@ static NTSTATUS dcerpc_push_request_sign(struct dcerpc_pipe *p,
                ndr->flags |= LIBNDR_FLAG_BIGENDIAN;
        }
 
+       if (pkt->pfc_flags & DCERPC_PFC_FLAG_ORPC) {
+               ndr->flags |= LIBNDR_FLAG_OBJECT_PRESENT;
+       }
+
        status = ndr_push_dcerpc_packet(ndr, NDR_SCALARS|NDR_BUFFERS, pkt);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
@@ -384,6 +397,9 @@ static NTSTATUS dcerpc_push_request_sign(struct dcerpc_pipe *p,
                                            blob->length - 
                                            p->security_state.auth_info->credentials.length,
                                            &creds2);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return status;
+               }
                memcpy(blob->data + blob->length - creds2.length, creds2.data, creds2.length);
                break;
 
@@ -396,6 +412,9 @@ static NTSTATUS dcerpc_push_request_sign(struct dcerpc_pipe *p,
                                            blob->length - 
                                            p->security_state.auth_info->credentials.length,
                                            &creds2);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return status;
+               }
                memcpy(blob->data + blob->length - creds2.length, creds2.data, creds2.length);
                break;
 
@@ -525,7 +544,7 @@ NTSTATUS dcerpc_bind(struct dcerpc_pipe *p,
        pkt.u.bind.max_recv_frag = 5840;
        pkt.u.bind.assoc_group_id = 0;
        pkt.u.bind.num_contexts = 1;
-       pkt.u.bind.ctx_list = talloc(mem_ctx, sizeof(pkt.u.bind.ctx_list[0]));
+       pkt.u.bind.ctx_list = talloc_p(mem_ctx, struct dcerpc_ctx_list);
        if (!pkt.u.bind.ctx_list) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -604,7 +623,7 @@ NTSTATUS dcerpc_alter(struct dcerpc_pipe *p,
        pkt.u.alter.max_recv_frag = 0x2000;
        pkt.u.alter.assoc_group_id = 0;
        pkt.u.alter.num_contexts = 1;
-       pkt.u.alter.ctx_list = talloc(mem_ctx, sizeof(pkt.u.alter.ctx_list[0]));
+       pkt.u.alter.ctx_list = talloc_p(mem_ctx, struct dcerpc_ctx_list);
        if (!pkt.u.alter.ctx_list) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -665,8 +684,8 @@ NTSTATUS dcerpc_auth3(struct dcerpc_pipe *p,
        pkt.pfc_flags = DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST;
        pkt.call_id = next_call_id(p);
        pkt.auth_length = 0;
-       pkt.u.auth._pad = 0;
-       pkt.u.auth.auth_info = data_blob(NULL, 0);
+       pkt.u.auth3._pad = 0;
+       pkt.u.auth3.auth_info = data_blob(NULL, 0);
 
        /* construct the NDR form of the packet */
        status = dcerpc_push_auth(&blob, mem_ctx, &pkt, p->security_state.auth_info);
@@ -841,7 +860,7 @@ static int dcerpc_req_destructor(void *ptr)
   perform the send size of a async dcerpc request
 */
 struct rpc_request *dcerpc_request_send(struct dcerpc_pipe *p, 
-                                       struct GUID *object,
+                                       const struct GUID *object,
                                        uint16_t opnum,
                                        TALLOC_CTX *mem_ctx,
                                        DATA_BLOB *stub_data)
@@ -879,13 +898,15 @@ struct rpc_request *dcerpc_request_send(struct dcerpc_pipe *p,
        pkt.ptype = DCERPC_PKT_REQUEST;
        pkt.call_id = req->call_id;
        pkt.auth_length = 0;
+       pkt.pfc_flags = 0;
        pkt.u.request.alloc_hint = remaining;
        pkt.u.request.context_id = 0;
        pkt.u.request.opnum = opnum;
+
        if (object) {
-               pkt.object.object = *object;
+               pkt.u.request.object.object = *object;
                pkt.pfc_flags |= DCERPC_PFC_FLAG_ORPC;
-               /* FIXME: pfc_cflags is reset below! */
+               chunk_size -= ndr_size_GUID(0,object,0);
        }
 
        DLIST_ADD(p->pending, req);
@@ -896,7 +917,7 @@ struct rpc_request *dcerpc_request_send(struct dcerpc_pipe *p,
                BOOL last_frag = False;
 
                first_packet = False;
-               pkt.pfc_flags = 0;
+               pkt.pfc_flags &= ~(DCERPC_PFC_FLAG_FIRST |DCERPC_PFC_FLAG_LAST);
 
                if (remaining == stub_data->length) {
                        pkt.pfc_flags |= DCERPC_PFC_FLAG_FIRST;
@@ -974,7 +995,7 @@ NTSTATUS dcerpc_request_recv(struct rpc_request *req,
   perform a full request/response pair on a dcerpc pipe
 */
 NTSTATUS dcerpc_request(struct dcerpc_pipe *p, 
-                       struct OBJREF *object,
+                       struct GUID *object,
                        uint16_t opnum,
                        TALLOC_CTX *mem_ctx,
                        DATA_BLOB *stub_data_in,
@@ -1136,24 +1157,23 @@ static NTSTATUS dcerpc_ndr_validate_out(struct dcerpc_pipe *p,
 
 
 /*
-  send a rpc request with a given set of ndr helper functions
-
-  call dcerpc_ndr_request_recv() to receive the answer
-*/
+ send a rpc request given a dcerpc_call structure 
+ */
 struct rpc_request *dcerpc_ndr_request_send(struct dcerpc_pipe *p,
-                                               struct OBJREF *object,
-                                           uint32_t opnum,
-                                           TALLOC_CTX *mem_ctx,
-                                           NTSTATUS (*ndr_push)(struct ndr_push *, int, void *),
-                                           NTSTATUS (*ndr_pull)(struct ndr_pull *, int, void *),
-                                           void *struct_ptr,
-                                           size_t struct_size)
+                                               const struct GUID *object,
+                                               const struct dcerpc_interface_table *table,
+                                               uint32_t opnum, 
+                                               TALLOC_CTX *mem_ctx, 
+                                               void *r)
 {
+       const struct dcerpc_interface_call *call;
        struct ndr_push *push;
        NTSTATUS status;
        DATA_BLOB request;
        struct rpc_request *req;
 
+       call = &table->calls[opnum];
+
        /* setup for a ndr_push_* call */
        push = ndr_push_init();
        if (!push) {
@@ -1165,7 +1185,7 @@ struct rpc_request *dcerpc_ndr_request_send(struct dcerpc_pipe *p,
        }
 
        /* push the structure into a blob */
-       status = ndr_push(push, NDR_IN, struct_ptr);
+       status = call->ndr_push(push, NDR_IN, r);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(2,("Unable to ndr_push structure in dcerpc_ndr_request_send - %s\n",
                         nt_errstr(status)));
@@ -1177,8 +1197,8 @@ struct rpc_request *dcerpc_ndr_request_send(struct dcerpc_pipe *p,
        request = ndr_push_blob(push);
 
        if (p->flags & DCERPC_DEBUG_VALIDATE_IN) {
-               status = dcerpc_ndr_validate_in(p, mem_ctx, request, struct_size, 
-                                               ndr_push, ndr_pull);
+               status = dcerpc_ndr_validate_in(p, mem_ctx, request, call->struct_size, 
+                                               call->ndr_push, call->ndr_pull);
                if (!NT_STATUS_IS_OK(status)) {
                        DEBUG(2,("Validation failed in dcerpc_ndr_request_send - %s\n",
                                 nt_errstr(status)));
@@ -1194,10 +1214,9 @@ struct rpc_request *dcerpc_ndr_request_send(struct dcerpc_pipe *p,
        req = dcerpc_request_send(p, object, opnum, mem_ctx, &request);
 
        if (req != NULL) {
-               req->ndr.ndr_push = ndr_push;
-               req->ndr.ndr_pull = ndr_pull;
-               req->ndr.struct_ptr = struct_ptr;
-               req->ndr.struct_size = struct_size;
+               req->ndr.table = table;
+               req->ndr.opnum = opnum;
+               req->ndr.struct_ptr = r;
                req->ndr.mem_ctx = mem_ctx;
        }
 
@@ -1215,14 +1234,18 @@ NTSTATUS dcerpc_ndr_request_recv(struct rpc_request *req)
        NTSTATUS status;
        DATA_BLOB response;
        struct ndr_pull *pull;
-       struct rpc_request_ndr ndr = req->ndr;
        uint_t flags;
+       TALLOC_CTX *mem_ctx = req->ndr.mem_ctx;
+       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];
 
        /* make sure the recv code doesn't free the request, as we
           need to grab the flags element before it is freed */
        talloc_increase_ref_count(req);
 
-       status = dcerpc_request_recv(req, ndr.mem_ctx, &response);
+       status = dcerpc_request_recv(req, mem_ctx, &response);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
@@ -1231,7 +1254,7 @@ NTSTATUS dcerpc_ndr_request_recv(struct rpc_request *req)
        talloc_free(req);
 
        /* prepare for ndr_pull_* */
-       pull = ndr_pull_init_flags(p, &response, ndr.mem_ctx);
+       pull = ndr_pull_init_flags(p, &response, mem_ctx);
        if (!pull) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -1244,15 +1267,19 @@ NTSTATUS dcerpc_ndr_request_recv(struct rpc_request *req)
        dump_data(10, pull->data, pull->data_size);
 
        /* pull the structure from the blob */
-       status = ndr.ndr_pull(pull, NDR_OUT, ndr.struct_ptr);
+       status = call->ndr_pull(pull, NDR_OUT, r);
        if (!NT_STATUS_IS_OK(status)) {
+               dcerpc_log_packet(table, opnum, NDR_OUT, 
+                                 &response);
                return status;
        }
 
        if (p->flags & DCERPC_DEBUG_VALIDATE_OUT) {
-               status = dcerpc_ndr_validate_out(p, ndr.mem_ctx, ndr.struct_ptr, ndr.struct_size, 
-                                                ndr.ndr_push, ndr.ndr_pull);
+               status = dcerpc_ndr_validate_out(p, mem_ctx, r, call->struct_size, 
+                                                call->ndr_push, call->ndr_pull);
                if (!NT_STATUS_IS_OK(status)) {
+                       dcerpc_log_packet(table, opnum, NDR_OUT, 
+                                 &response);
                        return status;
                }
        }
@@ -1278,17 +1305,15 @@ NTSTATUS dcerpc_ndr_request_recv(struct rpc_request *req)
   standard format
 */
 NTSTATUS dcerpc_ndr_request(struct dcerpc_pipe *p,
-                               struct OBJREF *object,
-                           uint32_t opnum,
-                           TALLOC_CTX *mem_ctx,
-                           NTSTATUS (*ndr_push)(struct ndr_push *, int, void *),
-                           NTSTATUS (*ndr_pull)(struct ndr_pull *, int, void *),
-                           void *struct_ptr,
-                           size_t struct_size)
+                           const struct GUID *object,
+                           const struct dcerpc_interface_table *table,
+                           uint32_t opnum, 
+                           TALLOC_CTX *mem_ctx, 
+                           void *r)
 {
        struct rpc_request *req;
 
-       req = dcerpc_ndr_request_send(p, object, opnum, mem_ctx, ndr_push, ndr_pull, struct_ptr, struct_size);
+       req = dcerpc_ndr_request_send(p, object, table, opnum, mem_ctx, r);
        if (req == NULL) {
                return NT_STATUS_NO_MEMORY;
        }