mirror of git://git.sysmocom.de/ofono
gdbus: Introduce G_DBUS_PROPERTY_FLAG_EXPERIMENTAL
This flag can be used to mark properties as experimental, marked properties are disabled by default and can be enabled by setting G_DBUS_FLAG_ENABLE_EXPERIMENTAL using g_dbus_set_flags.
This commit is contained in:
parent
4b14fcc9a1
commit
5f8485bcc1
|
@ -106,6 +106,7 @@ enum GDBusSignalFlags {
|
|||
|
||||
enum GDBusPropertyFlags {
|
||||
G_DBUS_PROPERTY_FLAG_DEPRECATED = (1 << 0),
|
||||
G_DBUS_PROPERTY_FLAG_EXPERIMENTAL = (1 << 1),
|
||||
};
|
||||
|
||||
enum GDBusSecurityFlags {
|
||||
|
|
|
@ -119,6 +119,14 @@ static void print_arguments(GString *gstr, const GDBusArgInfo *args,
|
|||
#define G_DBUS_ANNOTATE_NOREPLY(prefix_) \
|
||||
G_DBUS_ANNOTATE(prefix_, "Method.NoReply", "true")
|
||||
|
||||
static gboolean check_experimental(int flags, int flag)
|
||||
{
|
||||
if (!(flags & flag))
|
||||
return FALSE;
|
||||
|
||||
return !(global_flags & G_DBUS_FLAG_ENABLE_EXPERIMENTAL);
|
||||
}
|
||||
|
||||
static void generate_interface_xml(GString *gstr, struct interface_data *iface)
|
||||
{
|
||||
const GDBusMethodTable *method;
|
||||
|
@ -130,11 +138,9 @@ static void generate_interface_xml(GString *gstr, struct interface_data *iface)
|
|||
G_DBUS_METHOD_FLAG_DEPRECATED;
|
||||
gboolean noreply = method->flags &
|
||||
G_DBUS_METHOD_FLAG_NOREPLY;
|
||||
gboolean experimental = method->flags &
|
||||
G_DBUS_METHOD_FLAG_EXPERIMENTAL;
|
||||
|
||||
if (!(global_flags & G_DBUS_FLAG_ENABLE_EXPERIMENTAL) &&
|
||||
experimental)
|
||||
if (check_experimental(method->flags,
|
||||
G_DBUS_METHOD_FLAG_EXPERIMENTAL))
|
||||
continue;
|
||||
|
||||
if (!deprecated && !noreply &&
|
||||
|
@ -164,11 +170,9 @@ static void generate_interface_xml(GString *gstr, struct interface_data *iface)
|
|||
for (signal = iface->signals; signal && signal->name; signal++) {
|
||||
gboolean deprecated = signal->flags &
|
||||
G_DBUS_SIGNAL_FLAG_DEPRECATED;
|
||||
gboolean experimental = signal->flags &
|
||||
G_DBUS_SIGNAL_FLAG_EXPERIMENTAL;
|
||||
|
||||
if (!(global_flags & G_DBUS_FLAG_ENABLE_EXPERIMENTAL) &&
|
||||
experimental)
|
||||
if (check_experimental(signal->flags,
|
||||
G_DBUS_SIGNAL_FLAG_EXPERIMENTAL))
|
||||
continue;
|
||||
|
||||
if (!deprecated && !(signal->args && signal->args->name))
|
||||
|
@ -194,6 +198,10 @@ static void generate_interface_xml(GString *gstr, struct interface_data *iface)
|
|||
gboolean deprecated = property->flags &
|
||||
G_DBUS_PROPERTY_FLAG_DEPRECATED;
|
||||
|
||||
if (check_experimental(property->flags,
|
||||
G_DBUS_PROPERTY_FLAG_EXPERIMENTAL))
|
||||
continue;
|
||||
|
||||
g_string_append_printf(gstr, "\t\t<property name=\"%s\""
|
||||
" type=\"%s\" access=\"%s%s\"",
|
||||
property->name, property->type,
|
||||
|
@ -555,6 +563,10 @@ static void append_properties(struct interface_data *data,
|
|||
DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
|
||||
|
||||
for (p = data->properties; p && p->name; p++) {
|
||||
if (check_experimental(p->flags,
|
||||
G_DBUS_PROPERTY_FLAG_EXPERIMENTAL))
|
||||
continue;
|
||||
|
||||
if (p->get == NULL)
|
||||
continue;
|
||||
|
||||
|
@ -756,7 +768,13 @@ static inline const GDBusPropertyTable *find_property(const GDBusPropertyTable *
|
|||
const GDBusPropertyTable *p;
|
||||
|
||||
for (p = properties; p && p->name; p++) {
|
||||
if (strcmp(name, p->name) == 0)
|
||||
if (strcmp(name, p->name) != 0)
|
||||
continue;
|
||||
|
||||
if (check_experimental(p->flags,
|
||||
G_DBUS_PROPERTY_FLAG_EXPERIMENTAL))
|
||||
break;
|
||||
|
||||
return p;
|
||||
}
|
||||
|
||||
|
@ -1035,18 +1053,14 @@ static DBusHandlerResult generic_message(DBusConnection *connection,
|
|||
|
||||
for (method = iface->methods; method &&
|
||||
method->name && method->function; method++) {
|
||||
gboolean experimental = method->flags &
|
||||
G_DBUS_METHOD_FLAG_EXPERIMENTAL;
|
||||
|
||||
if (dbus_message_is_method_call(message, iface->name,
|
||||
method->name) == FALSE)
|
||||
continue;
|
||||
|
||||
if (experimental) {
|
||||
const char *env = g_getenv("GDBUS_EXPERIMENTAL");
|
||||
if (g_strcmp0(env, "1") != 0)
|
||||
if (check_experimental(method->flags,
|
||||
G_DBUS_METHOD_FLAG_EXPERIMENTAL))
|
||||
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
|
||||
}
|
||||
|
||||
if (g_dbus_args_have_signature(method->in_args,
|
||||
message) == FALSE)
|
||||
|
|
Loading…
Reference in New Issue