sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

s3-librpc: Leave the epm registration connection open.

Browse Source
This commit is contained in:
Andreas Schneider 2011-03-09 10:17:06 +01:00 committed by Simo Sorce
parent d6a1469f43
commit 81a2046879
3 changed files with 77 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
source3/librpc/rpc/dcerpc_ep.c
View File

@ -130,12 +130,14 @@ done:
return status;
}
static NTSTATUS ep_register(const struct ndr_interface_table *iface,
static NTSTATUS ep_register(TALLOC_CTX *mem_ctx,
const struct ndr_interface_table *iface,
const struct dcerpc_binding_vector *bind_vec,
const struct GUID *object_guid,
const char *annotation,
uint32_t replace,
uint32_t unregister)
uint32_t unregister,
struct dcerpc_binding_handle **pbh)
{
struct rpc_pipe_client *cli = NULL;
struct dcerpc_binding_handle *h;
@ -285,33 +287,63 @@ static NTSTATUS ep_register(const struct ndr_interface_table *iface,
goto done;
}
if (pbh != NULL) {
*pbh = talloc_move(mem_ctx, &h);
talloc_steal(mem_ctx, cli);
}
done:
talloc_free(tmp_ctx);
return status;
}
NTSTATUS dcerpc_ep_register(const struct ndr_interface_table *iface,
NTSTATUS dcerpc_ep_register(TALLOC_CTX *mem_ctx,
const struct ndr_interface_table *iface,
const struct dcerpc_binding_vector *bind_vec,
const struct GUID *object_guid,
const char *annotation)
const char *annotation,
struct dcerpc_binding_handle **ph)
{
return ep_register(iface, bind_vec, object_guid, annotation, 1, 0);
return ep_register(mem_ctx,
iface,
bind_vec,
object_guid,
annotation,
1,
0,
ph);
}
NTSTATUS dcerpc_ep_register_noreplace(const struct ndr_interface_table *iface,
NTSTATUS dcerpc_ep_register_noreplace(TALLOC_CTX *mem_ctx,
const struct ndr_interface_table *iface,
const struct dcerpc_binding_vector *bind_vec,
const struct GUID *object_guid,
const char *annotation)
const char *annotation,
struct dcerpc_binding_handle **ph)
{
return ep_register(iface, bind_vec, object_guid, annotation, 0, 0);
return ep_register(mem_ctx,
iface,
bind_vec,
object_guid,
annotation,
0,
0,
ph);
}
NTSTATUS dcerpc_ep_unregister(const struct ndr_interface_table *iface,
const struct dcerpc_binding_vector *bind_vec,
const struct GUID *object_guid)
{
return ep_register(iface, bind_vec, object_guid, NULL, 0, 1);
return ep_register(NULL,
iface,
bind_vec,
object_guid,
NULL,
0,
1,
NULL);
}
/* vim: set ts=8 sw=8 noet cindent syntax=c.doxygen: */

18
source3/librpc/rpc/dcerpc_ep.h
View File

@ -34,6 +34,8 @@ NTSTATUS dcerpc_binding_vector_create(TALLOC_CTX *mem_ctx,
/**
* @brief Adds server address information in the local endpoint map.
*
* @param[in] mem_ctx The memory context to use for the binding handle.
*
* @param[in] iface The interface specification to register with the local
* endpoint map.
*
@ -55,17 +57,25 @@ NTSTATUS dcerpc_binding_vector_create(TALLOC_CTX *mem_ctx,
* supplied, including an empty annotation string,
* replaces any existing annotation string.
*
* @param[out] ph A pointer to store the binding handle. The memory
* context will be the give one. If you free this handle
* then the connection will be closed.
*
* @return An NTSTATUS error code.
*/
NTSTATUS dcerpc_ep_register(const struct ndr_interface_table *iface,
NTSTATUS dcerpc_ep_register(TALLOC_CTX *mem_ctx,
const struct ndr_interface_table *iface,
const struct dcerpc_binding_vector *bind_vec,
const struct GUID *object_guid,
const char *annotation);
const char *annotation,
struct dcerpc_binding_handle **ph);
NTSTATUS dcerpc_ep_register_noreplace(const struct ndr_interface_table *iface,
NTSTATUS dcerpc_ep_register_noreplace(TALLOC_CTX *mem_ctx,
const struct ndr_interface_table *iface,
const struct dcerpc_binding_vector *bind_vec,
const struct GUID *object_guid,
const char *annotation);
const char *annotation,
struct dcerpc_binding_handle **ph);
NTSTATUS dcerpc_ep_unregister(const struct ndr_interface_table *iface,
const struct dcerpc_binding_vector *bind_vec,

32
source3/rpc_server/rpc_ep_setup.c
View File

@ -149,14 +149,16 @@ static NTSTATUS _rpc_ep_unregister(const struct ndr_interface_table *iface)
}
static void rpc_ep_setup_register_loop(struct tevent_req *subreq);
static NTSTATUS rpc_ep_setup_try_register(struct tevent_context *ev_ctx,
static NTSTATUS rpc_ep_setup_try_register(TALLOC_CTX *mem_ctx,
struct tevent_context *ev_ctx,
struct messaging_context *msg_ctx,
const struct ndr_interface_table *iface,
const char *name,
uint16_t port);
uint16_t port,
struct dcerpc_binding_handle **pbh);
struct rpc_ep_regsiter_state {
uint32_t wait_time;
struct dcerpc_binding_handle *h;
struct tevent_context *ev_ctx;
struct messaging_context *msg_ctx;
@ -165,6 +167,8 @@ struct rpc_ep_regsiter_state {
const char *ncalrpc;
uint16_t port;
uint32_t wait_time;
};
static NTSTATUS rpc_ep_setup_register(struct tevent_context *ev_ctx,
@ -209,14 +213,17 @@ static void rpc_ep_setup_register_loop(struct tevent_req *req)
ok = tevent_wakeup_recv(req);
TALLOC_FREE(req);
if (!ok) {
talloc_free(state);
return;
}
status = rpc_ep_setup_try_register(state->ev_ctx,
status = rpc_ep_setup_try_register(state,
state->ev_ctx,
state->msg_ctx,
state->iface,
state->ncalrpc,
state->port);
state->port,
&state->h);
if (NT_STATUS_IS_OK(status)) {
talloc_free(state);
return;
@ -240,16 +247,18 @@ static void rpc_ep_setup_register_loop(struct tevent_req *req)
return;
}
static NTSTATUS rpc_ep_setup_try_register(struct tevent_context *ev_ctx,
static NTSTATUS rpc_ep_setup_try_register(TALLOC_CTX *mem_ctx,
struct tevent_context *ev_ctx,
struct messaging_context *msg_ctx,
const struct ndr_interface_table *iface,
const char *name,
uint16_t port)
uint16_t port,
struct dcerpc_binding_handle **pbh)
{
struct dcerpc_binding_vector *v = NULL;
NTSTATUS status;
status = dcerpc_binding_vector_create(talloc_tos(),
status = dcerpc_binding_vector_create(mem_ctx,
iface,
port,
name,
@ -258,10 +267,13 @@ static NTSTATUS rpc_ep_setup_try_register(struct tevent_context *ev_ctx,
return status;
}
status = dcerpc_ep_register(iface,
status = dcerpc_ep_register(mem_ctx,
iface,
v,
&iface->syntax_id.uuid,
name);
name,
pbh);
talloc_free(v);
if (!NT_STATUS_IS_OK(status)) {
return status;
}