On 02/11/2015 08:23 PM, Jakub Hrozek wrote:
On Wed, Jan 21, 2015 at 02:08:54PM +0100, Pavel Březina wrote:
2/3 of previous sbus changes are acked so I'm sending few more patches from
my tree.
Commit messages should be sufficient to justify the changes. Simply put, I
wanted to standardize and shorten names of generated and hard coded
variables and constants so the code stays simple with longer interface
names.
From 610ffa5ee147f383ad2f876b6659bb9b92628808 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrez...@redhat.com>
Date: Thu, 15 Jan 2015 14:23:19 +0100
Subject: [PATCH 1/7] IFP: move interface definitions from ifpsrv.c into
separate file
Number of IFP interfaces will grown up rapidly in the future. It is
not convenient to keep it inside ifpsrv.c.
One little nitpick
+errno_t ifp_register_sbus_interface(struct sbus_connection *conn, void *pvt)
Can you s/pvt/handler_data/ to be consistent with the changes we did in
sbus?
Done.
From f5efe4b4ac3903d9c31bffe14c305eb2a23d56cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrez...@redhat.com>
Date: Thu, 15 Jan 2015 14:38:39 +0100
Subject: [PATCH 2/7] IFP: unify generated interfaces names
Number of interfaces will grow. It is mandatory to unify names of
generated structures and methods to simplify coding and debugging.
The C name is created from D-Bus lowercased interface name using
the following rewrite rules:
org.freedesktop.sssd.infopipe -> iface_ifp
. -> _
Example:
org.freedesktop.sssd.infopipe.Domains -> iface_ifp_domains
Again, nitpick:
#include <dbus/dbus.h>
#include "sbus/sssd_dbus.h"
-#include "monitor/monitor_interfaces.h"
-#include "confdb/confdb.h"
-#include "responder/ifp/ifp_private.h"
+#include "responder/ifp/ifp_iface_generated.h"
#include "responder/ifp/ifp_domains.h"
#include "responder/ifp/ifp_components.h"
-#include "responder/common/responder_sbus.h"
The include changes seem unrelated, or are they? (except adding
responder/ifp/ifp_iface_generated.h maybe)
This belongs to the first patch since it removes headers that are no
longer needed when the code was moved. I moved it to the first patch.
From e816d0414b49d43cfe58920793f9106c567ab6aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrez...@redhat.com>
Date: Fri, 16 Jan 2015 13:36:12 +0100
Subject: [PATCH 4/7] IFP: simplify object path constant names
The number of interfaces will grow and in order to keep names of
object path constant consistent it means that also their names
will grow. The new naming schema is:
/org/freedesktop/sssd/infopipe -> IFP_PATH_
/ -> _
everything uppercase
Example:
/org/freedesktop/sssd/infopipe/Components/Responders
-> IFP_PATH_COMPONENTS_RESPONDERS
If the path contains a _TREE suffix, it represents the whole
subtree. For example:
IFP_PATH_DOMAINS is /org/freedesktop/sssd/infopipe/Domains/*
Ack to the code, but didn't you mean to say IFP_PATH_DOMAINS_TREE in the
commit message? (I like the _TREE change btw)
You are correct sir.
New patches are attached, thank you for the review.
>From 6cd42ea7ce6ffcc380a7b23326540787f9c06c0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrez...@redhat.com>
Date: Thu, 15 Jan 2015 14:23:19 +0100
Subject: [PATCH 1/5] IFP: move interface definitions from ifpsrv.c into
separate file
Number of IFP interfaces will grown up rapidly in the future. It is
not convenient to keep it inside ifpsrv.c.
---
Makefile.am | 1 +
src/responder/ifp/ifp_iface.c | 105 ++++++++++++++++++++++++++++++++++++++++
src/responder/ifp/ifp_private.h | 3 ++
src/responder/ifp/ifpsrv.c | 80 ++----------------------------
4 files changed, 113 insertions(+), 76 deletions(-)
create mode 100644 src/responder/ifp/ifp_iface.c
diff --git a/Makefile.am b/Makefile.am
index fece4b41a71124a3cb914b0c114c449002c28958..70278550fd22b820528f9613d30e11a723ea6c5c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1047,6 +1047,7 @@ sssd_ifp_SOURCES = \
src/responder/ifp/ifpsrv_cmd.c \
src/responder/ifp/ifp_iface_generated.c \
src/responder/ifp/ifp_iface_generated.h \
+ src/responder/ifp/ifp_iface.c \
src/responder/ifp/ifpsrv_util.c \
src/responder/ifp/ifp_domains.c \
src/responder/ifp/ifp_components.c \
diff --git a/src/responder/ifp/ifp_iface.c b/src/responder/ifp/ifp_iface.c
new file mode 100644
index 0000000000000000000000000000000000000000..d20c89fcd97eb7d366e70949e8c47d56889edfdc
--- /dev/null
+++ b/src/responder/ifp/ifp_iface.c
@@ -0,0 +1,105 @@
+/*
+ Authors:
+ Pavel BÅezina <pbrez...@redhat.com>
+
+ Copyright (C) 2015 Red Hat
+
+ 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
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <dbus/dbus.h>
+
+#include "sbus/sssd_dbus.h"
+#include "responder/ifp/ifp_iface_generated.h"
+#include "responder/ifp/ifp_domains.h"
+#include "responder/ifp/ifp_components.h"
+
+struct infopipe_iface ifp_iface = {
+ { &infopipe_iface_meta, 0 },
+ .Ping = ifp_ping,
+
+ /* components */
+ .ListComponents = ifp_list_components,
+ .ListResponders = ifp_list_responders,
+ .ListBackends = ifp_list_backends,
+ .FindMonitor = ifp_find_monitor,
+ .FindResponderByName = ifp_find_responder_by_name,
+ .FindBackendByName = ifp_find_backend_by_name,
+
+ .GetUserAttr = ifp_user_get_attr,
+ .GetUserGroups = ifp_user_get_groups,
+ .ListDomains = ifp_list_domains,
+ .FindDomainByName = ifp_find_domain_by_name,
+};
+
+struct infopipe_component ifp_component = {
+ { &infopipe_component_meta, 0 },
+ .Enable = ifp_component_enable,
+ .Disable = ifp_component_disable,
+ .ChangeDebugLevel = ifp_component_change_debug_level,
+ .ChangeDebugLevelTemporarily = ifp_component_change_debug_level_tmp,
+ .infopipe_component_get_name = ifp_component_get_name,
+ .infopipe_component_get_debug_level = ifp_component_get_debug_level,
+ .infopipe_component_get_enabled = ifp_component_get_enabled,
+ .infopipe_component_get_type = ifp_component_get_type,
+ /* FIXME: This should be part of Components.Backends interface, onece
+ * SSSD supports multiple interfaces per object path. */
+ .infopipe_component_get_providers = ifp_backend_get_providers
+};
+
+struct infopipe_domain ifp_domain = {
+ { &infopipe_domain_meta, 0 },
+ .infopipe_domain_get_name = ifp_dom_get_name,
+ .infopipe_domain_get_provider = ifp_dom_get_provider,
+ .infopipe_domain_get_primary_servers = ifp_dom_get_primary_servers,
+ .infopipe_domain_get_backup_servers = ifp_dom_get_backup_servers,
+ .infopipe_domain_get_min_id = ifp_dom_get_min_id,
+ .infopipe_domain_get_max_id = ifp_dom_get_max_id,
+ .infopipe_domain_get_realm = ifp_dom_get_realm,
+ .infopipe_domain_get_forest = ifp_dom_get_forest,
+ .infopipe_domain_get_login_format = ifp_dom_get_login_format,
+ .infopipe_domain_get_fully_qualified_name_format = ifp_dom_get_fqdn_format,
+ .infopipe_domain_get_enumerable = ifp_dom_get_enumerable,
+ .infopipe_domain_get_use_fully_qualified_names = ifp_dom_get_use_fqdn,
+ .infopipe_domain_get_subdomain = ifp_dom_get_subdomain,
+ .infopipe_domain_get_parent_domain = ifp_dom_get_parent_domain
+};
+
+struct iface_map {
+ const char *path;
+ struct sbus_vtable *vtable;
+};
+
+static struct iface_map iface_map[] = {
+ { INFOPIPE_PATH, &ifp_iface.vtable },
+ { INFOPIPE_DOMAIN_PATH, &ifp_domain.vtable },
+ { INFOPIPE_COMPONENT_PATH, &ifp_component.vtable },
+ { NULL, NULL },
+};
+
+errno_t ifp_register_sbus_interface(struct sbus_connection *conn, void *pvt)
+{
+ errno_t ret;
+ int i;
+
+ for (i = 0; iface_map[i].path != NULL; i++) {
+ ret = sbus_conn_register_iface(conn, iface_map[i].vtable,
+ iface_map[i].path, pvt);
+ if (ret != EOK) {
+ return ret;
+ }
+ }
+
+ return EOK;
+}
diff --git a/src/responder/ifp/ifp_private.h b/src/responder/ifp/ifp_private.h
index 676544fadfab136707f01b752c9526d64ee6fa3f..96ccb41e4c0ea081951035d11c93712db86fb5a1 100644
--- a/src/responder/ifp/ifp_private.h
+++ b/src/responder/ifp/ifp_private.h
@@ -46,6 +46,9 @@ struct ifp_ctx {
const char **user_whitelist;
};
+errno_t ifp_register_sbus_interface(struct sbus_connection *conn,
+ void *handler_data);
+
/* This is a throwaway method to ease the review of the patch.
* It will be removed later */
int ifp_ping(struct sbus_request *dbus_req, void *data);
diff --git a/src/responder/ifp/ifpsrv.c b/src/responder/ifp/ifpsrv.c
index 5b7f26ca1135f9ee47e45d50e44516bf58cdcccd..476008174948083e5a2c55876ad9b8395de1c233 100644
--- a/src/responder/ifp/ifpsrv.c
+++ b/src/responder/ifp/ifpsrv.c
@@ -68,69 +68,6 @@ static struct data_provider_iface ifp_dp_methods = {
.getAccountInfo = NULL,
};
-struct infopipe_iface ifp_iface = {
- { &infopipe_iface_meta, 0 },
- .Ping = ifp_ping,
-
- /* components */
- .ListComponents = ifp_list_components,
- .ListResponders = ifp_list_responders,
- .ListBackends = ifp_list_backends,
- .FindMonitor = ifp_find_monitor,
- .FindResponderByName = ifp_find_responder_by_name,
- .FindBackendByName = ifp_find_backend_by_name,
-
- .GetUserAttr = ifp_user_get_attr,
- .GetUserGroups = ifp_user_get_groups,
- .ListDomains = ifp_list_domains,
- .FindDomainByName = ifp_find_domain_by_name,
-};
-
-struct infopipe_component ifp_component = {
- { &infopipe_component_meta, 0 },
- .Enable = ifp_component_enable,
- .Disable = ifp_component_disable,
- .ChangeDebugLevel = ifp_component_change_debug_level,
- .ChangeDebugLevelTemporarily = ifp_component_change_debug_level_tmp,
- .infopipe_component_get_name = ifp_component_get_name,
- .infopipe_component_get_debug_level = ifp_component_get_debug_level,
- .infopipe_component_get_enabled = ifp_component_get_enabled,
- .infopipe_component_get_type = ifp_component_get_type,
- /* FIXME: This should be part of Components.Backends interface, onece
- * SSSD supports multiple interfaces per object path. */
- .infopipe_component_get_providers = ifp_backend_get_providers
-};
-
-struct infopipe_domain ifp_domain = {
- { &infopipe_domain_meta, 0 },
- .infopipe_domain_get_name = ifp_dom_get_name,
- .infopipe_domain_get_provider = ifp_dom_get_provider,
- .infopipe_domain_get_primary_servers = ifp_dom_get_primary_servers,
- .infopipe_domain_get_backup_servers = ifp_dom_get_backup_servers,
- .infopipe_domain_get_min_id = ifp_dom_get_min_id,
- .infopipe_domain_get_max_id = ifp_dom_get_max_id,
- .infopipe_domain_get_realm = ifp_dom_get_realm,
- .infopipe_domain_get_forest = ifp_dom_get_forest,
- .infopipe_domain_get_login_format = ifp_dom_get_login_format,
- .infopipe_domain_get_fully_qualified_name_format = ifp_dom_get_fqdn_format,
- .infopipe_domain_get_enumerable = ifp_dom_get_enumerable,
- .infopipe_domain_get_use_fully_qualified_names = ifp_dom_get_use_fqdn,
- .infopipe_domain_get_subdomain = ifp_dom_get_subdomain,
- .infopipe_domain_get_parent_domain = ifp_dom_get_parent_domain
-};
-
-struct sysbus_iface {
- const char *path;
- struct sbus_vtable *iface_vtable;
-};
-
-static struct sysbus_iface ifp_ifaces[] = {
- { INFOPIPE_PATH, &ifp_iface.vtable },
- { INFOPIPE_DOMAIN_PATH, &ifp_domain.vtable },
- { INFOPIPE_COMPONENT_PATH, &ifp_component.vtable },
- { NULL, NULL },
-};
-
struct sss_cmd_table *get_ifp_cmds(void)
{
static struct sss_cmd_table ifp_cmds[] = {
@@ -171,14 +108,12 @@ static errno_t
sysbus_init(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
const char *dbus_name,
- struct sysbus_iface *sysbus_ifaces,
void *pvt,
struct sysbus_ctx **sysbus)
{
DBusError dbus_error;
DBusConnection *conn = NULL;
struct sysbus_ctx *system_bus = NULL;
- int i;
errno_t ret;
system_bus = talloc_zero(mem_ctx, struct sysbus_ctx);
@@ -224,15 +159,10 @@ sysbus_init(TALLOC_CTX *mem_ctx,
goto fail;
}
- for (i = 0; sysbus_ifaces[i].path != NULL; i++) {
- ret = sbus_conn_register_iface(system_bus->conn,
- sysbus_ifaces[i].iface_vtable,
- sysbus_ifaces[i].path, pvt);
- if (ret != EOK) {
- DEBUG(SSSDBG_CRIT_FAILURE,
- "Could not add the interface\n");
- goto fail;
- }
+ ret = ifp_register_sbus_interface(system_bus->conn, pvt);
+ if (ret != EOK) {
+ DEBUG(SSSDBG_CRIT_FAILURE, "Could not register interfaces\n");
+ goto fail;
}
*sysbus = system_bus;
@@ -267,7 +197,6 @@ static int ifp_sysbus_reconnect(struct sbus_request *dbus_req, void *data)
/* Connect to the D-BUS system bus and set up methods */
ret = sysbus_init(ifp_ctx, ifp_ctx->rctx->ev,
INFOPIPE_IFACE,
- ifp_ifaces,
ifp_ctx, &ifp_ctx->sysbus);
if (ret == ERR_NO_SYSBUS) {
DEBUG(SSSDBG_MINOR_FAILURE,
@@ -398,7 +327,6 @@ int ifp_process_init(TALLOC_CTX *mem_ctx,
/* Connect to the D-BUS system bus and set up methods */
ret = sysbus_init(ifp_ctx, ifp_ctx->rctx->ev,
INFOPIPE_IFACE,
- ifp_ifaces,
ifp_ctx, &ifp_ctx->sysbus);
if (ret == ERR_NO_SYSBUS) {
DEBUG(SSSDBG_MINOR_FAILURE,
--
1.9.3
>From 7e08ec398dabbeb87dfa3eff7bbc0804a70d4681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrez...@redhat.com>
Date: Thu, 12 Feb 2015 11:35:26 +0100
Subject: [PATCH 2/5] IFP: unify generated interfaces names
Number of interfaces will grow. It is mandatory to unify names of
generated structures and methods to simplify coding and debugging.
The C name is created from D-Bus lowercased interface name using
the following rewrite rules:
org.freedesktop.sssd.infopipe -> iface_ifp
. -> _
Example:
org.freedesktop.sssd.infopipe.Domains -> iface_ifp_domains
---
src/responder/ifp/ifp_components.c | 20 ++--
src/responder/ifp/ifp_domains.c | 4 +-
src/responder/ifp/ifp_iface.c | 56 +++++-----
src/responder/ifp/ifp_iface.xml | 6 +-
src/responder/ifp/ifp_iface_generated.c | 184 ++++++++++++++++----------------
src/responder/ifp/ifp_iface_generated.h | 150 +++++++++++++-------------
src/responder/ifp/ifpsrv.c | 4 +-
src/responder/ifp/ifpsrv_cmd.c | 3 +-
8 files changed, 213 insertions(+), 214 deletions(-)
diff --git a/src/responder/ifp/ifp_components.c b/src/responder/ifp/ifp_components.c
index fa476c76a50fd4e250a6ef44c978d85fe2a736d4..3d700f92e118f0ae39c44165c4a65c1302e1f220 100644
--- a/src/responder/ifp/ifp_components.c
+++ b/src/responder/ifp/ifp_components.c
@@ -359,7 +359,7 @@ done:
return sbus_request_fail_and_finish(dbus_req, error);
}
- return infopipe_iface_ListComponents_finish(dbus_req, result, num);
+ return iface_ifp_ListComponents_finish(dbus_req, result, num);
}
int ifp_list_responders(struct sbus_request *dbus_req, void *data)
@@ -376,7 +376,7 @@ int ifp_list_responders(struct sbus_request *dbus_req, void *data)
return sbus_request_fail_and_finish(dbus_req, error);
}
- return infopipe_iface_ListResponders_finish(dbus_req, result, num);
+ return iface_ifp_ListResponders_finish(dbus_req, result, num);
}
int ifp_list_backends(struct sbus_request *dbus_req, void *data)
@@ -403,12 +403,12 @@ done:
return sbus_request_fail_and_finish(dbus_req, error);
}
- return infopipe_iface_ListBackends_finish(dbus_req, result, num);
+ return iface_ifp_ListBackends_finish(dbus_req, result, num);
}
int ifp_find_monitor(struct sbus_request *dbus_req, void *data)
{
- return infopipe_iface_FindMonitor_finish(dbus_req, PATH_MONITOR);
+ return iface_ifp_FindMonitor_finish(dbus_req, PATH_MONITOR);
}
int ifp_find_responder_by_name(struct sbus_request *dbus_req,
@@ -429,7 +429,7 @@ int ifp_find_responder_by_name(struct sbus_request *dbus_req,
return sbus_request_fail_and_finish(dbus_req, error);
}
- return infopipe_iface_FindResponderByName_finish(dbus_req, result);
+ return iface_ifp_FindResponderByName_finish(dbus_req, result);
}
int ifp_find_backend_by_name(struct sbus_request *dbus_req,
@@ -459,7 +459,7 @@ int ifp_find_backend_by_name(struct sbus_request *dbus_req,
return sbus_request_fail_and_finish(dbus_req, error);
}
- return infopipe_iface_FindBackendByName_finish(dbus_req, result);
+ return iface_ifp_FindBackendByName_finish(dbus_req, result);
}
int ifp_component_enable(struct sbus_request *dbus_req, void *data)
@@ -529,7 +529,7 @@ done:
return sbus_request_fail_and_finish(dbus_req, error);
}
- return infopipe_component_Enable_finish(dbus_req);
+ return iface_ifp_components_Enable_finish(dbus_req);
#endif
}
@@ -600,7 +600,7 @@ done:
return sbus_request_fail_and_finish(dbus_req, error);
}
- return infopipe_component_Disable_finish(dbus_req);
+ return iface_ifp_components_Disable_finish(dbus_req);
#endif
}
@@ -682,7 +682,7 @@ done:
return sbus_request_fail_and_finish(dbus_req, error);
}
- return infopipe_component_ChangeDebugLevel_finish(dbus_req);
+ return iface_ifp_components_ChangeDebugLevel_finish(dbus_req);
#endif
}
@@ -728,7 +728,7 @@ done:
return sbus_request_fail_and_finish(dbus_req, error);
}
- return infopipe_component_ChangeDebugLevelTemporarily_finish(dbus_req);
+ return iface_ifp_components_ChangeDebugLevelTemporarily_finish(dbus_req);
}
void ifp_component_get_name(struct sbus_request *dbus_req,
diff --git a/src/responder/ifp/ifp_domains.c b/src/responder/ifp/ifp_domains.c
index 7cddb2ebcb864f0e07cad8688d69ae85942bac24..b9c2c77975f491ef6f7d9da07d35d180687eb5ab 100644
--- a/src/responder/ifp/ifp_domains.c
+++ b/src/responder/ifp/ifp_domains.c
@@ -135,7 +135,7 @@ static void ifp_list_domains_process(struct tevent_req *req)
pi++;
}
- ret = infopipe_iface_ListDomains_finish(ireq->dbus_req, paths, num_domains);
+ ret = iface_ifp_ListDomains_finish(ireq->dbus_req, paths, num_domains);
if (ret != EOK) {
DEBUG(SSSDBG_OP_FAILURE, "Could not finish request!\n");
}
@@ -242,7 +242,7 @@ static void ifp_find_domain_by_name_process(struct tevent_req *req)
return;
}
- ret = infopipe_iface_FindDomainByName_finish(ireq->dbus_req, path);
+ ret = iface_ifp_FindDomainByName_finish(ireq->dbus_req, path);
if (ret != EOK) {
DEBUG(SSSDBG_OP_FAILURE, "Could not finish request!\n");
}
diff --git a/src/responder/ifp/ifp_iface.c b/src/responder/ifp/ifp_iface.c
index d20c89fcd97eb7d366e70949e8c47d56889edfdc..d0f0260d05153eb3a6df76a42b0ac76aecbb7e17 100644
--- a/src/responder/ifp/ifp_iface.c
+++ b/src/responder/ifp/ifp_iface.c
@@ -25,8 +25,8 @@
#include "responder/ifp/ifp_domains.h"
#include "responder/ifp/ifp_components.h"
-struct infopipe_iface ifp_iface = {
- { &infopipe_iface_meta, 0 },
+struct iface_ifp iface_ifp = {
+ { &iface_ifp_meta, 0 },
.Ping = ifp_ping,
/* components */
@@ -43,37 +43,37 @@ struct infopipe_iface ifp_iface = {
.FindDomainByName = ifp_find_domain_by_name,
};
-struct infopipe_component ifp_component = {
- { &infopipe_component_meta, 0 },
+struct iface_ifp_components iface_ifp_components = {
+ { &iface_ifp_components_meta, 0 },
.Enable = ifp_component_enable,
.Disable = ifp_component_disable,
.ChangeDebugLevel = ifp_component_change_debug_level,
.ChangeDebugLevelTemporarily = ifp_component_change_debug_level_tmp,
- .infopipe_component_get_name = ifp_component_get_name,
- .infopipe_component_get_debug_level = ifp_component_get_debug_level,
- .infopipe_component_get_enabled = ifp_component_get_enabled,
- .infopipe_component_get_type = ifp_component_get_type,
+ .iface_ifp_components_get_name = ifp_component_get_name,
+ .iface_ifp_components_get_debug_level = ifp_component_get_debug_level,
+ .iface_ifp_components_get_enabled = ifp_component_get_enabled,
+ .iface_ifp_components_get_type = ifp_component_get_type,
/* FIXME: This should be part of Components.Backends interface, onece
* SSSD supports multiple interfaces per object path. */
- .infopipe_component_get_providers = ifp_backend_get_providers
+ .iface_ifp_components_get_providers = ifp_backend_get_providers
};
-struct infopipe_domain ifp_domain = {
- { &infopipe_domain_meta, 0 },
- .infopipe_domain_get_name = ifp_dom_get_name,
- .infopipe_domain_get_provider = ifp_dom_get_provider,
- .infopipe_domain_get_primary_servers = ifp_dom_get_primary_servers,
- .infopipe_domain_get_backup_servers = ifp_dom_get_backup_servers,
- .infopipe_domain_get_min_id = ifp_dom_get_min_id,
- .infopipe_domain_get_max_id = ifp_dom_get_max_id,
- .infopipe_domain_get_realm = ifp_dom_get_realm,
- .infopipe_domain_get_forest = ifp_dom_get_forest,
- .infopipe_domain_get_login_format = ifp_dom_get_login_format,
- .infopipe_domain_get_fully_qualified_name_format = ifp_dom_get_fqdn_format,
- .infopipe_domain_get_enumerable = ifp_dom_get_enumerable,
- .infopipe_domain_get_use_fully_qualified_names = ifp_dom_get_use_fqdn,
- .infopipe_domain_get_subdomain = ifp_dom_get_subdomain,
- .infopipe_domain_get_parent_domain = ifp_dom_get_parent_domain
+struct iface_ifp_domains iface_ifp_domains = {
+ { &iface_ifp_domains_meta, 0 },
+ .iface_ifp_domains_get_name = ifp_dom_get_name,
+ .iface_ifp_domains_get_provider = ifp_dom_get_provider,
+ .iface_ifp_domains_get_primary_servers = ifp_dom_get_primary_servers,
+ .iface_ifp_domains_get_backup_servers = ifp_dom_get_backup_servers,
+ .iface_ifp_domains_get_min_id = ifp_dom_get_min_id,
+ .iface_ifp_domains_get_max_id = ifp_dom_get_max_id,
+ .iface_ifp_domains_get_realm = ifp_dom_get_realm,
+ .iface_ifp_domains_get_forest = ifp_dom_get_forest,
+ .iface_ifp_domains_get_login_format = ifp_dom_get_login_format,
+ .iface_ifp_domains_get_fully_qualified_name_format = ifp_dom_get_fqdn_format,
+ .iface_ifp_domains_get_enumerable = ifp_dom_get_enumerable,
+ .iface_ifp_domains_get_use_fully_qualified_names = ifp_dom_get_use_fqdn,
+ .iface_ifp_domains_get_subdomain = ifp_dom_get_subdomain,
+ .iface_ifp_domains_get_parent_domain = ifp_dom_get_parent_domain
};
struct iface_map {
@@ -82,9 +82,9 @@ struct iface_map {
};
static struct iface_map iface_map[] = {
- { INFOPIPE_PATH, &ifp_iface.vtable },
- { INFOPIPE_DOMAIN_PATH, &ifp_domain.vtable },
- { INFOPIPE_COMPONENT_PATH, &ifp_component.vtable },
+ { INFOPIPE_PATH, &iface_ifp.vtable },
+ { INFOPIPE_DOMAIN_PATH, &iface_ifp_domains.vtable },
+ { INFOPIPE_COMPONENT_PATH, &iface_ifp_components.vtable },
{ NULL, NULL },
};
diff --git a/src/responder/ifp/ifp_iface.xml b/src/responder/ifp/ifp_iface.xml
index 815abd1aeb39e131c0151afc8031e11dce36702c..81d4dbf8be5a4a6fe60e83edb502ad409044ebaa 100644
--- a/src/responder/ifp/ifp_iface.xml
+++ b/src/responder/ifp/ifp_iface.xml
@@ -2,7 +2,7 @@
"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd";>
<node>
<interface name="org.freedesktop.sssd.infopipe">
- <annotation value="infopipe_iface" name="org.freedesktop.DBus.GLib.CSymbol"/>
+ <annotation value="iface_ifp" name="org.freedesktop.DBus.GLib.CSymbol"/>
<method name="Ping">
<!-- manual argument parsing, raw handler -->
@@ -61,7 +61,7 @@
</interface>
<interface name="org.freedesktop.sssd.infopipe.Components">
- <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="infopipe_component"/>
+ <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="iface_ifp_components"/>
<method name="Enable" />
<method name="Disable" />
@@ -84,7 +84,7 @@
</interface>
<interface name="org.freedesktop.sssd.infopipe.Domains">
- <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="infopipe_domain"/>
+ <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="iface_ifp_domains"/>
<property name="name" type="s" access="read"/>
<property name="provider" type="s" access="read"/>
diff --git a/src/responder/ifp/ifp_iface_generated.c b/src/responder/ifp/ifp_iface_generated.c
index 306a98a7bb908db0ac5a9a1fec9fbb8483b238c9..2cdfa3012a46dddbed05db2eb6f8ef2308825c16 100644
--- a/src/responder/ifp/ifp_iface_generated.c
+++ b/src/responder/ifp/ifp_iface_generated.c
@@ -13,12 +13,12 @@ static int invoke_s_method(struct sbus_request *dbus_req, void *function_ptr);
static int invoke_u_method(struct sbus_request *dbus_req, void *function_ptr);
/* arguments for org.freedesktop.sssd.infopipe.ListComponents */
-const struct sbus_arg_meta infopipe_iface_ListComponents__out[] = {
+const struct sbus_arg_meta iface_ifp_ListComponents__out[] = {
{ "components", "ao" },
{ NULL, }
};
-int infopipe_iface_ListComponents_finish(struct sbus_request *req, const char *arg_components[], int len_components)
+int iface_ifp_ListComponents_finish(struct sbus_request *req, const char *arg_components[], int len_components)
{
return sbus_request_return_and_finish(req,
DBUS_TYPE_ARRAY, DBUS_TYPE_OBJECT_PATH, &arg_components, len_components,
@@ -26,12 +26,12 @@ int infopipe_iface_ListComponents_finish(struct sbus_request *req, const char *a
}
/* arguments for org.freedesktop.sssd.infopipe.ListResponders */
-const struct sbus_arg_meta infopipe_iface_ListResponders__out[] = {
+const struct sbus_arg_meta iface_ifp_ListResponders__out[] = {
{ "responders", "ao" },
{ NULL, }
};
-int infopipe_iface_ListResponders_finish(struct sbus_request *req, const char *arg_responders[], int len_responders)
+int iface_ifp_ListResponders_finish(struct sbus_request *req, const char *arg_responders[], int len_responders)
{
return sbus_request_return_and_finish(req,
DBUS_TYPE_ARRAY, DBUS_TYPE_OBJECT_PATH, &arg_responders, len_responders,
@@ -39,12 +39,12 @@ int infopipe_iface_ListResponders_finish(struct sbus_request *req, const char *a
}
/* arguments for org.freedesktop.sssd.infopipe.ListBackends */
-const struct sbus_arg_meta infopipe_iface_ListBackends__out[] = {
+const struct sbus_arg_meta iface_ifp_ListBackends__out[] = {
{ "backends", "ao" },
{ NULL, }
};
-int infopipe_iface_ListBackends_finish(struct sbus_request *req, const char *arg_backends[], int len_backends)
+int iface_ifp_ListBackends_finish(struct sbus_request *req, const char *arg_backends[], int len_backends)
{
return sbus_request_return_and_finish(req,
DBUS_TYPE_ARRAY, DBUS_TYPE_OBJECT_PATH, &arg_backends, len_backends,
@@ -52,12 +52,12 @@ int infopipe_iface_ListBackends_finish(struct sbus_request *req, const char *arg
}
/* arguments for org.freedesktop.sssd.infopipe.FindMonitor */
-const struct sbus_arg_meta infopipe_iface_FindMonitor__out[] = {
+const struct sbus_arg_meta iface_ifp_FindMonitor__out[] = {
{ "monitor", "o" },
{ NULL, }
};
-int infopipe_iface_FindMonitor_finish(struct sbus_request *req, const char *arg_monitor)
+int iface_ifp_FindMonitor_finish(struct sbus_request *req, const char *arg_monitor)
{
return sbus_request_return_and_finish(req,
DBUS_TYPE_OBJECT_PATH, &arg_monitor,
@@ -65,18 +65,18 @@ int infopipe_iface_FindMonitor_finish(struct sbus_request *req, const char *arg_
}
/* arguments for org.freedesktop.sssd.infopipe.FindResponderByName */
-const struct sbus_arg_meta infopipe_iface_FindResponderByName__in[] = {
+const struct sbus_arg_meta iface_ifp_FindResponderByName__in[] = {
{ "name", "s" },
{ NULL, }
};
/* arguments for org.freedesktop.sssd.infopipe.FindResponderByName */
-const struct sbus_arg_meta infopipe_iface_FindResponderByName__out[] = {
+const struct sbus_arg_meta iface_ifp_FindResponderByName__out[] = {
{ "responder", "o" },
{ NULL, }
};
-int infopipe_iface_FindResponderByName_finish(struct sbus_request *req, const char *arg_responder)
+int iface_ifp_FindResponderByName_finish(struct sbus_request *req, const char *arg_responder)
{
return sbus_request_return_and_finish(req,
DBUS_TYPE_OBJECT_PATH, &arg_responder,
@@ -84,18 +84,18 @@ int infopipe_iface_FindResponderByName_finish(struct sbus_request *req, const ch
}
/* arguments for org.freedesktop.sssd.infopipe.FindBackendByName */
-const struct sbus_arg_meta infopipe_iface_FindBackendByName__in[] = {
+const struct sbus_arg_meta iface_ifp_FindBackendByName__in[] = {
{ "name", "s" },
{ NULL, }
};
/* arguments for org.freedesktop.sssd.infopipe.FindBackendByName */
-const struct sbus_arg_meta infopipe_iface_FindBackendByName__out[] = {
+const struct sbus_arg_meta iface_ifp_FindBackendByName__out[] = {
{ "backend", "o" },
{ NULL, }
};
-int infopipe_iface_FindBackendByName_finish(struct sbus_request *req, const char *arg_backend)
+int iface_ifp_FindBackendByName_finish(struct sbus_request *req, const char *arg_backend)
{
return sbus_request_return_and_finish(req,
DBUS_TYPE_OBJECT_PATH, &arg_backend,
@@ -103,31 +103,31 @@ int infopipe_iface_FindBackendByName_finish(struct sbus_request *req, const char
}
/* arguments for org.freedesktop.sssd.infopipe.GetUserAttr */
-const struct sbus_arg_meta infopipe_iface_GetUserAttr__in[] = {
+const struct sbus_arg_meta iface_ifp_GetUserAttr__in[] = {
{ "user", "s" },
{ "attr", "as" },
{ NULL, }
};
/* arguments for org.freedesktop.sssd.infopipe.GetUserAttr */
-const struct sbus_arg_meta infopipe_iface_GetUserAttr__out[] = {
+const struct sbus_arg_meta iface_ifp_GetUserAttr__out[] = {
{ "values", "a{sv}" },
{ NULL, }
};
/* arguments for org.freedesktop.sssd.infopipe.GetUserGroups */
-const struct sbus_arg_meta infopipe_iface_GetUserGroups__in[] = {
+const struct sbus_arg_meta iface_ifp_GetUserGroups__in[] = {
{ "user", "s" },
{ NULL, }
};
/* arguments for org.freedesktop.sssd.infopipe.GetUserGroups */
-const struct sbus_arg_meta infopipe_iface_GetUserGroups__out[] = {
+const struct sbus_arg_meta iface_ifp_GetUserGroups__out[] = {
{ "values", "as" },
{ NULL, }
};
-int infopipe_iface_GetUserGroups_finish(struct sbus_request *req, const char *arg_values[], int len_values)
+int iface_ifp_GetUserGroups_finish(struct sbus_request *req, const char *arg_values[], int len_values)
{
return sbus_request_return_and_finish(req,
DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &arg_values, len_values,
@@ -135,18 +135,18 @@ int infopipe_iface_GetUserGroups_finish(struct sbus_request *req, const char *ar
}
/* arguments for org.freedesktop.sssd.infopipe.FindDomainByName */
-const struct sbus_arg_meta infopipe_iface_FindDomainByName__in[] = {
+const struct sbus_arg_meta iface_ifp_FindDomainByName__in[] = {
{ "name", "s" },
{ NULL, }
};
/* arguments for org.freedesktop.sssd.infopipe.FindDomainByName */
-const struct sbus_arg_meta infopipe_iface_FindDomainByName__out[] = {
+const struct sbus_arg_meta iface_ifp_FindDomainByName__out[] = {
{ "domain", "o" },
{ NULL, }
};
-int infopipe_iface_FindDomainByName_finish(struct sbus_request *req, const char *arg_domain)
+int iface_ifp_FindDomainByName_finish(struct sbus_request *req, const char *arg_domain)
{
return sbus_request_return_and_finish(req,
DBUS_TYPE_OBJECT_PATH, &arg_domain,
@@ -154,12 +154,12 @@ int infopipe_iface_FindDomainByName_finish(struct sbus_request *req, const char
}
/* arguments for org.freedesktop.sssd.infopipe.ListDomains */
-const struct sbus_arg_meta infopipe_iface_ListDomains__out[] = {
+const struct sbus_arg_meta iface_ifp_ListDomains__out[] = {
{ "domain", "ao" },
{ NULL, }
};
-int infopipe_iface_ListDomains_finish(struct sbus_request *req, const char *arg_domain[], int len_domain)
+int iface_ifp_ListDomains_finish(struct sbus_request *req, const char *arg_domain[], int len_domain)
{
return sbus_request_return_and_finish(req,
DBUS_TYPE_ARRAY, DBUS_TYPE_OBJECT_PATH, &arg_domain, len_domain,
@@ -167,172 +167,172 @@ int infopipe_iface_ListDomains_finish(struct sbus_request *req, const char *arg_
}
/* methods for org.freedesktop.sssd.infopipe */
-const struct sbus_method_meta infopipe_iface__methods[] = {
+const struct sbus_method_meta iface_ifp__methods[] = {
{
"Ping", /* name */
NULL, /* no in_args */
NULL, /* no out_args */
- offsetof(struct infopipe_iface, Ping),
+ offsetof(struct iface_ifp, Ping),
NULL, /* no invoker */
},
{
"ListComponents", /* name */
NULL, /* no in_args */
- infopipe_iface_ListComponents__out,
- offsetof(struct infopipe_iface, ListComponents),
+ iface_ifp_ListComponents__out,
+ offsetof(struct iface_ifp, ListComponents),
NULL, /* no invoker */
},
{
"ListResponders", /* name */
NULL, /* no in_args */
- infopipe_iface_ListResponders__out,
- offsetof(struct infopipe_iface, ListResponders),
+ iface_ifp_ListResponders__out,
+ offsetof(struct iface_ifp, ListResponders),
NULL, /* no invoker */
},
{
"ListBackends", /* name */
NULL, /* no in_args */
- infopipe_iface_ListBackends__out,
- offsetof(struct infopipe_iface, ListBackends),
+ iface_ifp_ListBackends__out,
+ offsetof(struct iface_ifp, ListBackends),
NULL, /* no invoker */
},
{
"FindMonitor", /* name */
NULL, /* no in_args */
- infopipe_iface_FindMonitor__out,
- offsetof(struct infopipe_iface, FindMonitor),
+ iface_ifp_FindMonitor__out,
+ offsetof(struct iface_ifp, FindMonitor),
NULL, /* no invoker */
},
{
"FindResponderByName", /* name */
- infopipe_iface_FindResponderByName__in,
- infopipe_iface_FindResponderByName__out,
- offsetof(struct infopipe_iface, FindResponderByName),
+ iface_ifp_FindResponderByName__in,
+ iface_ifp_FindResponderByName__out,
+ offsetof(struct iface_ifp, FindResponderByName),
invoke_s_method,
},
{
"FindBackendByName", /* name */
- infopipe_iface_FindBackendByName__in,
- infopipe_iface_FindBackendByName__out,
- offsetof(struct infopipe_iface, FindBackendByName),
+ iface_ifp_FindBackendByName__in,
+ iface_ifp_FindBackendByName__out,
+ offsetof(struct iface_ifp, FindBackendByName),
invoke_s_method,
},
{
"GetUserAttr", /* name */
- infopipe_iface_GetUserAttr__in,
- infopipe_iface_GetUserAttr__out,
- offsetof(struct infopipe_iface, GetUserAttr),
+ iface_ifp_GetUserAttr__in,
+ iface_ifp_GetUserAttr__out,
+ offsetof(struct iface_ifp, GetUserAttr),
NULL, /* no invoker */
},
{
"GetUserGroups", /* name */
- infopipe_iface_GetUserGroups__in,
- infopipe_iface_GetUserGroups__out,
- offsetof(struct infopipe_iface, GetUserGroups),
+ iface_ifp_GetUserGroups__in,
+ iface_ifp_GetUserGroups__out,
+ offsetof(struct iface_ifp, GetUserGroups),
invoke_s_method,
},
{
"FindDomainByName", /* name */
- infopipe_iface_FindDomainByName__in,
- infopipe_iface_FindDomainByName__out,
- offsetof(struct infopipe_iface, FindDomainByName),
+ iface_ifp_FindDomainByName__in,
+ iface_ifp_FindDomainByName__out,
+ offsetof(struct iface_ifp, FindDomainByName),
invoke_s_method,
},
{
"ListDomains", /* name */
NULL, /* no in_args */
- infopipe_iface_ListDomains__out,
- offsetof(struct infopipe_iface, ListDomains),
+ iface_ifp_ListDomains__out,
+ offsetof(struct iface_ifp, ListDomains),
NULL, /* no invoker */
},
{ NULL, }
};
/* interface info for org.freedesktop.sssd.infopipe */
-const struct sbus_interface_meta infopipe_iface_meta = {
+const struct sbus_interface_meta iface_ifp_meta = {
"org.freedesktop.sssd.infopipe", /* name */
- infopipe_iface__methods,
+ iface_ifp__methods,
NULL, /* no signals */
NULL, /* no properties */
sbus_invoke_get_all, /* GetAll invoker */
};
-int infopipe_component_Enable_finish(struct sbus_request *req)
+int iface_ifp_components_Enable_finish(struct sbus_request *req)
{
return sbus_request_return_and_finish(req,
DBUS_TYPE_INVALID);
}
-int infopipe_component_Disable_finish(struct sbus_request *req)
+int iface_ifp_components_Disable_finish(struct sbus_request *req)
{
return sbus_request_return_and_finish(req,
DBUS_TYPE_INVALID);
}
/* arguments for org.freedesktop.sssd.infopipe.Components.ChangeDebugLevel */
-const struct sbus_arg_meta infopipe_component_ChangeDebugLevel__in[] = {
+const struct sbus_arg_meta iface_ifp_components_ChangeDebugLevel__in[] = {
{ "new_level", "u" },
{ NULL, }
};
-int infopipe_component_ChangeDebugLevel_finish(struct sbus_request *req)
+int iface_ifp_components_ChangeDebugLevel_finish(struct sbus_request *req)
{
return sbus_request_return_and_finish(req,
DBUS_TYPE_INVALID);
}
/* arguments for org.freedesktop.sssd.infopipe.Components.ChangeDebugLevelTemporarily */
-const struct sbus_arg_meta infopipe_component_ChangeDebugLevelTemporarily__in[] = {
+const struct sbus_arg_meta iface_ifp_components_ChangeDebugLevelTemporarily__in[] = {
{ "new_level", "u" },
{ NULL, }
};
-int infopipe_component_ChangeDebugLevelTemporarily_finish(struct sbus_request *req)
+int iface_ifp_components_ChangeDebugLevelTemporarily_finish(struct sbus_request *req)
{
return sbus_request_return_and_finish(req,
DBUS_TYPE_INVALID);
}
/* methods for org.freedesktop.sssd.infopipe.Components */
-const struct sbus_method_meta infopipe_component__methods[] = {
+const struct sbus_method_meta iface_ifp_components__methods[] = {
{
"Enable", /* name */
NULL, /* no in_args */
NULL, /* no out_args */
- offsetof(struct infopipe_component, Enable),
+ offsetof(struct iface_ifp_components, Enable),
NULL, /* no invoker */
},
{
"Disable", /* name */
NULL, /* no in_args */
NULL, /* no out_args */
- offsetof(struct infopipe_component, Disable),
+ offsetof(struct iface_ifp_components, Disable),
NULL, /* no invoker */
},
{
"ChangeDebugLevel", /* name */
- infopipe_component_ChangeDebugLevel__in,
+ iface_ifp_components_ChangeDebugLevel__in,
NULL, /* no out_args */
- offsetof(struct infopipe_component, ChangeDebugLevel),
+ offsetof(struct iface_ifp_components, ChangeDebugLevel),
invoke_u_method,
},
{
"ChangeDebugLevelTemporarily", /* name */
- infopipe_component_ChangeDebugLevelTemporarily__in,
+ iface_ifp_components_ChangeDebugLevelTemporarily__in,
NULL, /* no out_args */
- offsetof(struct infopipe_component, ChangeDebugLevelTemporarily),
+ offsetof(struct iface_ifp_components, ChangeDebugLevelTemporarily),
invoke_u_method,
},
{ NULL, }
};
/* property info for org.freedesktop.sssd.infopipe.Components */
-const struct sbus_property_meta infopipe_component__properties[] = {
+const struct sbus_property_meta iface_ifp_components__properties[] = {
{
"name", /* name */
"s", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct infopipe_component, infopipe_component_get_name),
+ offsetof(struct iface_ifp_components, iface_ifp_components_get_name),
sbus_invoke_get_s,
0, /* not writable */
NULL, /* no invoker */
@@ -341,7 +341,7 @@ const struct sbus_property_meta infopipe_component__properties[] = {
"debug_level", /* name */
"u", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct infopipe_component, infopipe_component_get_debug_level),
+ offsetof(struct iface_ifp_components, iface_ifp_components_get_debug_level),
sbus_invoke_get_u,
0, /* not writable */
NULL, /* no invoker */
@@ -350,7 +350,7 @@ const struct sbus_property_meta infopipe_component__properties[] = {
"enabled", /* name */
"b", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct infopipe_component, infopipe_component_get_enabled),
+ offsetof(struct iface_ifp_components, iface_ifp_components_get_enabled),
sbus_invoke_get_b,
0, /* not writable */
NULL, /* no invoker */
@@ -359,7 +359,7 @@ const struct sbus_property_meta infopipe_component__properties[] = {
"type", /* name */
"s", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct infopipe_component, infopipe_component_get_type),
+ offsetof(struct iface_ifp_components, iface_ifp_components_get_type),
sbus_invoke_get_s,
0, /* not writable */
NULL, /* no invoker */
@@ -368,7 +368,7 @@ const struct sbus_property_meta infopipe_component__properties[] = {
"providers", /* name */
"as", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct infopipe_component, infopipe_component_get_providers),
+ offsetof(struct iface_ifp_components, iface_ifp_components_get_providers),
sbus_invoke_get_as,
0, /* not writable */
NULL, /* no invoker */
@@ -377,21 +377,21 @@ const struct sbus_property_meta infopipe_component__properties[] = {
};
/* interface info for org.freedesktop.sssd.infopipe.Components */
-const struct sbus_interface_meta infopipe_component_meta = {
+const struct sbus_interface_meta iface_ifp_components_meta = {
"org.freedesktop.sssd.infopipe.Components", /* name */
- infopipe_component__methods,
+ iface_ifp_components__methods,
NULL, /* no signals */
- infopipe_component__properties,
+ iface_ifp_components__properties,
sbus_invoke_get_all, /* GetAll invoker */
};
/* property info for org.freedesktop.sssd.infopipe.Domains */
-const struct sbus_property_meta infopipe_domain__properties[] = {
+const struct sbus_property_meta iface_ifp_domains__properties[] = {
{
"name", /* name */
"s", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct infopipe_domain, infopipe_domain_get_name),
+ offsetof(struct iface_ifp_domains, iface_ifp_domains_get_name),
sbus_invoke_get_s,
0, /* not writable */
NULL, /* no invoker */
@@ -400,7 +400,7 @@ const struct sbus_property_meta infopipe_domain__properties[] = {
"provider", /* name */
"s", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct infopipe_domain, infopipe_domain_get_provider),
+ offsetof(struct iface_ifp_domains, iface_ifp_domains_get_provider),
sbus_invoke_get_s,
0, /* not writable */
NULL, /* no invoker */
@@ -409,7 +409,7 @@ const struct sbus_property_meta infopipe_domain__properties[] = {
"primary_servers", /* name */
"as", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct infopipe_domain, infopipe_domain_get_primary_servers),
+ offsetof(struct iface_ifp_domains, iface_ifp_domains_get_primary_servers),
sbus_invoke_get_as,
0, /* not writable */
NULL, /* no invoker */
@@ -418,7 +418,7 @@ const struct sbus_property_meta infopipe_domain__properties[] = {
"backup_servers", /* name */
"as", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct infopipe_domain, infopipe_domain_get_backup_servers),
+ offsetof(struct iface_ifp_domains, iface_ifp_domains_get_backup_servers),
sbus_invoke_get_as,
0, /* not writable */
NULL, /* no invoker */
@@ -427,7 +427,7 @@ const struct sbus_property_meta infopipe_domain__properties[] = {
"min_id", /* name */
"u", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct infopipe_domain, infopipe_domain_get_min_id),
+ offsetof(struct iface_ifp_domains, iface_ifp_domains_get_min_id),
sbus_invoke_get_u,
0, /* not writable */
NULL, /* no invoker */
@@ -436,7 +436,7 @@ const struct sbus_property_meta infopipe_domain__properties[] = {
"max_id", /* name */
"u", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct infopipe_domain, infopipe_domain_get_max_id),
+ offsetof(struct iface_ifp_domains, iface_ifp_domains_get_max_id),
sbus_invoke_get_u,
0, /* not writable */
NULL, /* no invoker */
@@ -445,7 +445,7 @@ const struct sbus_property_meta infopipe_domain__properties[] = {
"realm", /* name */
"s", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct infopipe_domain, infopipe_domain_get_realm),
+ offsetof(struct iface_ifp_domains, iface_ifp_domains_get_realm),
sbus_invoke_get_s,
0, /* not writable */
NULL, /* no invoker */
@@ -454,7 +454,7 @@ const struct sbus_property_meta infopipe_domain__properties[] = {
"forest", /* name */
"s", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct infopipe_domain, infopipe_domain_get_forest),
+ offsetof(struct iface_ifp_domains, iface_ifp_domains_get_forest),
sbus_invoke_get_s,
0, /* not writable */
NULL, /* no invoker */
@@ -463,7 +463,7 @@ const struct sbus_property_meta infopipe_domain__properties[] = {
"login_format", /* name */
"s", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct infopipe_domain, infopipe_domain_get_login_format),
+ offsetof(struct iface_ifp_domains, iface_ifp_domains_get_login_format),
sbus_invoke_get_s,
0, /* not writable */
NULL, /* no invoker */
@@ -472,7 +472,7 @@ const struct sbus_property_meta infopipe_domain__properties[] = {
"fully_qualified_name_format", /* name */
"s", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct infopipe_domain, infopipe_domain_get_fully_qualified_name_format),
+ offsetof(struct iface_ifp_domains, iface_ifp_domains_get_fully_qualified_name_format),
sbus_invoke_get_s,
0, /* not writable */
NULL, /* no invoker */
@@ -481,7 +481,7 @@ const struct sbus_property_meta infopipe_domain__properties[] = {
"enumerable", /* name */
"b", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct infopipe_domain, infopipe_domain_get_enumerable),
+ offsetof(struct iface_ifp_domains, iface_ifp_domains_get_enumerable),
sbus_invoke_get_b,
0, /* not writable */
NULL, /* no invoker */
@@ -490,7 +490,7 @@ const struct sbus_property_meta infopipe_domain__properties[] = {
"use_fully_qualified_names", /* name */
"b", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct infopipe_domain, infopipe_domain_get_use_fully_qualified_names),
+ offsetof(struct iface_ifp_domains, iface_ifp_domains_get_use_fully_qualified_names),
sbus_invoke_get_b,
0, /* not writable */
NULL, /* no invoker */
@@ -499,7 +499,7 @@ const struct sbus_property_meta infopipe_domain__properties[] = {
"subdomain", /* name */
"b", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct infopipe_domain, infopipe_domain_get_subdomain),
+ offsetof(struct iface_ifp_domains, iface_ifp_domains_get_subdomain),
sbus_invoke_get_b,
0, /* not writable */
NULL, /* no invoker */
@@ -508,7 +508,7 @@ const struct sbus_property_meta infopipe_domain__properties[] = {
"parent_domain", /* name */
"o", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct infopipe_domain, infopipe_domain_get_parent_domain),
+ offsetof(struct iface_ifp_domains, iface_ifp_domains_get_parent_domain),
sbus_invoke_get_o,
0, /* not writable */
NULL, /* no invoker */
@@ -517,11 +517,11 @@ const struct sbus_property_meta infopipe_domain__properties[] = {
};
/* interface info for org.freedesktop.sssd.infopipe.Domains */
-const struct sbus_interface_meta infopipe_domain_meta = {
+const struct sbus_interface_meta iface_ifp_domains_meta = {
"org.freedesktop.sssd.infopipe.Domains", /* name */
NULL, /* no methods */
NULL, /* no signals */
- infopipe_domain__properties,
+ iface_ifp_domains__properties,
sbus_invoke_get_all, /* GetAll invoker */
};
diff --git a/src/responder/ifp/ifp_iface_generated.h b/src/responder/ifp/ifp_iface_generated.h
index 3a3e6955e351d76a23cbd6d94104e1198d51c5f3..7dfe8c05f02bca6550a2eb8f0ec948e027b0dcbe 100644
--- a/src/responder/ifp/ifp_iface_generated.h
+++ b/src/responder/ifp/ifp_iface_generated.h
@@ -12,47 +12,47 @@
*/
/* constants for org.freedesktop.sssd.infopipe */
-#define INFOPIPE_IFACE "org.freedesktop.sssd.infopipe"
-#define INFOPIPE_IFACE_PING "Ping"
-#define INFOPIPE_IFACE_LISTCOMPONENTS "ListComponents"
-#define INFOPIPE_IFACE_LISTRESPONDERS "ListResponders"
-#define INFOPIPE_IFACE_LISTBACKENDS "ListBackends"
-#define INFOPIPE_IFACE_FINDMONITOR "FindMonitor"
-#define INFOPIPE_IFACE_FINDRESPONDERBYNAME "FindResponderByName"
-#define INFOPIPE_IFACE_FINDBACKENDBYNAME "FindBackendByName"
-#define INFOPIPE_IFACE_GETUSERATTR "GetUserAttr"
-#define INFOPIPE_IFACE_GETUSERGROUPS "GetUserGroups"
-#define INFOPIPE_IFACE_FINDDOMAINBYNAME "FindDomainByName"
-#define INFOPIPE_IFACE_LISTDOMAINS "ListDomains"
+#define IFACE_IFP "org.freedesktop.sssd.infopipe"
+#define IFACE_IFP_PING "Ping"
+#define IFACE_IFP_LISTCOMPONENTS "ListComponents"
+#define IFACE_IFP_LISTRESPONDERS "ListResponders"
+#define IFACE_IFP_LISTBACKENDS "ListBackends"
+#define IFACE_IFP_FINDMONITOR "FindMonitor"
+#define IFACE_IFP_FINDRESPONDERBYNAME "FindResponderByName"
+#define IFACE_IFP_FINDBACKENDBYNAME "FindBackendByName"
+#define IFACE_IFP_GETUSERATTR "GetUserAttr"
+#define IFACE_IFP_GETUSERGROUPS "GetUserGroups"
+#define IFACE_IFP_FINDDOMAINBYNAME "FindDomainByName"
+#define IFACE_IFP_LISTDOMAINS "ListDomains"
/* constants for org.freedesktop.sssd.infopipe.Components */
-#define INFOPIPE_COMPONENT "org.freedesktop.sssd.infopipe.Components"
-#define INFOPIPE_COMPONENT_ENABLE "Enable"
-#define INFOPIPE_COMPONENT_DISABLE "Disable"
-#define INFOPIPE_COMPONENT_CHANGEDEBUGLEVEL "ChangeDebugLevel"
-#define INFOPIPE_COMPONENT_CHANGEDEBUGLEVELTEMPORARILY "ChangeDebugLevelTemporarily"
-#define INFOPIPE_COMPONENT_NAME "name"
-#define INFOPIPE_COMPONENT_DEBUG_LEVEL "debug_level"
-#define INFOPIPE_COMPONENT_ENABLED "enabled"
-#define INFOPIPE_COMPONENT_TYPE "type"
-#define INFOPIPE_COMPONENT_PROVIDERS "providers"
+#define IFACE_IFP_COMPONENTS "org.freedesktop.sssd.infopipe.Components"
+#define IFACE_IFP_COMPONENTS_ENABLE "Enable"
+#define IFACE_IFP_COMPONENTS_DISABLE "Disable"
+#define IFACE_IFP_COMPONENTS_CHANGEDEBUGLEVEL "ChangeDebugLevel"
+#define IFACE_IFP_COMPONENTS_CHANGEDEBUGLEVELTEMPORARILY "ChangeDebugLevelTemporarily"
+#define IFACE_IFP_COMPONENTS_NAME "name"
+#define IFACE_IFP_COMPONENTS_DEBUG_LEVEL "debug_level"
+#define IFACE_IFP_COMPONENTS_ENABLED "enabled"
+#define IFACE_IFP_COMPONENTS_TYPE "type"
+#define IFACE_IFP_COMPONENTS_PROVIDERS "providers"
/* constants for org.freedesktop.sssd.infopipe.Domains */
-#define INFOPIPE_DOMAIN "org.freedesktop.sssd.infopipe.Domains"
-#define INFOPIPE_DOMAIN_NAME "name"
-#define INFOPIPE_DOMAIN_PROVIDER "provider"
-#define INFOPIPE_DOMAIN_PRIMARY_SERVERS "primary_servers"
-#define INFOPIPE_DOMAIN_BACKUP_SERVERS "backup_servers"
-#define INFOPIPE_DOMAIN_MIN_ID "min_id"
-#define INFOPIPE_DOMAIN_MAX_ID "max_id"
-#define INFOPIPE_DOMAIN_REALM "realm"
-#define INFOPIPE_DOMAIN_FOREST "forest"
-#define INFOPIPE_DOMAIN_LOGIN_FORMAT "login_format"
-#define INFOPIPE_DOMAIN_FULLY_QUALIFIED_NAME_FORMAT "fully_qualified_name_format"
-#define INFOPIPE_DOMAIN_ENUMERABLE "enumerable"
-#define INFOPIPE_DOMAIN_USE_FULLY_QUALIFIED_NAMES "use_fully_qualified_names"
-#define INFOPIPE_DOMAIN_SUBDOMAIN "subdomain"
-#define INFOPIPE_DOMAIN_PARENT_DOMAIN "parent_domain"
+#define IFACE_IFP_DOMAINS "org.freedesktop.sssd.infopipe.Domains"
+#define IFACE_IFP_DOMAINS_NAME "name"
+#define IFACE_IFP_DOMAINS_PROVIDER "provider"
+#define IFACE_IFP_DOMAINS_PRIMARY_SERVERS "primary_servers"
+#define IFACE_IFP_DOMAINS_BACKUP_SERVERS "backup_servers"
+#define IFACE_IFP_DOMAINS_MIN_ID "min_id"
+#define IFACE_IFP_DOMAINS_MAX_ID "max_id"
+#define IFACE_IFP_DOMAINS_REALM "realm"
+#define IFACE_IFP_DOMAINS_FOREST "forest"
+#define IFACE_IFP_DOMAINS_LOGIN_FORMAT "login_format"
+#define IFACE_IFP_DOMAINS_FULLY_QUALIFIED_NAME_FORMAT "fully_qualified_name_format"
+#define IFACE_IFP_DOMAINS_ENUMERABLE "enumerable"
+#define IFACE_IFP_DOMAINS_USE_FULLY_QUALIFIED_NAMES "use_fully_qualified_names"
+#define IFACE_IFP_DOMAINS_SUBDOMAIN "subdomain"
+#define IFACE_IFP_DOMAINS_PARENT_DOMAIN "parent_domain"
/* ------------------------------------------------------------------------
* DBus handlers
@@ -73,7 +73,7 @@
*/
/* vtable for org.freedesktop.sssd.infopipe */
-struct infopipe_iface {
+struct iface_ifp {
struct sbus_vtable vtable; /* derive from sbus_vtable */
sbus_msg_handler_fn Ping;
int (*ListComponents)(struct sbus_request *req, void *data);
@@ -89,75 +89,75 @@ struct infopipe_iface {
};
/* finish function for ListComponents */
-int infopipe_iface_ListComponents_finish(struct sbus_request *req, const char *arg_components[], int len_components);
+int iface_ifp_ListComponents_finish(struct sbus_request *req, const char *arg_components[], int len_components);
/* finish function for ListResponders */
-int infopipe_iface_ListResponders_finish(struct sbus_request *req, const char *arg_responders[], int len_responders);
+int iface_ifp_ListResponders_finish(struct sbus_request *req, const char *arg_responders[], int len_responders);
/* finish function for ListBackends */
-int infopipe_iface_ListBackends_finish(struct sbus_request *req, const char *arg_backends[], int len_backends);
+int iface_ifp_ListBackends_finish(struct sbus_request *req, const char *arg_backends[], int len_backends);
/* finish function for FindMonitor */
-int infopipe_iface_FindMonitor_finish(struct sbus_request *req, const char *arg_monitor);
+int iface_ifp_FindMonitor_finish(struct sbus_request *req, const char *arg_monitor);
/* finish function for FindResponderByName */
-int infopipe_iface_FindResponderByName_finish(struct sbus_request *req, const char *arg_responder);
+int iface_ifp_FindResponderByName_finish(struct sbus_request *req, const char *arg_responder);
/* finish function for FindBackendByName */
-int infopipe_iface_FindBackendByName_finish(struct sbus_request *req, const char *arg_backend);
+int iface_ifp_FindBackendByName_finish(struct sbus_request *req, const char *arg_backend);
/* finish function for GetUserGroups */
-int infopipe_iface_GetUserGroups_finish(struct sbus_request *req, const char *arg_values[], int len_values);
+int iface_ifp_GetUserGroups_finish(struct sbus_request *req, const char *arg_values[], int len_values);
/* finish function for FindDomainByName */
-int infopipe_iface_FindDomainByName_finish(struct sbus_request *req, const char *arg_domain);
+int iface_ifp_FindDomainByName_finish(struct sbus_request *req, const char *arg_domain);
/* finish function for ListDomains */
-int infopipe_iface_ListDomains_finish(struct sbus_request *req, const char *arg_domain[], int len_domain);
+int iface_ifp_ListDomains_finish(struct sbus_request *req, const char *arg_domain[], int len_domain);
/* vtable for org.freedesktop.sssd.infopipe.Components */
-struct infopipe_component {
+struct iface_ifp_components {
struct sbus_vtable vtable; /* derive from sbus_vtable */
int (*Enable)(struct sbus_request *req, void *data);
int (*Disable)(struct sbus_request *req, void *data);
int (*ChangeDebugLevel)(struct sbus_request *req, void *data, uint32_t arg_new_level);
int (*ChangeDebugLevelTemporarily)(struct sbus_request *req, void *data, uint32_t arg_new_level);
- void (*infopipe_component_get_name)(struct sbus_request *, void *data, const char * *);
- void (*infopipe_component_get_debug_level)(struct sbus_request *, void *data, uint32_t *);
- void (*infopipe_component_get_enabled)(struct sbus_request *, void *data, bool *);
- void (*infopipe_component_get_type)(struct sbus_request *, void *data, const char * *);
- void (*infopipe_component_get_providers)(struct sbus_request *, void *data, const char * * *, int *);
+ void (*iface_ifp_components_get_name)(struct sbus_request *, void *data, const char * *);
+ void (*iface_ifp_components_get_debug_level)(struct sbus_request *, void *data, uint32_t *);
+ void (*iface_ifp_components_get_enabled)(struct sbus_request *, void *data, bool *);
+ void (*iface_ifp_components_get_type)(struct sbus_request *, void *data, const char * *);
+ void (*iface_ifp_components_get_providers)(struct sbus_request *, void *data, const char * * *, int *);
};
/* finish function for Enable */
-int infopipe_component_Enable_finish(struct sbus_request *req);
+int iface_ifp_components_Enable_finish(struct sbus_request *req);
/* finish function for Disable */
-int infopipe_component_Disable_finish(struct sbus_request *req);
+int iface_ifp_components_Disable_finish(struct sbus_request *req);
/* finish function for ChangeDebugLevel */
-int infopipe_component_ChangeDebugLevel_finish(struct sbus_request *req);
+int iface_ifp_components_ChangeDebugLevel_finish(struct sbus_request *req);
/* finish function for ChangeDebugLevelTemporarily */
-int infopipe_component_ChangeDebugLevelTemporarily_finish(struct sbus_request *req);
+int iface_ifp_components_ChangeDebugLevelTemporarily_finish(struct sbus_request *req);
/* vtable for org.freedesktop.sssd.infopipe.Domains */
-struct infopipe_domain {
+struct iface_ifp_domains {
struct sbus_vtable vtable; /* derive from sbus_vtable */
- void (*infopipe_domain_get_name)(struct sbus_request *, void *data, const char * *);
- void (*infopipe_domain_get_provider)(struct sbus_request *, void *data, const char * *);
- void (*infopipe_domain_get_primary_servers)(struct sbus_request *, void *data, const char * * *, int *);
- void (*infopipe_domain_get_backup_servers)(struct sbus_request *, void *data, const char * * *, int *);
- void (*infopipe_domain_get_min_id)(struct sbus_request *, void *data, uint32_t *);
- void (*infopipe_domain_get_max_id)(struct sbus_request *, void *data, uint32_t *);
- void (*infopipe_domain_get_realm)(struct sbus_request *, void *data, const char * *);
- void (*infopipe_domain_get_forest)(struct sbus_request *, void *data, const char * *);
- void (*infopipe_domain_get_login_format)(struct sbus_request *, void *data, const char * *);
- void (*infopipe_domain_get_fully_qualified_name_format)(struct sbus_request *, void *data, const char * *);
- void (*infopipe_domain_get_enumerable)(struct sbus_request *, void *data, bool *);
- void (*infopipe_domain_get_use_fully_qualified_names)(struct sbus_request *, void *data, bool *);
- void (*infopipe_domain_get_subdomain)(struct sbus_request *, void *data, bool *);
- void (*infopipe_domain_get_parent_domain)(struct sbus_request *, void *data, const char * *);
+ void (*iface_ifp_domains_get_name)(struct sbus_request *, void *data, const char * *);
+ void (*iface_ifp_domains_get_provider)(struct sbus_request *, void *data, const char * *);
+ void (*iface_ifp_domains_get_primary_servers)(struct sbus_request *, void *data, const char * * *, int *);
+ void (*iface_ifp_domains_get_backup_servers)(struct sbus_request *, void *data, const char * * *, int *);
+ void (*iface_ifp_domains_get_min_id)(struct sbus_request *, void *data, uint32_t *);
+ void (*iface_ifp_domains_get_max_id)(struct sbus_request *, void *data, uint32_t *);
+ void (*iface_ifp_domains_get_realm)(struct sbus_request *, void *data, const char * *);
+ void (*iface_ifp_domains_get_forest)(struct sbus_request *, void *data, const char * *);
+ void (*iface_ifp_domains_get_login_format)(struct sbus_request *, void *data, const char * *);
+ void (*iface_ifp_domains_get_fully_qualified_name_format)(struct sbus_request *, void *data, const char * *);
+ void (*iface_ifp_domains_get_enumerable)(struct sbus_request *, void *data, bool *);
+ void (*iface_ifp_domains_get_use_fully_qualified_names)(struct sbus_request *, void *data, bool *);
+ void (*iface_ifp_domains_get_subdomain)(struct sbus_request *, void *data, bool *);
+ void (*iface_ifp_domains_get_parent_domain)(struct sbus_request *, void *data, const char * *);
};
/* ------------------------------------------------------------------------
@@ -171,12 +171,12 @@ struct infopipe_domain {
*/
/* interface info for org.freedesktop.sssd.infopipe */
-extern const struct sbus_interface_meta infopipe_iface_meta;
+extern const struct sbus_interface_meta iface_ifp_meta;
/* interface info for org.freedesktop.sssd.infopipe.Components */
-extern const struct sbus_interface_meta infopipe_component_meta;
+extern const struct sbus_interface_meta iface_ifp_components_meta;
/* interface info for org.freedesktop.sssd.infopipe.Domains */
-extern const struct sbus_interface_meta infopipe_domain_meta;
+extern const struct sbus_interface_meta iface_ifp_domains_meta;
#endif /* __IFP_IFACE_XML__ */
diff --git a/src/responder/ifp/ifpsrv.c b/src/responder/ifp/ifpsrv.c
index 476008174948083e5a2c55876ad9b8395de1c233..a4cabf20aac8f91fc9cac8fc4ee3efff144cf0b8 100644
--- a/src/responder/ifp/ifpsrv.c
+++ b/src/responder/ifp/ifpsrv.c
@@ -196,7 +196,7 @@ static int ifp_sysbus_reconnect(struct sbus_request *dbus_req, void *data)
/* Connect to the D-BUS system bus and set up methods */
ret = sysbus_init(ifp_ctx, ifp_ctx->rctx->ev,
- INFOPIPE_IFACE,
+ IFACE_IFP,
ifp_ctx, &ifp_ctx->sysbus);
if (ret == ERR_NO_SYSBUS) {
DEBUG(SSSDBG_MINOR_FAILURE,
@@ -326,7 +326,7 @@ int ifp_process_init(TALLOC_CTX *mem_ctx,
/* Connect to the D-BUS system bus and set up methods */
ret = sysbus_init(ifp_ctx, ifp_ctx->rctx->ev,
- INFOPIPE_IFACE,
+ IFACE_IFP,
ifp_ctx, &ifp_ctx->sysbus);
if (ret == ERR_NO_SYSBUS) {
DEBUG(SSSDBG_MINOR_FAILURE,
diff --git a/src/responder/ifp/ifpsrv_cmd.c b/src/responder/ifp/ifpsrv_cmd.c
index 41b3543675ae5f539b7481af9d6cfce88074debb..11a7fb26ce77c60a93017ef856a51d10e6972ee8 100644
--- a/src/responder/ifp/ifpsrv_cmd.c
+++ b/src/responder/ifp/ifpsrv_cmd.c
@@ -411,8 +411,7 @@ ifp_user_get_groups_reply(struct sss_domain_info *domain,
DEBUG(SSSDBG_TRACE_FUNC, "Adding group %s\n", groupnames[i]);
}
- return infopipe_iface_GetUserGroups_finish(ireq->dbus_req,
- groupnames, num);
+ return iface_ifp_GetUserGroups_finish(ireq->dbus_req, groupnames, num);
}
struct ifp_user_get_attr_state {
--
1.9.3
>From e83e23b87e4581b16476a3d652c799a765a5b49e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrez...@redhat.com>
Date: Thu, 15 Jan 2015 14:49:25 +0100
Subject: [PATCH 3/5] sbus codegen: do not prefix getters with iface name
Prefixing getters with C name of the interface is just
redundant since it is the same as the name of the structure
that contains those fields.
The following structure:
struct test_pilot {
$type test_pilot_get_name;
}
changes to:
struct test_pilot {
$type get_name;
}
---
src/responder/ifp/ifp_iface.c | 38 ++++++++++++------------
src/responder/ifp/ifp_iface_generated.c | 38 ++++++++++++------------
src/responder/ifp/ifp_iface_generated.h | 38 ++++++++++++------------
src/sbus/sbus_codegen | 2 +-
src/tests/sbus_codegen_tests.c | 48 +++++++++++++++---------------
src/tests/sbus_codegen_tests_generated.c | 50 ++++++++++++++++----------------
src/tests/sbus_codegen_tests_generated.h | 50 ++++++++++++++++----------------
7 files changed, 132 insertions(+), 132 deletions(-)
diff --git a/src/responder/ifp/ifp_iface.c b/src/responder/ifp/ifp_iface.c
index d0f0260d05153eb3a6df76a42b0ac76aecbb7e17..ffa3c46b7eeea12b7d56f928d85412f096fa6273 100644
--- a/src/responder/ifp/ifp_iface.c
+++ b/src/responder/ifp/ifp_iface.c
@@ -49,31 +49,31 @@ struct iface_ifp_components iface_ifp_components = {
.Disable = ifp_component_disable,
.ChangeDebugLevel = ifp_component_change_debug_level,
.ChangeDebugLevelTemporarily = ifp_component_change_debug_level_tmp,
- .iface_ifp_components_get_name = ifp_component_get_name,
- .iface_ifp_components_get_debug_level = ifp_component_get_debug_level,
- .iface_ifp_components_get_enabled = ifp_component_get_enabled,
- .iface_ifp_components_get_type = ifp_component_get_type,
+ .get_name = ifp_component_get_name,
+ .get_debug_level = ifp_component_get_debug_level,
+ .get_enabled = ifp_component_get_enabled,
+ .get_type = ifp_component_get_type,
/* FIXME: This should be part of Components.Backends interface, onece
* SSSD supports multiple interfaces per object path. */
- .iface_ifp_components_get_providers = ifp_backend_get_providers
+ .get_providers = ifp_backend_get_providers
};
struct iface_ifp_domains iface_ifp_domains = {
{ &iface_ifp_domains_meta, 0 },
- .iface_ifp_domains_get_name = ifp_dom_get_name,
- .iface_ifp_domains_get_provider = ifp_dom_get_provider,
- .iface_ifp_domains_get_primary_servers = ifp_dom_get_primary_servers,
- .iface_ifp_domains_get_backup_servers = ifp_dom_get_backup_servers,
- .iface_ifp_domains_get_min_id = ifp_dom_get_min_id,
- .iface_ifp_domains_get_max_id = ifp_dom_get_max_id,
- .iface_ifp_domains_get_realm = ifp_dom_get_realm,
- .iface_ifp_domains_get_forest = ifp_dom_get_forest,
- .iface_ifp_domains_get_login_format = ifp_dom_get_login_format,
- .iface_ifp_domains_get_fully_qualified_name_format = ifp_dom_get_fqdn_format,
- .iface_ifp_domains_get_enumerable = ifp_dom_get_enumerable,
- .iface_ifp_domains_get_use_fully_qualified_names = ifp_dom_get_use_fqdn,
- .iface_ifp_domains_get_subdomain = ifp_dom_get_subdomain,
- .iface_ifp_domains_get_parent_domain = ifp_dom_get_parent_domain
+ .get_name = ifp_dom_get_name,
+ .get_provider = ifp_dom_get_provider,
+ .get_primary_servers = ifp_dom_get_primary_servers,
+ .get_backup_servers = ifp_dom_get_backup_servers,
+ .get_min_id = ifp_dom_get_min_id,
+ .get_max_id = ifp_dom_get_max_id,
+ .get_realm = ifp_dom_get_realm,
+ .get_forest = ifp_dom_get_forest,
+ .get_login_format = ifp_dom_get_login_format,
+ .get_fully_qualified_name_format = ifp_dom_get_fqdn_format,
+ .get_enumerable = ifp_dom_get_enumerable,
+ .get_use_fully_qualified_names = ifp_dom_get_use_fqdn,
+ .get_subdomain = ifp_dom_get_subdomain,
+ .get_parent_domain = ifp_dom_get_parent_domain
};
struct iface_map {
diff --git a/src/responder/ifp/ifp_iface_generated.c b/src/responder/ifp/ifp_iface_generated.c
index 2cdfa3012a46dddbed05db2eb6f8ef2308825c16..9c00a8c59bd36f7a83ab299d51b3f1a8bf0994e0 100644
--- a/src/responder/ifp/ifp_iface_generated.c
+++ b/src/responder/ifp/ifp_iface_generated.c
@@ -332,7 +332,7 @@ const struct sbus_property_meta iface_ifp_components__properties[] = {
"name", /* name */
"s", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct iface_ifp_components, iface_ifp_components_get_name),
+ offsetof(struct iface_ifp_components, get_name),
sbus_invoke_get_s,
0, /* not writable */
NULL, /* no invoker */
@@ -341,7 +341,7 @@ const struct sbus_property_meta iface_ifp_components__properties[] = {
"debug_level", /* name */
"u", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct iface_ifp_components, iface_ifp_components_get_debug_level),
+ offsetof(struct iface_ifp_components, get_debug_level),
sbus_invoke_get_u,
0, /* not writable */
NULL, /* no invoker */
@@ -350,7 +350,7 @@ const struct sbus_property_meta iface_ifp_components__properties[] = {
"enabled", /* name */
"b", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct iface_ifp_components, iface_ifp_components_get_enabled),
+ offsetof(struct iface_ifp_components, get_enabled),
sbus_invoke_get_b,
0, /* not writable */
NULL, /* no invoker */
@@ -359,7 +359,7 @@ const struct sbus_property_meta iface_ifp_components__properties[] = {
"type", /* name */
"s", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct iface_ifp_components, iface_ifp_components_get_type),
+ offsetof(struct iface_ifp_components, get_type),
sbus_invoke_get_s,
0, /* not writable */
NULL, /* no invoker */
@@ -368,7 +368,7 @@ const struct sbus_property_meta iface_ifp_components__properties[] = {
"providers", /* name */
"as", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct iface_ifp_components, iface_ifp_components_get_providers),
+ offsetof(struct iface_ifp_components, get_providers),
sbus_invoke_get_as,
0, /* not writable */
NULL, /* no invoker */
@@ -391,7 +391,7 @@ const struct sbus_property_meta iface_ifp_domains__properties[] = {
"name", /* name */
"s", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct iface_ifp_domains, iface_ifp_domains_get_name),
+ offsetof(struct iface_ifp_domains, get_name),
sbus_invoke_get_s,
0, /* not writable */
NULL, /* no invoker */
@@ -400,7 +400,7 @@ const struct sbus_property_meta iface_ifp_domains__properties[] = {
"provider", /* name */
"s", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct iface_ifp_domains, iface_ifp_domains_get_provider),
+ offsetof(struct iface_ifp_domains, get_provider),
sbus_invoke_get_s,
0, /* not writable */
NULL, /* no invoker */
@@ -409,7 +409,7 @@ const struct sbus_property_meta iface_ifp_domains__properties[] = {
"primary_servers", /* name */
"as", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct iface_ifp_domains, iface_ifp_domains_get_primary_servers),
+ offsetof(struct iface_ifp_domains, get_primary_servers),
sbus_invoke_get_as,
0, /* not writable */
NULL, /* no invoker */
@@ -418,7 +418,7 @@ const struct sbus_property_meta iface_ifp_domains__properties[] = {
"backup_servers", /* name */
"as", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct iface_ifp_domains, iface_ifp_domains_get_backup_servers),
+ offsetof(struct iface_ifp_domains, get_backup_servers),
sbus_invoke_get_as,
0, /* not writable */
NULL, /* no invoker */
@@ -427,7 +427,7 @@ const struct sbus_property_meta iface_ifp_domains__properties[] = {
"min_id", /* name */
"u", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct iface_ifp_domains, iface_ifp_domains_get_min_id),
+ offsetof(struct iface_ifp_domains, get_min_id),
sbus_invoke_get_u,
0, /* not writable */
NULL, /* no invoker */
@@ -436,7 +436,7 @@ const struct sbus_property_meta iface_ifp_domains__properties[] = {
"max_id", /* name */
"u", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct iface_ifp_domains, iface_ifp_domains_get_max_id),
+ offsetof(struct iface_ifp_domains, get_max_id),
sbus_invoke_get_u,
0, /* not writable */
NULL, /* no invoker */
@@ -445,7 +445,7 @@ const struct sbus_property_meta iface_ifp_domains__properties[] = {
"realm", /* name */
"s", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct iface_ifp_domains, iface_ifp_domains_get_realm),
+ offsetof(struct iface_ifp_domains, get_realm),
sbus_invoke_get_s,
0, /* not writable */
NULL, /* no invoker */
@@ -454,7 +454,7 @@ const struct sbus_property_meta iface_ifp_domains__properties[] = {
"forest", /* name */
"s", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct iface_ifp_domains, iface_ifp_domains_get_forest),
+ offsetof(struct iface_ifp_domains, get_forest),
sbus_invoke_get_s,
0, /* not writable */
NULL, /* no invoker */
@@ -463,7 +463,7 @@ const struct sbus_property_meta iface_ifp_domains__properties[] = {
"login_format", /* name */
"s", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct iface_ifp_domains, iface_ifp_domains_get_login_format),
+ offsetof(struct iface_ifp_domains, get_login_format),
sbus_invoke_get_s,
0, /* not writable */
NULL, /* no invoker */
@@ -472,7 +472,7 @@ const struct sbus_property_meta iface_ifp_domains__properties[] = {
"fully_qualified_name_format", /* name */
"s", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct iface_ifp_domains, iface_ifp_domains_get_fully_qualified_name_format),
+ offsetof(struct iface_ifp_domains, get_fully_qualified_name_format),
sbus_invoke_get_s,
0, /* not writable */
NULL, /* no invoker */
@@ -481,7 +481,7 @@ const struct sbus_property_meta iface_ifp_domains__properties[] = {
"enumerable", /* name */
"b", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct iface_ifp_domains, iface_ifp_domains_get_enumerable),
+ offsetof(struct iface_ifp_domains, get_enumerable),
sbus_invoke_get_b,
0, /* not writable */
NULL, /* no invoker */
@@ -490,7 +490,7 @@ const struct sbus_property_meta iface_ifp_domains__properties[] = {
"use_fully_qualified_names", /* name */
"b", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct iface_ifp_domains, iface_ifp_domains_get_use_fully_qualified_names),
+ offsetof(struct iface_ifp_domains, get_use_fully_qualified_names),
sbus_invoke_get_b,
0, /* not writable */
NULL, /* no invoker */
@@ -499,7 +499,7 @@ const struct sbus_property_meta iface_ifp_domains__properties[] = {
"subdomain", /* name */
"b", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct iface_ifp_domains, iface_ifp_domains_get_subdomain),
+ offsetof(struct iface_ifp_domains, get_subdomain),
sbus_invoke_get_b,
0, /* not writable */
NULL, /* no invoker */
@@ -508,7 +508,7 @@ const struct sbus_property_meta iface_ifp_domains__properties[] = {
"parent_domain", /* name */
"o", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct iface_ifp_domains, iface_ifp_domains_get_parent_domain),
+ offsetof(struct iface_ifp_domains, get_parent_domain),
sbus_invoke_get_o,
0, /* not writable */
NULL, /* no invoker */
diff --git a/src/responder/ifp/ifp_iface_generated.h b/src/responder/ifp/ifp_iface_generated.h
index 7dfe8c05f02bca6550a2eb8f0ec948e027b0dcbe..e2f5a7eaf8a8d3452f9044ecc9c4ee7568a9b2cf 100644
--- a/src/responder/ifp/ifp_iface_generated.h
+++ b/src/responder/ifp/ifp_iface_generated.h
@@ -122,11 +122,11 @@ struct iface_ifp_components {
int (*Disable)(struct sbus_request *req, void *data);
int (*ChangeDebugLevel)(struct sbus_request *req, void *data, uint32_t arg_new_level);
int (*ChangeDebugLevelTemporarily)(struct sbus_request *req, void *data, uint32_t arg_new_level);
- void (*iface_ifp_components_get_name)(struct sbus_request *, void *data, const char * *);
- void (*iface_ifp_components_get_debug_level)(struct sbus_request *, void *data, uint32_t *);
- void (*iface_ifp_components_get_enabled)(struct sbus_request *, void *data, bool *);
- void (*iface_ifp_components_get_type)(struct sbus_request *, void *data, const char * *);
- void (*iface_ifp_components_get_providers)(struct sbus_request *, void *data, const char * * *, int *);
+ void (*get_name)(struct sbus_request *, void *data, const char * *);
+ void (*get_debug_level)(struct sbus_request *, void *data, uint32_t *);
+ void (*get_enabled)(struct sbus_request *, void *data, bool *);
+ void (*get_type)(struct sbus_request *, void *data, const char * *);
+ void (*get_providers)(struct sbus_request *, void *data, const char * * *, int *);
};
/* finish function for Enable */
@@ -144,20 +144,20 @@ int iface_ifp_components_ChangeDebugLevelTemporarily_finish(struct sbus_request
/* vtable for org.freedesktop.sssd.infopipe.Domains */
struct iface_ifp_domains {
struct sbus_vtable vtable; /* derive from sbus_vtable */
- void (*iface_ifp_domains_get_name)(struct sbus_request *, void *data, const char * *);
- void (*iface_ifp_domains_get_provider)(struct sbus_request *, void *data, const char * *);
- void (*iface_ifp_domains_get_primary_servers)(struct sbus_request *, void *data, const char * * *, int *);
- void (*iface_ifp_domains_get_backup_servers)(struct sbus_request *, void *data, const char * * *, int *);
- void (*iface_ifp_domains_get_min_id)(struct sbus_request *, void *data, uint32_t *);
- void (*iface_ifp_domains_get_max_id)(struct sbus_request *, void *data, uint32_t *);
- void (*iface_ifp_domains_get_realm)(struct sbus_request *, void *data, const char * *);
- void (*iface_ifp_domains_get_forest)(struct sbus_request *, void *data, const char * *);
- void (*iface_ifp_domains_get_login_format)(struct sbus_request *, void *data, const char * *);
- void (*iface_ifp_domains_get_fully_qualified_name_format)(struct sbus_request *, void *data, const char * *);
- void (*iface_ifp_domains_get_enumerable)(struct sbus_request *, void *data, bool *);
- void (*iface_ifp_domains_get_use_fully_qualified_names)(struct sbus_request *, void *data, bool *);
- void (*iface_ifp_domains_get_subdomain)(struct sbus_request *, void *data, bool *);
- void (*iface_ifp_domains_get_parent_domain)(struct sbus_request *, void *data, const char * *);
+ void (*get_name)(struct sbus_request *, void *data, const char * *);
+ void (*get_provider)(struct sbus_request *, void *data, const char * *);
+ void (*get_primary_servers)(struct sbus_request *, void *data, const char * * *, int *);
+ void (*get_backup_servers)(struct sbus_request *, void *data, const char * * *, int *);
+ void (*get_min_id)(struct sbus_request *, void *data, uint32_t *);
+ void (*get_max_id)(struct sbus_request *, void *data, uint32_t *);
+ void (*get_realm)(struct sbus_request *, void *data, const char * *);
+ void (*get_forest)(struct sbus_request *, void *data, const char * *);
+ void (*get_login_format)(struct sbus_request *, void *data, const char * *);
+ void (*get_fully_qualified_name_format)(struct sbus_request *, void *data, const char * *);
+ void (*get_enumerable)(struct sbus_request *, void *data, bool *);
+ void (*get_use_fully_qualified_names)(struct sbus_request *, void *data, bool *);
+ void (*get_subdomain)(struct sbus_request *, void *data, bool *);
+ void (*get_parent_domain)(struct sbus_request *, void *data, const char * *);
};
/* ------------------------------------------------------------------------
diff --git a/src/sbus/sbus_codegen b/src/sbus/sbus_codegen
index 7983f99fc2dfd3d8a24c0c1c5b997b46448bc714..9648c1fee2e700cd7da15ba61dbe0ed211ff9cef 100755
--- a/src/sbus/sbus_codegen
+++ b/src/sbus/sbus_codegen
@@ -188,7 +188,7 @@ class Property(Typed):
def fq_c_name(self):
return "%s_%s" % (self.iface.c_name(), self.c_name())
def getter_name(self):
- return "%s_get_%s" % (self.iface.c_name(), self.c_name())
+ return "get_%s" % self.c_name()
def getter_invoker_name(self):
return "sbus_invoke_get_%s" % self.type
def getter_signature(self, name):
diff --git a/src/tests/sbus_codegen_tests.c b/src/tests/sbus_codegen_tests.c
index dccb5e3147e61c3d6f40137927f8724804a37b97..e0b4b1d1abf678042f25dbd7562f4ac958e982f4 100644
--- a/src/tests/sbus_codegen_tests.c
+++ b/src/tests/sbus_codegen_tests.c
@@ -543,31 +543,31 @@ struct test_pilot pilot_iface = {
{ &test_pilot_meta, 0 },
.Eject = eject_handler,
- .test_pilot_get_FullName = pilot_get_full_name_handler,
- .test_pilot_get_byte = pilot_get_byte_handler,
- .test_pilot_get_boolean = pilot_get_boolean_handler,
- .test_pilot_get_int16 = pilot_get_int16_handler,
- .test_pilot_get_uint16 = pilot_get_uint16_handler,
- .test_pilot_get_int32 = pilot_get_int32_handler,
- .test_pilot_get_uint32 = pilot_get_uint32_handler,
- .test_pilot_get_int64 = pilot_get_int64_handler,
- .test_pilot_get_uint64 = pilot_get_uint64_handler,
- .test_pilot_get_double = pilot_get_double_handler,
- .test_pilot_get_string = pilot_get_string_handler,
- .test_pilot_get_object_path = pilot_get_objpath_handler,
- .test_pilot_get_null_string = pilot_get_null_string_handler,
- .test_pilot_get_null_path = pilot_get_null_path_handler,
+ .get_FullName = pilot_get_full_name_handler,
+ .get_byte = pilot_get_byte_handler,
+ .get_boolean = pilot_get_boolean_handler,
+ .get_int16 = pilot_get_int16_handler,
+ .get_uint16 = pilot_get_uint16_handler,
+ .get_int32 = pilot_get_int32_handler,
+ .get_uint32 = pilot_get_uint32_handler,
+ .get_int64 = pilot_get_int64_handler,
+ .get_uint64 = pilot_get_uint64_handler,
+ .get_double = pilot_get_double_handler,
+ .get_string = pilot_get_string_handler,
+ .get_object_path = pilot_get_objpath_handler,
+ .get_null_string = pilot_get_null_string_handler,
+ .get_null_path = pilot_get_null_path_handler,
- .test_pilot_get_byte_array = pilot_get_byte_array_handler,
- .test_pilot_get_int16_array = pilot_get_int16_array_handler,
- .test_pilot_get_uint16_array = pilot_get_uint16_array_handler,
- .test_pilot_get_int32_array = pilot_get_int32_array_handler,
- .test_pilot_get_uint32_array = pilot_get_uint32_array_handler,
- .test_pilot_get_int64_array = pilot_get_int64_array_handler,
- .test_pilot_get_uint64_array = pilot_get_uint64_array_handler,
- .test_pilot_get_double_array = pilot_get_double_array_handler,
- .test_pilot_get_string_array = pilot_get_string_array_handler,
- .test_pilot_get_object_path_array = pilot_get_path_array_handler,
+ .get_byte_array = pilot_get_byte_array_handler,
+ .get_int16_array = pilot_get_int16_array_handler,
+ .get_uint16_array = pilot_get_uint16_array_handler,
+ .get_int32_array = pilot_get_int32_array_handler,
+ .get_uint32_array = pilot_get_uint32_array_handler,
+ .get_int64_array = pilot_get_int64_array_handler,
+ .get_uint64_array = pilot_get_uint64_array_handler,
+ .get_double_array = pilot_get_double_array_handler,
+ .get_string_array = pilot_get_string_array_handler,
+ .get_object_path_array = pilot_get_path_array_handler,
};
static int pilot_test_server_init(struct sbus_connection *server, void *unused)
diff --git a/src/tests/sbus_codegen_tests_generated.c b/src/tests/sbus_codegen_tests_generated.c
index 5fdf9e277937c90168122d329ded42d893582d5b..fc69b77b347b9bec582aff633e26dbbe769985d5 100644
--- a/src/tests/sbus_codegen_tests_generated.c
+++ b/src/tests/sbus_codegen_tests_generated.c
@@ -97,7 +97,7 @@ const struct sbus_property_meta com_planetexpress_Ship__properties[] = {
"Color", /* name */
"s", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct com_planetexpress_Ship, com_planetexpress_Ship_get_Color),
+ offsetof(struct com_planetexpress_Ship, get_Color),
sbus_invoke_get_s,
0, /* not writable */
NULL, /* no invoker */
@@ -239,7 +239,7 @@ const struct sbus_property_meta test_pilot__properties[] = {
"FullName", /* name */
"s", /* type */
SBUS_PROPERTY_READABLE | SBUS_PROPERTY_WRITABLE,
- offsetof(struct test_pilot, test_pilot_get_FullName),
+ offsetof(struct test_pilot, get_FullName),
sbus_invoke_get_s,
0, /* not writable */
NULL, /* no invoker */
@@ -248,7 +248,7 @@ const struct sbus_property_meta test_pilot__properties[] = {
"byte", /* name */
"y", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct test_pilot, test_pilot_get_byte),
+ offsetof(struct test_pilot, get_byte),
sbus_invoke_get_y,
0, /* not writable */
NULL, /* no invoker */
@@ -257,7 +257,7 @@ const struct sbus_property_meta test_pilot__properties[] = {
"boolean", /* name */
"b", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct test_pilot, test_pilot_get_boolean),
+ offsetof(struct test_pilot, get_boolean),
sbus_invoke_get_b,
0, /* not writable */
NULL, /* no invoker */
@@ -266,7 +266,7 @@ const struct sbus_property_meta test_pilot__properties[] = {
"int16", /* name */
"n", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct test_pilot, test_pilot_get_int16),
+ offsetof(struct test_pilot, get_int16),
sbus_invoke_get_n,
0, /* not writable */
NULL, /* no invoker */
@@ -275,7 +275,7 @@ const struct sbus_property_meta test_pilot__properties[] = {
"uint16", /* name */
"q", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct test_pilot, test_pilot_get_uint16),
+ offsetof(struct test_pilot, get_uint16),
sbus_invoke_get_q,
0, /* not writable */
NULL, /* no invoker */
@@ -284,7 +284,7 @@ const struct sbus_property_meta test_pilot__properties[] = {
"int32", /* name */
"i", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct test_pilot, test_pilot_get_int32),
+ offsetof(struct test_pilot, get_int32),
sbus_invoke_get_i,
0, /* not writable */
NULL, /* no invoker */
@@ -293,7 +293,7 @@ const struct sbus_property_meta test_pilot__properties[] = {
"uint32", /* name */
"u", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct test_pilot, test_pilot_get_uint32),
+ offsetof(struct test_pilot, get_uint32),
sbus_invoke_get_u,
0, /* not writable */
NULL, /* no invoker */
@@ -302,7 +302,7 @@ const struct sbus_property_meta test_pilot__properties[] = {
"int64", /* name */
"x", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct test_pilot, test_pilot_get_int64),
+ offsetof(struct test_pilot, get_int64),
sbus_invoke_get_x,
0, /* not writable */
NULL, /* no invoker */
@@ -311,7 +311,7 @@ const struct sbus_property_meta test_pilot__properties[] = {
"uint64", /* name */
"t", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct test_pilot, test_pilot_get_uint64),
+ offsetof(struct test_pilot, get_uint64),
sbus_invoke_get_t,
0, /* not writable */
NULL, /* no invoker */
@@ -320,7 +320,7 @@ const struct sbus_property_meta test_pilot__properties[] = {
"double", /* name */
"d", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct test_pilot, test_pilot_get_double),
+ offsetof(struct test_pilot, get_double),
sbus_invoke_get_d,
0, /* not writable */
NULL, /* no invoker */
@@ -329,7 +329,7 @@ const struct sbus_property_meta test_pilot__properties[] = {
"string", /* name */
"s", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct test_pilot, test_pilot_get_string),
+ offsetof(struct test_pilot, get_string),
sbus_invoke_get_s,
0, /* not writable */
NULL, /* no invoker */
@@ -338,7 +338,7 @@ const struct sbus_property_meta test_pilot__properties[] = {
"object_path", /* name */
"o", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct test_pilot, test_pilot_get_object_path),
+ offsetof(struct test_pilot, get_object_path),
sbus_invoke_get_o,
0, /* not writable */
NULL, /* no invoker */
@@ -347,7 +347,7 @@ const struct sbus_property_meta test_pilot__properties[] = {
"null_string", /* name */
"s", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct test_pilot, test_pilot_get_null_string),
+ offsetof(struct test_pilot, get_null_string),
sbus_invoke_get_s,
0, /* not writable */
NULL, /* no invoker */
@@ -356,7 +356,7 @@ const struct sbus_property_meta test_pilot__properties[] = {
"null_path", /* name */
"o", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct test_pilot, test_pilot_get_null_path),
+ offsetof(struct test_pilot, get_null_path),
sbus_invoke_get_o,
0, /* not writable */
NULL, /* no invoker */
@@ -365,7 +365,7 @@ const struct sbus_property_meta test_pilot__properties[] = {
"byte_array", /* name */
"ay", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct test_pilot, test_pilot_get_byte_array),
+ offsetof(struct test_pilot, get_byte_array),
sbus_invoke_get_ay,
0, /* not writable */
NULL, /* no invoker */
@@ -374,7 +374,7 @@ const struct sbus_property_meta test_pilot__properties[] = {
"int16_array", /* name */
"an", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct test_pilot, test_pilot_get_int16_array),
+ offsetof(struct test_pilot, get_int16_array),
sbus_invoke_get_an,
0, /* not writable */
NULL, /* no invoker */
@@ -383,7 +383,7 @@ const struct sbus_property_meta test_pilot__properties[] = {
"uint16_array", /* name */
"aq", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct test_pilot, test_pilot_get_uint16_array),
+ offsetof(struct test_pilot, get_uint16_array),
sbus_invoke_get_aq,
0, /* not writable */
NULL, /* no invoker */
@@ -392,7 +392,7 @@ const struct sbus_property_meta test_pilot__properties[] = {
"int32_array", /* name */
"ai", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct test_pilot, test_pilot_get_int32_array),
+ offsetof(struct test_pilot, get_int32_array),
sbus_invoke_get_ai,
0, /* not writable */
NULL, /* no invoker */
@@ -401,7 +401,7 @@ const struct sbus_property_meta test_pilot__properties[] = {
"uint32_array", /* name */
"au", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct test_pilot, test_pilot_get_uint32_array),
+ offsetof(struct test_pilot, get_uint32_array),
sbus_invoke_get_au,
0, /* not writable */
NULL, /* no invoker */
@@ -410,7 +410,7 @@ const struct sbus_property_meta test_pilot__properties[] = {
"int64_array", /* name */
"ax", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct test_pilot, test_pilot_get_int64_array),
+ offsetof(struct test_pilot, get_int64_array),
sbus_invoke_get_ax,
0, /* not writable */
NULL, /* no invoker */
@@ -419,7 +419,7 @@ const struct sbus_property_meta test_pilot__properties[] = {
"uint64_array", /* name */
"at", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct test_pilot, test_pilot_get_uint64_array),
+ offsetof(struct test_pilot, get_uint64_array),
sbus_invoke_get_at,
0, /* not writable */
NULL, /* no invoker */
@@ -428,7 +428,7 @@ const struct sbus_property_meta test_pilot__properties[] = {
"double_array", /* name */
"ad", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct test_pilot, test_pilot_get_double_array),
+ offsetof(struct test_pilot, get_double_array),
sbus_invoke_get_ad,
0, /* not writable */
NULL, /* no invoker */
@@ -437,7 +437,7 @@ const struct sbus_property_meta test_pilot__properties[] = {
"string_array", /* name */
"as", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct test_pilot, test_pilot_get_string_array),
+ offsetof(struct test_pilot, get_string_array),
sbus_invoke_get_as,
0, /* not writable */
NULL, /* no invoker */
@@ -446,7 +446,7 @@ const struct sbus_property_meta test_pilot__properties[] = {
"object_path_array", /* name */
"ao", /* type */
SBUS_PROPERTY_READABLE,
- offsetof(struct test_pilot, test_pilot_get_object_path_array),
+ offsetof(struct test_pilot, get_object_path_array),
sbus_invoke_get_ao,
0, /* not writable */
NULL, /* no invoker */
diff --git a/src/tests/sbus_codegen_tests_generated.h b/src/tests/sbus_codegen_tests_generated.h
index e6fb10c5ef5724c865735ed5938f7a7b96b995aa..d573615ecc1222a5b1e2c16d84d1ccb0514f58fd 100644
--- a/src/tests/sbus_codegen_tests_generated.h
+++ b/src/tests/sbus_codegen_tests_generated.h
@@ -72,7 +72,7 @@ struct com_planetexpress_Ship {
int (*MoveUniverse)(struct sbus_request *req, void *data, bool arg_smoothly, uint32_t arg_speed_factor);
int (*crash_now)(struct sbus_request *req, void *data, const char *arg_where);
sbus_msg_handler_fn Land;
- void (*com_planetexpress_Ship_get_Color)(struct sbus_request *, void *data, const char * *);
+ void (*get_Color)(struct sbus_request *, void *data, const char * *);
};
/* finish function for MoveUniverse */
@@ -86,30 +86,30 @@ struct test_pilot {
struct sbus_vtable vtable; /* derive from sbus_vtable */
int (*Blink)(struct sbus_request *req, void *data, uint32_t arg_duration);
int (*Eject)(struct sbus_request *req, void *data, uint8_t arg_byte, bool arg_boolean, int16_t arg_int16, uint16_t arg_uint16, int32_t arg_int32, uint32_t arg_uint32, int64_t arg_int64, uint64_t arg_uint64, double arg_double, const char *arg_string, const char *arg_object_path, uint8_t arg_byte_array[], int len_byte_array, int16_t arg_int16_array[], int len_int16_array, uint16_t arg_uint16_array[], int len_uint16_array, int32_t arg_int32_array[], int len_int32_array, uint32_t arg_uint32_array[], int len_uint32_array, int64_t arg_int64_array[], int len_int64_array, uint64_t arg_uint64_array[], int len_uint64_array, double arg_double_array[], int len_double_array, const char *arg_string_array[], int len_string_array, const char *arg_object_path_array[], int len_object_path_array);
- void (*test_pilot_get_FullName)(struct sbus_request *, void *data, const char * *);
- void (*test_pilot_get_byte)(struct sbus_request *, void *data, uint8_t *);
- void (*test_pilot_get_boolean)(struct sbus_request *, void *data, bool *);
- void (*test_pilot_get_int16)(struct sbus_request *, void *data, int16_t *);
- void (*test_pilot_get_uint16)(struct sbus_request *, void *data, uint16_t *);
- void (*test_pilot_get_int32)(struct sbus_request *, void *data, int32_t *);
- void (*test_pilot_get_uint32)(struct sbus_request *, void *data, uint32_t *);
- void (*test_pilot_get_int64)(struct sbus_request *, void *data, int64_t *);
- void (*test_pilot_get_uint64)(struct sbus_request *, void *data, uint64_t *);
- void (*test_pilot_get_double)(struct sbus_request *, void *data, double *);
- void (*test_pilot_get_string)(struct sbus_request *, void *data, const char * *);
- void (*test_pilot_get_object_path)(struct sbus_request *, void *data, const char * *);
- void (*test_pilot_get_null_string)(struct sbus_request *, void *data, const char * *);
- void (*test_pilot_get_null_path)(struct sbus_request *, void *data, const char * *);
- void (*test_pilot_get_byte_array)(struct sbus_request *, void *data, uint8_t * *, int *);
- void (*test_pilot_get_int16_array)(struct sbus_request *, void *data, int16_t * *, int *);
- void (*test_pilot_get_uint16_array)(struct sbus_request *, void *data, uint16_t * *, int *);
- void (*test_pilot_get_int32_array)(struct sbus_request *, void *data, int32_t * *, int *);
- void (*test_pilot_get_uint32_array)(struct sbus_request *, void *data, uint32_t * *, int *);
- void (*test_pilot_get_int64_array)(struct sbus_request *, void *data, int64_t * *, int *);
- void (*test_pilot_get_uint64_array)(struct sbus_request *, void *data, uint64_t * *, int *);
- void (*test_pilot_get_double_array)(struct sbus_request *, void *data, double * *, int *);
- void (*test_pilot_get_string_array)(struct sbus_request *, void *data, const char * * *, int *);
- void (*test_pilot_get_object_path_array)(struct sbus_request *, void *data, const char * * *, int *);
+ void (*get_FullName)(struct sbus_request *, void *data, const char * *);
+ void (*get_byte)(struct sbus_request *, void *data, uint8_t *);
+ void (*get_boolean)(struct sbus_request *, void *data, bool *);
+ void (*get_int16)(struct sbus_request *, void *data, int16_t *);
+ void (*get_uint16)(struct sbus_request *, void *data, uint16_t *);
+ void (*get_int32)(struct sbus_request *, void *data, int32_t *);
+ void (*get_uint32)(struct sbus_request *, void *data, uint32_t *);
+ void (*get_int64)(struct sbus_request *, void *data, int64_t *);
+ void (*get_uint64)(struct sbus_request *, void *data, uint64_t *);
+ void (*get_double)(struct sbus_request *, void *data, double *);
+ void (*get_string)(struct sbus_request *, void *data, const char * *);
+ void (*get_object_path)(struct sbus_request *, void *data, const char * *);
+ void (*get_null_string)(struct sbus_request *, void *data, const char * *);
+ void (*get_null_path)(struct sbus_request *, void *data, const char * *);
+ void (*get_byte_array)(struct sbus_request *, void *data, uint8_t * *, int *);
+ void (*get_int16_array)(struct sbus_request *, void *data, int16_t * *, int *);
+ void (*get_uint16_array)(struct sbus_request *, void *data, uint16_t * *, int *);
+ void (*get_int32_array)(struct sbus_request *, void *data, int32_t * *, int *);
+ void (*get_uint32_array)(struct sbus_request *, void *data, uint32_t * *, int *);
+ void (*get_int64_array)(struct sbus_request *, void *data, int64_t * *, int *);
+ void (*get_uint64_array)(struct sbus_request *, void *data, uint64_t * *, int *);
+ void (*get_double_array)(struct sbus_request *, void *data, double * *, int *);
+ void (*get_string_array)(struct sbus_request *, void *data, const char * * *, int *);
+ void (*get_object_path_array)(struct sbus_request *, void *data, const char * * *, int *);
};
/* finish function for Blink */
--
1.9.3
>From 15c054b680e07a2774b2f7fab500ac7768ac8283 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrez...@redhat.com>
Date: Fri, 16 Jan 2015 13:36:12 +0100
Subject: [PATCH 4/5] IFP: simplify object path constant names
The number of interfaces will grow and in order to keep names of
object path constant consistent it means that also their names
will grow. The new naming schema is:
/org/freedesktop/sssd/infopipe -> IFP_PATH_
/ -> _
everything uppercase
Example:
/org/freedesktop/sssd/infopipe/Components/Responders
-> IFP_PATH_COMPONENTS_RESPONDERS
If the path contains a _TREE suffix, it represents the whole
subtree. For example:
IFP_PATH_DOMAINS_TREE is /org/freedesktop/sssd/infopipe/Domains/*
---
src/responder/ifp/ifp_components.c | 6 +++---
src/responder/ifp/ifp_components.h | 6 ++----
src/responder/ifp/ifp_domains.c | 8 ++++----
src/responder/ifp/ifp_domains.h | 4 ++--
src/responder/ifp/ifp_iface.c | 6 +++---
src/responder/ifp/ifp_private.h | 2 +-
6 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/src/responder/ifp/ifp_components.c b/src/responder/ifp/ifp_components.c
index 3d700f92e118f0ae39c44165c4a65c1302e1f220..b143d1e4fd99b55fa5d68f063957e54792992e9c 100644
--- a/src/responder/ifp/ifp_components.c
+++ b/src/responder/ifp/ifp_components.c
@@ -34,9 +34,9 @@
#include "util/sss_config.h"
#endif
-#define PATH_MONITOR INFOPIPE_COMPONENT_PATH_PFX "/monitor"
-#define PATH_RESPONDERS INFOPIPE_COMPONENT_PATH_PFX "/Responders"
-#define PATH_BACKENDS INFOPIPE_COMPONENT_PATH_PFX "/Backends"
+#define PATH_MONITOR IFP_PATH_COMPONENTS "/monitor"
+#define PATH_RESPONDERS IFP_PATH_COMPONENTS "/Responders"
+#define PATH_BACKENDS IFP_PATH_COMPONENTS "/Backends"
enum component_type {
COMPONENT_MONITOR,
diff --git a/src/responder/ifp/ifp_components.h b/src/responder/ifp/ifp_components.h
index 6c6300442762c083e53b5be524d706d0dcf508d4..d62585c0adbb7c942485029cba448cd93fe3134a 100644
--- a/src/responder/ifp/ifp_components.h
+++ b/src/responder/ifp/ifp_components.h
@@ -24,10 +24,8 @@
#include "responder/ifp/ifp_iface_generated.h"
#include "responder/ifp/ifp_private.h"
-#define INFOPIPE_COMPONENT_PATH_PFX "/org/freedesktop/sssd/infopipe/Components"
-#define INFOPIPE_COMPONENT_PATH INFOPIPE_COMPONENT_PATH_PFX "/*"
-
-#define INFOPIPE_BACKEND_PATH INFOPIPE_COMPONENT_PATH_PFX "/Backends*"
+#define IFP_PATH_COMPONENTS IFP_PATH "/Components"
+#define IFP_PATH_COMPONENTS_TREE IFP_PATH_COMPONENTS "/*"
/* org.freedesktop.sssd.infopipe */
diff --git a/src/responder/ifp/ifp_domains.c b/src/responder/ifp/ifp_domains.c
index b9c2c77975f491ef6f7d9da07d35d180687eb5ab..36057668752181f02f497a2471d6aa02aada8214 100644
--- a/src/responder/ifp/ifp_domains.c
+++ b/src/responder/ifp/ifp_domains.c
@@ -125,7 +125,7 @@ static void ifp_list_domains_process(struct tevent_req *req)
for (dom = ireq->ifp_ctx->rctx->domains;
dom != NULL;
dom = get_next_domain(dom, true)) {
- p = sbus_opath_compose(ireq, INFOPIPE_DOMAIN_PATH_PFX, dom->name);
+ p = sbus_opath_compose(ireq, IFP_PATH_DOMAINS, dom->name);
if (p == NULL) {
DEBUG(SSSDBG_MINOR_FAILURE,
"Could not create path for dom %s, skipping\n", dom->name);
@@ -234,7 +234,7 @@ static void ifp_find_domain_by_name_process(struct tevent_req *req)
return;
}
- path = sbus_opath_compose(ireq, INFOPIPE_DOMAIN_PATH_PFX, iter->name);
+ path = sbus_opath_compose(ireq, IFP_PATH_DOMAINS, iter->name);
if (path == NULL) {
DEBUG(SSSDBG_MINOR_FAILURE,
"Could not create path for domain %s, skipping\n", iter->name);
@@ -263,7 +263,7 @@ get_domain_info_from_req(struct sbus_request *dbus_req, void *data)
}
name = sbus_opath_get_object_name(dbus_req, dbus_req->path,
- INFOPIPE_DOMAIN_PATH_PFX);
+ IFP_PATH_DOMAINS);
if (name == NULL) {
return NULL;
}
@@ -530,6 +530,6 @@ void ifp_dom_get_parent_domain(struct sbus_request *dbus_req,
return;
}
- *_out = sbus_opath_compose(dbus_req, INFOPIPE_DOMAIN_PATH_PFX,
+ *_out = sbus_opath_compose(dbus_req, IFP_PATH_DOMAINS,
dom->parent->name);
}
diff --git a/src/responder/ifp/ifp_domains.h b/src/responder/ifp/ifp_domains.h
index d6ed6c73deb47a78775424afa28915b38d358777..7ec571dcf59b48e494eb998451ad02ba2a9580ff 100644
--- a/src/responder/ifp/ifp_domains.h
+++ b/src/responder/ifp/ifp_domains.h
@@ -25,8 +25,8 @@
#include "responder/ifp/ifp_iface_generated.h"
#include "responder/ifp/ifp_private.h"
-#define INFOPIPE_DOMAIN_PATH_PFX "/org/freedesktop/sssd/infopipe/Domains"
-#define INFOPIPE_DOMAIN_PATH INFOPIPE_DOMAIN_PATH_PFX"/*"
+#define IFP_PATH_DOMAINS IFP_PATH "/Domains"
+#define IFP_PATH_DOMAINS_TREE IFP_PATH_DOMAINS "/*"
/* org.freedesktop.sssd.infopipe */
diff --git a/src/responder/ifp/ifp_iface.c b/src/responder/ifp/ifp_iface.c
index ffa3c46b7eeea12b7d56f928d85412f096fa6273..c82a2e65df54997ca7d003ccc9a3a0a0037edd90 100644
--- a/src/responder/ifp/ifp_iface.c
+++ b/src/responder/ifp/ifp_iface.c
@@ -82,9 +82,9 @@ struct iface_map {
};
static struct iface_map iface_map[] = {
- { INFOPIPE_PATH, &iface_ifp.vtable },
- { INFOPIPE_DOMAIN_PATH, &iface_ifp_domains.vtable },
- { INFOPIPE_COMPONENT_PATH, &iface_ifp_components.vtable },
+ { IFP_PATH, &iface_ifp.vtable },
+ { IFP_PATH_DOMAINS_TREE, &iface_ifp_domains.vtable },
+ { IFP_PATH_COMPONENTS_TREE, &iface_ifp_components.vtable },
{ NULL, NULL },
};
diff --git a/src/responder/ifp/ifp_private.h b/src/responder/ifp/ifp_private.h
index 96ccb41e4c0ea081951035d11c93712db86fb5a1..f76655fa163346a97bac05577ae333309d4daf22 100644
--- a/src/responder/ifp/ifp_private.h
+++ b/src/responder/ifp/ifp_private.h
@@ -29,7 +29,7 @@
#include "providers/data_provider.h"
#include "responder/ifp/ifp_iface_generated.h"
-#define INFOPIPE_PATH "/org/freedesktop/sssd/infopipe"
+#define IFP_PATH "/org/freedesktop/sssd/infopipe"
struct sysbus_ctx {
struct sbus_connection *conn;
--
1.9.3
>From 4678b0ef20826a54e2bd8de45d8106559c2374d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrez...@redhat.com>
Date: Wed, 21 Jan 2015 13:47:28 +0100
Subject: [PATCH 5/5] sbus: add constant to represent subtree
---
src/responder/ifp/ifp_components.h | 2 +-
src/responder/ifp/ifp_domains.h | 2 +-
src/sbus/sssd_dbus.h | 7 +++++++
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/responder/ifp/ifp_components.h b/src/responder/ifp/ifp_components.h
index d62585c0adbb7c942485029cba448cd93fe3134a..e7734252900f2d7f1f6e573ad573c2ffaa36c60f 100644
--- a/src/responder/ifp/ifp_components.h
+++ b/src/responder/ifp/ifp_components.h
@@ -25,7 +25,7 @@
#include "responder/ifp/ifp_private.h"
#define IFP_PATH_COMPONENTS IFP_PATH "/Components"
-#define IFP_PATH_COMPONENTS_TREE IFP_PATH_COMPONENTS "/*"
+#define IFP_PATH_COMPONENTS_TREE IFP_PATH_COMPONENTS SBUS_SUBTREE_SUFFIX
/* org.freedesktop.sssd.infopipe */
diff --git a/src/responder/ifp/ifp_domains.h b/src/responder/ifp/ifp_domains.h
index 7ec571dcf59b48e494eb998451ad02ba2a9580ff..216740f13bb0c302d8189e57ed8a0598a4f91063 100644
--- a/src/responder/ifp/ifp_domains.h
+++ b/src/responder/ifp/ifp_domains.h
@@ -26,7 +26,7 @@
#include "responder/ifp/ifp_private.h"
#define IFP_PATH_DOMAINS IFP_PATH "/Domains"
-#define IFP_PATH_DOMAINS_TREE IFP_PATH_DOMAINS "/*"
+#define IFP_PATH_DOMAINS_TREE IFP_PATH_DOMAINS SBUS_SUBTREE_SUFFIX
/* org.freedesktop.sssd.infopipe */
diff --git a/src/sbus/sssd_dbus.h b/src/sbus/sssd_dbus.h
index 1de06974161009eb67af104805787f3f75fca271..6d2d5897ab5f50b1c7d48393be60a28e1333837d 100644
--- a/src/sbus/sssd_dbus.h
+++ b/src/sbus/sssd_dbus.h
@@ -54,6 +54,13 @@ struct sbus_request;
#define DBUS_ERROR_INIT { NULL, NULL, TRUE, 0, 0, 0, 0, NULL }
#endif /* DBUS_ERROR_INIT */
+/**
+ * Note: internal functions do not rely on the value of this constant to
+ * simplify implementation. If this connstant change, some functions in
+ * sssd_dbus_interface.c needs to be amended.
+ */
+#define SBUS_SUBTREE_SUFFIX "/*"
+
typedef int (*sbus_msg_handler_fn)(struct sbus_request *dbus_req,
void *handler_data);
--
1.9.3
_______________________________________________
sssd-devel mailing list
sssd-devel@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/sssd-devel
