diff options
author | Stephen Gallagher <sgallagh@redhat.com> | 2008-11-20 15:11:27 -0500 |
---|---|---|
committer | Simo Sorce <idra@samba.org> | 2008-11-20 16:22:21 -0500 |
commit | 2671d14d8068f8f0ee43cab529f10163a4b7dee1 (patch) | |
tree | 9eb2ba6a6199095d321455b245fd2fdf2cbf7643 /server/providers | |
parent | ed52202447ff9e80daa64864df271988bc5332ae (diff) | |
download | sssd-2671d14d8068f8f0ee43cab529f10163a4b7dee1.tar.gz sssd-2671d14d8068f8f0ee43cab529f10163a4b7dee1.tar.bz2 sssd-2671d14d8068f8f0ee43cab529f10163a4b7dee1.zip |
Created a helper function sssd_service_sbus_init() to simplify creating the initial connection to the monitor service within the child services. It will create the D-BUS connection to the monitor and configure the service to handle the mandatory getIdentity and ping methods.
Diffstat (limited to 'server/providers')
-rw-r--r-- | server/providers/data_provider.c | 54 | ||||
-rw-r--r-- | server/providers/data_provider.h | 8 |
2 files changed, 13 insertions, 49 deletions
diff --git a/server/providers/data_provider.c b/server/providers/data_provider.c index 565581a8..7adcbf6a 100644 --- a/server/providers/data_provider.c +++ b/server/providers/data_provider.c @@ -39,6 +39,7 @@ #include "sbus_interfaces.h" #include "util/btreemap.h" #include "data_provider.h" +#include "util/service_helpers.h" static int provide_identity(DBusMessage *message, void *data, DBusMessage **r); static int reply_ping(DBusMessage *message, void *data, DBusMessage **r); @@ -86,52 +87,21 @@ static int reply_ping(DBusMessage *message, void *data, DBusMessage **r) static int dp_monitor_init(struct dp_ctx *dpctx) { - struct dp_sbus_ctx *sbus_ctx; - DBusConnection *dbus_conn; - char *sbus_address; - int ret; - - ret = confdb_get_string(dpctx->cdb, dpctx, - "config/services/monitor", "sbusAddress", - DEFAULT_SBUS_ADDRESS, &sbus_address); - if (ret != EOK) { - return ret; - } - - sbus_ctx = talloc(dpctx, struct dp_sbus_ctx); - if (!sbus_ctx) { + struct service_sbus_ctx *ss_ctx; + + /* Set up SBUS connection to the monitor */ + ss_ctx = sssd_service_sbus_init(dpctx, dpctx->ev, dpctx->cdb, + provide_identity, + reply_ping); + if (ss_ctx == NULL) { + DEBUG(0, ("Could not initialize D-BUS.\n")); return ENOMEM; } - sbus_ctx->ev = dpctx->ev; - ret = sbus_new_connection(sbus_ctx, sbus_ctx->ev, - sbus_address, - &sbus_ctx->scon_ctx, NULL); - if (ret != EOK) { - talloc_free(sbus_ctx); - return ret; - } - dbus_conn = sbus_get_connection(sbus_ctx->scon_ctx); - - /* set up handler for service methods */ - sbus_ctx->sm_ctx = talloc_zero(sbus_ctx, struct sbus_method_ctx); - if (!sbus_ctx->sm_ctx) { - talloc_free(sbus_ctx); - return ENOMEM; - } - sbus_ctx->sm_ctx->interface = talloc_strdup(sbus_ctx->sm_ctx, - SERVICE_INTERFACE); - sbus_ctx->sm_ctx->path = talloc_strdup(sbus_ctx->sm_ctx, - SERVICE_PATH); - if (!sbus_ctx->sm_ctx->interface || !sbus_ctx->sm_ctx->path) { - talloc_free(sbus_ctx); - return ENOMEM; - } - sbus_ctx->sm_ctx->methods = mon_sbus_methods; - sbus_ctx->sm_ctx->message_handler = sbus_message_handler; - sbus_conn_add_method_ctx(sbus_ctx->scon_ctx, sbus_ctx->sm_ctx); + /* Set up DP-specific listeners */ + /* None currently used */ - dpctx->sbus_ctx = sbus_ctx; + dpctx->ss_ctx = ss_ctx; return EOK; } diff --git a/server/providers/data_provider.h b/server/providers/data_provider.h index 366cd6f6..7ed796ac 100644 --- a/server/providers/data_provider.h +++ b/server/providers/data_provider.h @@ -50,17 +50,11 @@ struct dp_module { void *pvt_data; }; -struct dp_sbus_ctx { - struct event_context *ev; - struct sbus_method_ctx *sm_ctx; - struct sbus_conn_ctx *scon_ctx; -}; - struct dp_ctx { struct event_context *ev; struct confdb_ctx *cdb; struct ldb_context *ldb; - struct dp_sbus_ctx *sbus_ctx; + struct service_sbus_ctx *ss_ctx; struct dp_module **modules; }; |