From 75d65808b72eea169585591cf4c0232fef56b5c2 Mon Sep 17 00:00:00 2001 From: Julien Kerihuel Date: Tue, 31 Mar 2015 18:48:48 +0200 Subject: [PATCH] Add DCERPC flag to call unbind hooks without destroying the connection itself upon termination of connection with pending calls outstanding. --- source4/rpc_server/dcerpc_server.c | 14 ++++++++++++++ source4/rpc_server/dcerpc_server.h | 1 + 2 files changed, 15 insertions(+) diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c index a8785b0..3ac1c8d 100644 --- a/source4/rpc_server/dcerpc_server.c +++ b/source4/rpc_server/dcerpc_server.c @@ -620,6 +620,10 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call) extra_flags |= DCERPC_PFC_FLAG_CONC_MPX; } + if (call->state_flags & DCESRV_CALL_STATE_FLAG_PROCESS_PENDING_CALL) { + call->context->conn->state_flags |= DCESRV_CALL_STATE_FLAG_PROCESS_PENDING_CALL; + } + /* handle any authentication that is being requested */ if (!dcesrv_auth_bind(call)) { talloc_free(call->context); @@ -839,6 +843,10 @@ static NTSTATUS dcesrv_alter(struct dcesrv_call_state *call) } } + if (call->state_flags & DCESRV_CALL_STATE_FLAG_PROCESS_PENDING_CALL) { + call->context->conn->state_flags |= DCESRV_CALL_STATE_FLAG_PROCESS_PENDING_CALL; + } + /* setup a alter_resp */ dcesrv_init_hdr(&pkt, lpcfg_rpc_big_endian(call->conn->dce_ctx->lp_ctx)); pkt.auth_length = 0; @@ -1348,6 +1356,12 @@ static void dcesrv_terminate_connection(struct dcesrv_connection *dce_conn, cons srv_conn = talloc_get_type(dce_conn->transport.private_data, struct stream_connection); + if (dce_conn->state_flags & DCESRV_CALL_STATE_FLAG_PROCESS_PENDING_CALL) { + if (dce_conn->contexts->iface && dce_conn->contexts->iface->unbind) { + dce_conn->contexts->iface->unbind(dce_conn->contexts, dce_conn->contexts->iface); + } + } + if (dce_conn->pending_call_list == NULL) { char *full_reason = talloc_asprintf(dce_conn, "dcesrv: %s", reason); diff --git a/source4/rpc_server/dcerpc_server.h b/source4/rpc_server/dcerpc_server.h index 1bf187a..9113c51 100644 --- a/source4/rpc_server/dcerpc_server.h +++ b/source4/rpc_server/dcerpc_server.h @@ -102,6 +102,7 @@ struct dcesrv_call_state { #define DCESRV_CALL_STATE_FLAG_ASYNC (1<<0) #define DCESRV_CALL_STATE_FLAG_MAY_ASYNC (1<<1) #define DCESRV_CALL_STATE_FLAG_MULTIPLEXED (1<<3) +#define DCESRV_CALL_STATE_FLAG_PROCESS_PENDING_CALL (1<<4) uint32_t state_flags; /* the time the request arrived in the server */ -- 1.9.1