DA: Add DHCP state notify function

[platform/upstream/connman.git] / gdbus / watch.c

diff --git a/gdbus/watch.c b/gdbus/watch.c
old mode 100644 (file)
new mode 100755 (executable)
index b60f650..8fa76cd
--- a/gdbus/watch.c
+++ b/gdbus/watch.c
@@ -136,38 +136,55 @@ static struct filter_data *filter_data_find(DBusConnection *connection)
        return NULL;
 }
 
-static void format_rule(struct filter_data *data, char *rule, size_t size)
+static char *format_rule(struct filter_data *data)
 {
+       char *rule, *tmp;
        const char *sender;
-       int offset;
 
-       offset = snprintf(rule, size, "type='signal'");
+       rule = g_strdup("type='signal'");
        sender = data->name ? : data->owner;
 
-       if (sender)
-               offset += snprintf(rule + offset, size - offset,
-                               ",sender='%s'", sender);
-       if (data->path)
-               offset += snprintf(rule + offset, size - offset,
-                               ",path='%s'", data->path);
-       if (data->interface)
-               offset += snprintf(rule + offset, size - offset,
-                               ",interface='%s'", data->interface);
-       if (data->member)
-               offset += snprintf(rule + offset, size - offset,
-                               ",member='%s'", data->member);
-       if (data->argument)
-               snprintf(rule + offset, size - offset,
-                               ",arg0='%s'", data->argument);
+       if (sender) {
+               tmp = rule;
+               rule = g_strdup_printf("%s,sender='%s'", rule, sender);
+               g_free(tmp);
+       }
+
+       if (data->path) {
+               tmp = rule;
+               rule = g_strdup_printf("%s,path='%s'", rule, data->path);
+               g_free(tmp);
+       }
+
+       if (data->interface){
+               tmp = rule;
+               rule = g_strdup_printf("%s,interface='%s'", rule,
+                               data->interface);
+               g_free(tmp);
+       }
+
+       if (data->member) {
+               tmp = rule;
+               rule = g_strdup_printf("%s,member='%s'", rule, data->member);
+               g_free(tmp);
+       }
+
+       if (data->argument) {
+               tmp = rule;
+               rule = g_strdup_printf("%s,arg0='%s'", rule, data->argument);
+               g_free(tmp);
+       }
+
+       return rule;
 }
 
 static gboolean add_match(struct filter_data *data,
                                DBusHandleMessageFunction filter)
 {
        DBusError err;
-       char rule[DBUS_MAXIMUM_MATCH_RULE_LENGTH];
+       char *rule;
 
-       format_rule(data, rule, sizeof(rule));
+       rule = format_rule(data);
        dbus_error_init(&err);
 
        dbus_bus_add_match(data->connection, rule, &err);
@@ -175,21 +192,23 @@ static gboolean add_match(struct filter_data *data,
                error("Adding match rule \"%s\" failed: %s", rule,
                                err.message);
                dbus_error_free(&err);
+               g_free(rule);
                return FALSE;
        }
 
        data->handle_func = filter;
        data->registered = TRUE;
 
+       g_free(rule);
        return TRUE;
 }
 
 static gboolean remove_match(struct filter_data *data)
 {
        DBusError err;
-       char rule[DBUS_MAXIMUM_MATCH_RULE_LENGTH];
+       char *rule;
 
-       format_rule(data, rule, sizeof(rule));
+       rule = format_rule(data);
 
        dbus_error_init(&err);
 
@@ -198,12 +217,38 @@ static gboolean remove_match(struct filter_data *data)
                error("Removing owner match rule for %s failed: %s",
                                rule, err.message);
                dbus_error_free(&err);
+               g_free(rule);
                return FALSE;
        }
 
+       g_free(rule);
        return TRUE;
 }
 
+static void filter_data_free(struct filter_data *data)
+{
+       GSList *l;
+
+       /* Remove filter if there are no listeners left for the connection */
+       if (filter_data_find(data->connection) == NULL)
+               dbus_connection_remove_filter(data->connection, message_filter,
+                                                                       NULL);
+
+       for (l = data->callbacks; l != NULL; l = l->next)
+               g_free(l->data);
+
+       g_slist_free(data->callbacks);
+       g_dbus_remove_watch(data->connection, data->name_watch);
+       g_free(data->name);
+       g_free(data->owner);
+       g_free(data->path);
+       g_free(data->interface);
+       g_free(data->member);
+       g_free(data->argument);
+       dbus_connection_unref(data->connection);
+       g_free(data);
+}
+
 static struct filter_data *filter_data_get(DBusConnection *connection,
                                        DBusHandleMessageFunction filter,
                                        const char *sender,
@@ -248,7 +293,7 @@ proceed:
        data->argument = g_strdup(argument);
 
        if (!add_match(data, filter)) {
-               g_free(data);
+               filter_data_free(data);
                return NULL;
        }
 
@@ -277,30 +322,6 @@ static struct filter_callback *filter_data_find_callback(
        return NULL;
 }
 
-static void filter_data_free(struct filter_data *data)
-{
-       GSList *l;
-
-       /* Remove filter if there are no listeners left for the connection */
-       if (filter_data_find(data->connection) == NULL)
-               dbus_connection_remove_filter(data->connection, message_filter,
-                                                                       NULL);
-
-       for (l = data->callbacks; l != NULL; l = l->next)
-               g_free(l->data);
-
-       g_slist_free(data->callbacks);
-       g_dbus_remove_watch(data->connection, data->name_watch);
-       g_free(data->name);
-       g_free(data->owner);
-       g_free(data->path);
-       g_free(data->interface);
-       g_free(data->member);
-       g_free(data->argument);
-       dbus_connection_unref(data->connection);
-       g_free(data);
-}
-
 static void filter_data_call_and_free(struct filter_data *data)
 {
        GSList *l;