unit: Add gdbus/client_proxy_removed
Luiz Augusto von Dentz
maintainerPATCH 1/8 unit: Add gdbus/client_proxy_removed
From: Luiz Augusto von Dentz <[email protected]>
This tests if watches created using g_dbus_proxy_set_removed_watch works when the interface is removed.
--- unit/test-gdbus-client.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+)
unit/test-gdbus-client.c +57 -0
@@ -848,6 +848,61 @@ static void client_check_order(void)destroy_context (context); } +static void proxy_removed (GDBusProxy *proxy,void *user_data) +{ +struct context *context = user_data; + +if (g_test_verbose ()) +g_print ("proxy removed\n" ); + +g_main_loop_quit (context->main_loop); +} + +static void proxy_set_removed (GDBusProxy *proxy,void *user_data) +{ +struct context *context = user_data; + +if (g_test_verbose ()) +g_print ("proxy %s found\n" , +g_dbus_proxy_get_interface (proxy)); + +g_assert (g_dbus_proxy_set_removed_watch (proxy, proxy_removed, context)); + + context->timeout_source =g_timeout_add_seconds (2 , timeout_test, + context); + +g_dbus_unregister_interface (context->dbus_conn,SERVICE_PATH , +SERVICE_NAME ); +} + +static void client_proxy_removed (void ) +{ +struct context *context =create_context (); +static const GDBusPropertyTable string_properties[] = { + {"String" ,"s" , get_string, set_string, string_exists }, + { }, + }; + +if (context ==NULL ) +return ; + +g_dbus_register_interface (context->dbus_conn, +SERVICE_PATH ,SERVICE_NAME , + methods, signals, string_properties, + context,NULL ); + + context->dbus_client =g_dbus_client_new (context->dbus_conn, +SERVICE_NAME ,SERVICE_PATH ); + +g_dbus_client_set_proxy_handlers (context->dbus_client, + proxy_set_removed,NULL ,NULL , + context); + +g_main_loop_run (context->main_loop); + +destroy_context (context); +} +int main (int argc,char *argv[]) {g_test_init (&argc, &argv,NULL );
@@ -880,5 +935,7 @@ int main(int argc, char *argv[])g_test_add_func ("/gdbus/client_check_order" , client_check_order); +g_test_add_func ("/gdbus/client_proxy_removed" , client_proxy_removed); +return g_test_run (); }
Signature · 1 line
1.8.3.1
Luiz Augusto von Dentz
maintainerPATCH 2/8 unit: Add gdbus/client_force_disconnect
From: Luiz Augusto von Dentz <[email protected]>
This tests if watches created using g_dbus_proxy_set_removed_watch works when the service disconnects from the bus.
--- unit/test-gdbus-client.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+)
unit/test-gdbus-client.c +59 -0
@@ -29,6 +29,7 @@#include <gdbus.h> #define SERVICE_NAME "org.bluez.unit.test-gdbus-client" +#define SERVICE_NAME1 "org.bluez.unit.test-gdbus-client1"#define SERVICE_PATH "/org/bluez/unit/test_gdbus_client"struct context {
@@ -903,6 +904,61 @@ static void client_proxy_removed(void)destroy_context (context); } +static void proxy_force_disconnect (GDBusProxy *proxy,void *user_data) +{ +struct context *context = user_data; +DBusConnection *conn = context->data; + +if (g_test_verbose ()) +g_print ("proxy %s found\n" , +g_dbus_proxy_get_interface (proxy)); + +g_assert (g_dbus_proxy_set_removed_watch (proxy, proxy_removed, context)); + + context->timeout_source =g_timeout_add_seconds (2 , timeout_test, + context); + +dbus_connection_flush (conn); +dbus_connection_close (conn); + context->data =NULL ; +} + +static void client_force_disconnect (void ) +{ +struct context *context =create_context (); +DBusConnection *conn; +static const GDBusPropertyTable string_properties[] = { + {"String" ,"s" , get_string, set_string, string_exists }, + { }, + }; + +if (context ==NULL ) +return ; + + conn =g_dbus_setup_private (DBUS_BUS_SESSION ,SERVICE_NAME1 ,NULL ); +g_assert (conn !=NULL ); + +/* Avoid D-Bus library calling _exit() before next test finishes. */ +dbus_connection_set_exit_on_disconnect (conn, FALSE); +g_dbus_attach_object_manager (conn); + context->data = conn; + +g_dbus_register_interface (conn,SERVICE_PATH ,SERVICE_NAME1 , + methods, signals, string_properties, + context,NULL ); + + context->dbus_client =g_dbus_client_new (context->dbus_conn, +SERVICE_NAME1 ,SERVICE_PATH ); + +g_dbus_client_set_proxy_handlers (context->dbus_client, + proxy_force_disconnect,NULL ,NULL , + context); + +g_main_loop_run (context->main_loop); + +destroy_context (context); +} +int main (int argc,char *argv[]) {g_test_init (&argc, &argv,NULL );
@@ -937,5 +993,8 @@ int main(int argc, char *argv[])g_test_add_func ("/gdbus/client_proxy_removed" , client_proxy_removed); +g_test_add_func ("/gdbus/client_force_disconnect" , + client_force_disconnect); +return g_test_run (); }
Signature · 1 line
1.8.3.1
Luiz Augusto von Dentz
maintainerPATCH 3/8 gdbus/watch: Fix crash when g_dbus_remove_watch is called from connect callback
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
at 0x40570C: update_service (watch.c:601)
by 0x40584B: service_reply (watch.c:627)
by 0x3B0700C511: ??? (in /usr/lib64/libdbus-1.so.3.7.4)
by 0x3B0700F740: dbus_connection_dispatch (in /usr/lib64/libdbus-1.so.3.7.4) by 0x405167: message_dispatch (mainloop.c:76)
by 0x3B03C48962: ??? (in /usr/lib64/libglib-2.0.so.0.3600.3)
by 0x3B03C47E05: g_main_context_dispatch (in /usr/lib64/libglib-2.0.so.0.3600.3) by 0x3B03C48157: ??? (in /usr/lib64/libglib-2.0.so.0.3600.3)
by 0x3B03C48559: g_main_loop_run (in /usr/lib64/libglib-2.0.so.0.3600.3)
Address 0x4c58a30 is 32 bytes inside a block of size 56 free'd
at 0x4A074C4: free (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) by 0x3B03C4D9AE: g_free (in /usr/lib64/libglib-2.0.so.0.3600.3)
by 0x406102: filter_data_remove_callback (watch.c:378)
by 0x405FC0: g_dbus_remove_watch (watch.c:798)
by 0x40A22B: g_dbus_client_unref (client.c:1227)
by 0x40570B: update_service (watch.c:599)
by 0x40584B: service_reply (watch.c:627)
--- gdbus/watch.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
gdbus/watch.c +6 -2
@@ -593,12 +593,16 @@ static gboolean update_service(void *user_data) {struct service_data *data = user_data;struct filter_callback *cb = data->callback; +DBusConnection *conn;update_name_cache (data->name, data->owner); + conn =dbus_connection_ref (data->conn); +service_data_free (cb->data); +if (cb->conn_func) - cb->conn_func (data->conn, cb->user_data); + cb->conn_func (conn, cb->user_data); -service_data_free (data); +dbus_connection_unref (conn);return FALSE; }
Signature · 1 line
1.8.3.1
Luiz Augusto von Dentz
maintainerPATCH 4/8 gdbus/watch: Fix aborting when removing D-Bus filter
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
In case of filter_data having a watch to a service name it may call dbus_connection_remove_filter twice causing libdbus to abort:
process 24723: Attempt to remove filter function 0x4063e0 user data (nil), but no such filter has been added
To fix this the code will now only attempt to call dbus_connection_remove_filter once in filter_data_free which is the counterpart of filter_data_get where dbus_connection_add_filter is called.
--- gdbus/watch.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-)
gdbus/watch.c +8 -17
@@ -281,6 +281,11 @@ 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);
@@ -360,8 +365,6 @@ static void service_data_free(struct service_data *data)static gboolean filter_data_remove_callback (struct filter_data *data,struct filter_callback *cb) { -DBusConnection *connection; - data->callbacks =g_slist_remove (data->callbacks, cb); data->processed =g_slist_remove (data->processed, cb);
@@ -385,16 +388,8 @@ static gboolean filter_data_remove_callback(struct filter_data *data,if (data->registered && !remove_match (data))return FALSE; - connection =dbus_connection_ref (data->connection); listeners =g_slist_remove (listeners, data); - -/* Remove filter if there are no listeners left for the connection */ -if (filter_data_find (connection) ==NULL ) -dbus_connection_remove_filter (connection, message_filter, -NULL ); -filter_data_free (data); -dbus_connection_unref (connection);return TRUE; }
@@ -563,6 +558,9 @@ static DBusHandlerResult message_filter(DBusConnection *connection, current); } +if (delete_listener ==NULL ) +return DBUS_HANDLER_RESULT_NOT_YET_HANDLED ; +for (current = delete_listener; current !=NULL ; current = delete_listener->next) {GSList *l = current->data;
@@ -581,11 +579,6 @@ static DBusHandlerResult message_filter(DBusConnection *connection,g_slist_free (delete_listener); -/* Remove filter if there are no listeners left for the connection */ -if (filter_data_find (connection) ==NULL ) -dbus_connection_remove_filter (connection, message_filter, -NULL ); -return DBUS_HANDLER_RESULT_NOT_YET_HANDLED ; }
@@ -814,6 +807,4 @@ void g_dbus_remove_all_watches(DBusConnection *connection) listeners =g_slist_remove (listeners, data);filter_data_call_and_free (data); } - -dbus_connection_remove_filter (connection, message_filter,NULL ); }
Signature · 1 line
1.8.3.1
Luiz Augusto von Dentz
maintainerPATCH 5/8 gdbus/watch: Fix crash when disconnecting from D-Bus
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
When disconnecting from D-Bus a message could be recieved with no sender:
Invalid read of size 1
at 0x4A09EE1: strcmp (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) by 0x3B03C386B8: g_str_equal (in /usr/lib64/libglib-2.0.so.0.3600.3) by 0x4065D6: message_filter (watch.c:529)
by 0x3B0700F9E5: dbus_connection_dispatch (in /usr/lib64/libdbus-1.so.3.7.4) by 0x4052E7: message_dispatch (mainloop.c:76)
by 0x3B03C48962: ??? (in /usr/lib64/libglib-2.0.so.0.3600.3)
by 0x3B03C47E05: g_main_context_dispatch (in /usr/lib64/libglib-2.0.so.0.3600.3) by 0x3B03C48157: ??? (in /usr/lib64/libglib-2.0.so.0.3600.3)
by 0x3B03C48559: g_main_loop_run (in /usr/lib64/libglib-2.0.so.0.3600.3) by 0x4038C5: client_proxy_removed (test-gdbus-client.c:902)
by 0x3B03C6B566: ??? (in /usr/lib64/libglib-2.0.so.0.3600.3)
by 0x3B03C6B6E5: ??? (in /usr/lib64/libglib-2.0.so.0.3600.3)
Address 0x0 is not stack'd, malloc'd or (recently) free'd
--- gdbus/watch.c | 2 ++ 1 file changed, 2 insertions(+)
gdbus/watch.c +2 -0
@@ -519,6 +519,8 @@ static DBusHandlerResult message_filter(DBusConnection *connection,dbus_message_get_args (message,NULL ,DBUS_TYPE_STRING , &arg,DBUS_TYPE_INVALID );/* Sender is always the owner */ +if (sender ==NULL ) +return DBUS_HANDLER_RESULT_NOT_YET_HANDLED ;for (current = listeners; current !=NULL ; current = current->next) { data = current->data;
Signature · 1 line
1.8.3.1
Luiz Augusto von Dentz
maintainerPATCH 6/8 gdbus/client: Use g_dbus_add_service_watch to track services
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This make the handling much simpler and avoids duplicates of the same match rule.
--- gdbus/client.c | 173 +++++++++++++-------------------------------------------- 1 file changed, 38 insertions(+), 135 deletions(-)
gdbus/client.c +38 -135
@@ -36,8 +36,8 @@ struct GDBusClient {int ref_count;DBusConnection *dbus_conn;char *service_name; -char *unique_name;char *base_path; +guint watch;GPtrArray *match_rules;DBusPendingCall *pending_call;DBusPendingCall *get_objects_call;
@@ -1051,74 +1051,36 @@ static void get_managed_objects(GDBusClient *client)dbus_message_unref (msg); } -static void get_name_owner_reply (DBusPendingCall *call,void *user_data) +static void service_connect (DBusConnection *conn,void *user_data) {GDBusClient *client = user_data; -DBusMessage *reply =dbus_pending_call_steal_reply (call); -DBusError error; -const char *name;g_dbus_client_ref (client); -dbus_error_init (&error); - -if (dbus_set_error_from_message (&error, reply) == TRUE) { -dbus_error_free (&error); - goto done; - } - -if (dbus_message_get_args (reply,NULL ,DBUS_TYPE_STRING , &name, -DBUS_TYPE_INVALID ) == FALSE) - goto done; - -if (client->unique_name ==NULL ) { - client->unique_name =g_strdup (name); - -if (client->connect_func) - client->connect_func (client->dbus_conn, - client->connect_data); - -get_managed_objects (client); - } - -done: -dbus_message_unref (reply); +if (client->connect_func) + client->connect_func (conn, client->connect_data); -dbus_pending_call_unref (client->pending_call); - client->pending_call =NULL ; +get_managed_objects (client);g_dbus_client_unref (client); } -static void get_name_owner (GDBusClient *client,const char *name) +static void service_disconnect (DBusConnection *conn,void *user_data) { -DBusMessage *msg; - - msg =dbus_message_new_method_call (DBUS_SERVICE_DBUS ,DBUS_PATH_DBUS , -DBUS_INTERFACE_DBUS ,"GetNameOwner" ); -if (msg ==NULL ) -return ; - -dbus_message_append_args (msg,DBUS_TYPE_STRING , &name, -DBUS_TYPE_INVALID ); - -if (g_dbus_send_message_with_reply (client->dbus_conn, msg, - &client->pending_call,-1 ) == FALSE) { -dbus_message_unref (msg); -return ; - } +GDBusClient *client = user_data; -dbus_pending_call_set_notify (client->pending_call, - get_name_owner_reply, client,NULL ); +g_list_free_full (client->proxy_list, proxy_free); + client->proxy_list =NULL ; -dbus_message_unref (msg); +if (client->disconn_func) + client->disconn_func (conn, client->disconn_data); }static DBusHandlerResult message_filter (DBusConnection *connection,DBusMessage *message,void *user_data) {GDBusClient *client = user_data; -const char *sender; +const char *sender, *path, *interface, *member;if (dbus_message_get_type (message) !=DBUS_MESSAGE_TYPE_SIGNAL )return DBUS_HANDLER_RESULT_NOT_YET_HANDLED ;
@@ -1127,98 +1089,41 @@ static DBusHandlerResult message_filter(DBusConnection *connection,if (sender ==NULL )return DBUS_HANDLER_RESULT_NOT_YET_HANDLED ; -if (g_str_equal (sender,DBUS_SERVICE_DBUS ) == TRUE) { -const char *interface, *member; -const char *name, *old, *new; + path =dbus_message_get_path (message); + interface =dbus_message_get_interface (message); + member =dbus_message_get_member (message); - interface =dbus_message_get_interface (message); - -if (g_str_equal (interface,DBUS_INTERFACE_DBUS ) == FALSE) -return DBUS_HANDLER_RESULT_NOT_YET_HANDLED ; - - member =dbus_message_get_member (message); - -if (g_str_equal (member,"NameOwnerChanged" ) == FALSE) +if (g_str_equal (path,"/" ) == TRUE) { +if (g_str_equal (interface,DBUS_INTERFACE_DBUS +".ObjectManager" ) == FALSE)return DBUS_HANDLER_RESULT_NOT_YET_HANDLED ; -if (dbus_message_get_args (message,NULL , -DBUS_TYPE_STRING , &name, -DBUS_TYPE_STRING , &old, -DBUS_TYPE_STRING , &new, -DBUS_TYPE_INVALID ) == FALSE) +if (g_str_equal (member,"InterfacesAdded" ) == TRUE) { +interfaces_added (client, message);return DBUS_HANDLER_RESULT_NOT_YET_HANDLED ; + } -if (g_str_equal (name, client->service_name) == FALSE) +if (g_str_equal (member,"InterfacesRemoved" ) == TRUE) { +interfaces_removed (client, message);return DBUS_HANDLER_RESULT_NOT_YET_HANDLED ; - -if (*new =='\0' && client->unique_name !=NULL && -g_str_equal (old, client->unique_name) == TRUE) { - -g_list_free_full (client->proxy_list, proxy_free); - client->proxy_list =NULL ; - -if (client->disconn_func) - client->disconn_func (client->dbus_conn, - client->disconn_data); - -g_free (client->unique_name); - client->unique_name =NULL ; - }else if (*old =='\0' && client->unique_name ==NULL ) { - client->unique_name =g_strdup (new); - -if (client->connect_func) - client->connect_func (client->dbus_conn, - client->connect_data); - -get_managed_objects (client); }return DBUS_HANDLER_RESULT_NOT_YET_HANDLED ; } -if (client->unique_name ==NULL ) +if (g_str_has_prefix (path, client->base_path) == FALSE)return DBUS_HANDLER_RESULT_NOT_YET_HANDLED ; -if (g_str_equal (sender, client->unique_name) == TRUE) { -const char *path, *interface, *member; - - path =dbus_message_get_path (message); - interface =dbus_message_get_interface (message); - member =dbus_message_get_member (message); - -if (g_str_equal (path,"/" ) == TRUE) { -if (g_str_equal (interface,DBUS_INTERFACE_DBUS -".ObjectManager" ) == FALSE) -return DBUS_HANDLER_RESULT_NOT_YET_HANDLED ; - -if (g_str_equal (member,"InterfacesAdded" ) == TRUE) { -interfaces_added (client, message); -return DBUS_HANDLER_RESULT_NOT_YET_HANDLED ; - } - -if (g_str_equal (member,"InterfacesRemoved" ) == TRUE) { -interfaces_removed (client, message); -return DBUS_HANDLER_RESULT_NOT_YET_HANDLED ; - } +if (g_str_equal (interface,DBUS_INTERFACE_PROPERTIES ) == TRUE) { +if (g_str_equal (member,"PropertiesChanged" ) == TRUE) +properties_changed (client, path, message); -return DBUS_HANDLER_RESULT_NOT_YET_HANDLED ; - } - -if (g_str_has_prefix (path, client->base_path) == FALSE) -return DBUS_HANDLER_RESULT_NOT_YET_HANDLED ; - -if (g_str_equal (interface,DBUS_INTERFACE_PROPERTIES ) == TRUE) { -if (g_str_equal (member,"PropertiesChanged" ) == TRUE) -properties_changed (client, path, message); - -return DBUS_HANDLER_RESULT_NOT_YET_HANDLED ; - } - -if (client->signal_func) - client->signal_func (client->dbus_conn, - message, client->signal_data); +return DBUS_HANDLER_RESULT_NOT_YET_HANDLED ; } +if (client->signal_func) + client->signal_func (connection, message, client->signal_data); +return DBUS_HANDLER_RESULT_NOT_YET_HANDLED ; }
@@ -1245,16 +1150,13 @@ GDBusClient *g_dbus_client_new(DBusConnection *connection, client->service_name =g_strdup (service); client->base_path =g_strdup (path); -get_name_owner (client, client->service_name); - - client->match_rules =g_ptr_array_sized_new (4 ); + client->match_rules =g_ptr_array_sized_new (3 );g_ptr_array_set_free_func (client->match_rules, g_free); -g_ptr_array_add (client->match_rules,g_strdup_printf ("type='signal'," -"sender='%s',path='%s',interface='%s'," -"member='NameOwnerChanged',arg0='%s'" , -DBUS_SERVICE_DBUS ,DBUS_PATH_DBUS , -DBUS_INTERFACE_DBUS , client->service_name)); + client->watch =g_dbus_add_service_watch (connection, service, + service_connect, + service_disconnect, + client,NULL ); g_ptr_array_add(client->match_rules, g_strdup_printf("type='signal'," "sender='%s'," "path='/',interface='%s.ObjectManager',"
@@ -1322,10 +1224,11 @@ void g_dbus_client_unref(GDBusClient *client)if (client->disconn_func) client->disconn_func (client->dbus_conn, client->disconn_data); +g_dbus_remove_watch (client->dbus_conn, client->watch); +dbus_connection_unref (client->dbus_conn);g_free (client->service_name); -g_free (client->unique_name);g_free (client->base_path);g_free (client);
Signature · 1 line
1.8.3.1
Luiz Augusto von Dentz
maintainerPATCH 7/8 gdbus/client: Use g_dbus_add_signal_watch to track signals
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This make the handling much simpler and avoids duplicates of the same match rule.
--- gdbus/client.c | 73 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 37 insertions(+), 36 deletions(-)
gdbus/client.c +37 -36
@@ -25,6 +25,7 @@#include <config.h> #endif +#include <stdio.h> #include <glib.h> #include <dbus/dbus.h>
@@ -32,12 +33,18 @@#define METHOD_CALL_TIMEOUT (300 * 1000) +#ifndef DBUS_INTERFACE_OBJECT_MANAGER +#define DBUS_INTERFACE_OBJECT_MANAGER DBUS_INTERFACE_DBUS ".ObjectManager" +#endif +struct GDBusClient {int ref_count;DBusConnection *dbus_conn;char *service_name;char *base_path;guint watch; +guint added_watch; +guint removed_watch;GPtrArray *match_rules;DBusPendingCall *pending_call;DBusPendingCall *get_objects_call;
@@ -908,16 +915,18 @@ static void parse_interfaces(GDBusClient *client, const char *path, } } -static void interfaces_added (GDBusClient *client,DBusMessage *msg) +static gboolean interfaces_added (DBusConnection *conn,DBusMessage *msg, +void *user_data) { +GDBusClient *client = user_data;DBusMessageIter iter;const char *path;if (dbus_message_iter_init (msg, &iter) == FALSE) -return ; +return TRUE;if (dbus_message_iter_get_arg_type (&iter) !=DBUS_TYPE_OBJECT_PATH ) -return ; +return TRUE;dbus_message_iter_get_basic (&iter, &path);dbus_message_iter_next (&iter);
@@ -927,24 +936,28 @@ static void interfaces_added(GDBusClient *client, DBusMessage *msg)parse_interfaces (client, path, &iter);g_dbus_client_unref (client); + +return TRUE; } -static void interfaces_removed (GDBusClient *client,DBusMessage *msg) +static gboolean interfaces_removed (DBusConnection *conn,DBusMessage *msg, +void *user_data) { +GDBusClient *client = user_data;DBusMessageIter iter, entry;const char *path;if (dbus_message_iter_init (msg, &iter) == FALSE) -return ; +return TRUE;if (dbus_message_iter_get_arg_type (&iter) !=DBUS_TYPE_OBJECT_PATH ) -return ; +return TRUE;dbus_message_iter_get_basic (&iter, &path);dbus_message_iter_next (&iter);if (dbus_message_iter_get_arg_type (&iter) !=DBUS_TYPE_ARRAY ) -return ; +return TRUE;dbus_message_iter_recurse (&iter, &entry);
@@ -959,6 +972,8 @@ static void interfaces_removed(GDBusClient *client, DBusMessage *msg) }g_dbus_client_unref (client); + +return TRUE; }static void parse_managed_objects (GDBusClient *client,DBusMessage *msg)
@@ -1093,24 +1108,6 @@ static DBusHandlerResult message_filter(DBusConnection *connection, interface =dbus_message_get_interface (message); member =dbus_message_get_member (message); -if (g_str_equal (path,"/" ) == TRUE) { -if (g_str_equal (interface,DBUS_INTERFACE_DBUS -".ObjectManager" ) == FALSE) -return DBUS_HANDLER_RESULT_NOT_YET_HANDLED ; - -if (g_str_equal (member,"InterfacesAdded" ) == TRUE) { -interfaces_added (client, message); -return DBUS_HANDLER_RESULT_NOT_YET_HANDLED ; - } - -if (g_str_equal (member,"InterfacesRemoved" ) == TRUE) { -interfaces_removed (client, message); -return DBUS_HANDLER_RESULT_NOT_YET_HANDLED ; - } - -return DBUS_HANDLER_RESULT_NOT_YET_HANDLED ; - } -if (g_str_has_prefix (path, client->base_path) == FALSE)return DBUS_HANDLER_RESULT_NOT_YET_HANDLED ;
@@ -1150,23 +1147,25 @@ GDBusClient *g_dbus_client_new(DBusConnection *connection, client->service_name =g_strdup (service); client->base_path =g_strdup (path); - client->match_rules =g_ptr_array_sized_new (3 ); + client->match_rules =g_ptr_array_sized_new (1 );g_ptr_array_set_free_func (client->match_rules, g_free); client->watch =g_dbus_add_service_watch (connection, service, service_connect, service_disconnect, client,NULL ); -g_ptr_array_add (client->match_rules,g_strdup_printf ("type='signal'," -"sender='%s'," -"path='/',interface='%s.ObjectManager'," -"member='InterfacesAdded'" , - client->service_name,DBUS_INTERFACE_DBUS )); -g_ptr_array_add (client->match_rules,g_strdup_printf ("type='signal'," -"sender='%s'," -"path='/',interface='%s.ObjectManager'," -"member='InterfacesRemoved'" , - client->service_name,DBUS_INTERFACE_DBUS )); + client->added_watch =g_dbus_add_signal_watch (connection, service, +"/" , +DBUS_INTERFACE_OBJECT_MANAGER , +"InterfacesAdded" , + interfaces_added, + client,NULL ); + client->removed_watch =g_dbus_add_signal_watch (connection, service, +"/" , +DBUS_INTERFACE_OBJECT_MANAGER , +"InterfacesRemoved" , + interfaces_removed, + client,NULL );g_ptr_array_add (client->match_rules,g_strdup_printf ("type='signal'," "sender='%s',path_namespace='%s'" , client->service_name, client->base_path));
@@ -1225,6 +1224,8 @@ void g_dbus_client_unref(GDBusClient *client) client->disconn_func (client->dbus_conn, client->disconn_data);g_dbus_remove_watch (client->dbus_conn, client->watch); +g_dbus_remove_watch (client->dbus_conn, client->added_watch); +g_dbus_remove_watch (client->dbus_conn, client->removed_watch);dbus_connection_unref (client->dbus_conn);
Signature · 1 line
1.8.3.1
Luiz Augusto von Dentz
maintainerPATCH 8/8 gdbus/client: Use g_dbus_add_properties_watch to track properties
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This make the handling much simpler and avoids duplicates of the same match rule.
--- gdbus/client.c | 135 ++++++++++++++++++++++++--------------------------------- 1 file changed, 56 insertions(+), 79 deletions(-)
gdbus/client.c +56 -79
@@ -67,7 +67,7 @@ struct GDBusProxy {char *obj_path;char *interface;GHashTable *prop_list; -char *match_rule; +guint watch;GDBusPropertyFunction prop_func;void *prop_data;GDBusProxyFunction removed_func;
@@ -358,6 +358,52 @@ static GDBusProxy *proxy_lookup(GDBusClient *client, const char *path,return NULL ; } +static gboolean properties_changed (DBusConnection *conn,DBusMessage *msg, +void *user_data) +{ +GDBusProxy *proxy = user_data; +GDBusClient *client = proxy->client; +DBusMessageIter iter, entry; +const char *interface; + +if (dbus_message_iter_init (msg, &iter) == FALSE) +return TRUE; + +if (dbus_message_iter_get_arg_type (&iter) !=DBUS_TYPE_STRING ) +return TRUE; + +dbus_message_iter_get_basic (&iter, &interface); +dbus_message_iter_next (&iter); + +update_properties (proxy, &iter, TRUE); + +dbus_message_iter_next (&iter); + +if (dbus_message_iter_get_arg_type (&iter) !=DBUS_TYPE_ARRAY ) +return TRUE; + +dbus_message_iter_recurse (&iter, &entry); + +while (dbus_message_iter_get_arg_type (&entry) ==DBUS_TYPE_STRING ) { +const char *name; + +dbus_message_iter_get_basic (&entry, &name); + +g_hash_table_remove (proxy->prop_list, name); + +if (proxy->prop_func) + proxy->prop_func (proxy, name,NULL , proxy->prop_data); + +if (client->property_changed) + client->property_changed (proxy, name,NULL , + client->user_data); + +dbus_message_iter_next (&entry); + } + +return TRUE; +} +static GDBusProxy *proxy_new (GDBusClient *client,const char *path,const char *interface) {
@@ -373,14 +419,12 @@ static GDBusProxy *proxy_new(GDBusClient *client, const char *path, proxy->prop_list =g_hash_table_new_full (g_str_hash, g_str_equal,NULL , prop_entry_free); - - proxy->match_rule =g_strdup_printf ("type='signal'," -"sender='%s',path='%s',interface='%s'," -"member='PropertiesChanged',arg0='%s'" , - client->service_name, proxy->obj_path, -DBUS_INTERFACE_PROPERTIES , proxy->interface); - -modify_match (client->dbus_conn,"AddMatch" , proxy->match_rule); + proxy->watch =g_dbus_add_properties_watch (client->dbus_conn, + client->service_name, + proxy->obj_path, + proxy->interface, + properties_changed, + proxy,NULL );return g_dbus_proxy_ref (proxy); }
@@ -395,11 +439,7 @@ static void proxy_free(gpointer data)if (client->proxy_removed) client->proxy_removed (proxy, client->user_data); -modify_match (client->dbus_conn,"RemoveMatch" , - proxy->match_rule); - -g_free (proxy->match_rule); - proxy->match_rule =NULL ; +g_dbus_remove_watch (client->dbus_conn, proxy->watch);g_hash_table_remove_all (proxy->prop_list);
@@ -800,64 +840,6 @@ static void refresh_properties(GDBusClient *client) } } -static void properties_changed (GDBusClient *client,const char *path, -DBusMessage *msg) -{ -GDBusProxy *proxy =NULL ; -DBusMessageIter iter, entry; -const char *interface; -GList *list; - -if (dbus_message_iter_init (msg, &iter) == FALSE) -return ; - -if (dbus_message_iter_get_arg_type (&iter) !=DBUS_TYPE_STRING ) -return ; - -dbus_message_iter_get_basic (&iter, &interface); -dbus_message_iter_next (&iter); - -for (list =g_list_first (client->proxy_list); list; - list =g_list_next (list)) { -GDBusProxy *data = list->data; - -if (g_str_equal (data->interface, interface) == TRUE && -g_str_equal (data->obj_path, path) == TRUE) { - proxy = data; -break ; - } - } - -if (proxy ==NULL ) -return ; - -update_properties (proxy, &iter, TRUE); - -dbus_message_iter_next (&iter); - -if (dbus_message_iter_get_arg_type (&iter) !=DBUS_TYPE_ARRAY ) -return ; - -dbus_message_iter_recurse (&iter, &entry); - -while (dbus_message_iter_get_arg_type (&entry) ==DBUS_TYPE_STRING ) { -const char *name; - -dbus_message_iter_get_basic (&entry, &name); - -g_hash_table_remove (proxy->prop_list, name); - -if (proxy->prop_func) - proxy->prop_func (proxy, name,NULL , proxy->prop_data); - -if (client->property_changed) - client->property_changed (proxy, name,NULL , - client->user_data); - -dbus_message_iter_next (&entry); - } -} -static void parse_properties (GDBusClient *client,const char *path,const char *interface,DBusMessageIter *iter) {
@@ -1095,7 +1077,7 @@ static DBusHandlerResult message_filter(DBusConnection *connection, DBusMessage *message, void *user_data) {GDBusClient *client = user_data; -const char *sender, *path, *interface, *member; +const char *sender, *path, *interface;if (dbus_message_get_type (message) !=DBUS_MESSAGE_TYPE_SIGNAL )return DBUS_HANDLER_RESULT_NOT_YET_HANDLED ;
@@ -1106,17 +1088,12 @@ static DBusHandlerResult message_filter(DBusConnection *connection, path =dbus_message_get_path (message); interface =dbus_message_get_interface (message); - member =dbus_message_get_member (message);if (g_str_has_prefix (path, client->base_path) == FALSE)return DBUS_HANDLER_RESULT_NOT_YET_HANDLED ; -if (g_str_equal (interface,DBUS_INTERFACE_PROPERTIES ) == TRUE) { -if (g_str_equal (member,"PropertiesChanged" ) == TRUE) -properties_changed (client, path, message); - +if (g_str_equal (interface,DBUS_INTERFACE_PROPERTIES ) == TRUE)return DBUS_HANDLER_RESULT_NOT_YET_HANDLED ; - }if (client->signal_func) client->signal_func (connection, message, client->signal_data);
Signature · 1 line
1.8.3.1
Luiz Augusto von Dentz
maintainerHi,
Quoted 83 lines · Luiz Augusto von Dentz
From: Luiz Augusto von Dentz <[email protected]>
This tests if watches created using
g_dbus_proxy_set_removed_watchworks when the interface is removed.--- unit/test-gdbus-client.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+)unit/test-gdbus-client.c +57
-1@@ -848,6 +848,61 @@ static void client_check_order(void)destroy_context (context); } +static void proxy_removed (GDBusProxy *proxy,void *user_data) +{ +struct context *context = user_data; + +if (g_test_verbose ()) +g_print ("proxy removed\n" ); + +g_main_loop_quit (context->main_loop); +} + +static void proxy_set_removed (GDBusProxy *proxy,void *user_data) +{ +struct context *context = user_data; + +if (g_test_verbose ()) +g_print ("proxy %s found\n" , +g_dbus_proxy_get_interface (proxy)); + +g_assert (g_dbus_proxy_set_removed_watch (proxy, proxy_removed, context)); + + context->timeout_source =g_timeout_add_seconds (2 , timeout_test, + context); + +g_dbus_unregister_interface (context->dbus_conn,SERVICE_PATH , +SERVICE_NAME ); +} + +static void client_proxy_removed (void ) +{ +struct context *context =create_context (); +static const GDBusPropertyTable string_properties[] = { + {"String" ,"s" , get_string, set_string, string_exists }, + { }, + }; + +if (context ==NULL ) +return ; + +g_dbus_register_interface (context->dbus_conn, +SERVICE_PATH ,SERVICE_NAME , + methods, signals, string_properties, + context,NULL ); + + context->dbus_client =g_dbus_client_new (context->dbus_conn, +SERVICE_NAME ,SERVICE_PATH ); + +g_dbus_client_set_proxy_handlers (context->dbus_client, + proxy_set_removed,NULL ,NULL , + context); + +g_main_loop_run (context->main_loop); + +destroy_context (context); +} +int main (int argc,char *argv[]) {g_test_init (&argc, &argv,NULL );@@ -880,5 +935,7 @@ int main(int argc, char *argv[])g_test_add_func ("/gdbus/client_check_order" , client_check_order); +g_test_add_func ("/gdbus/client_proxy_removed" , client_proxy_removed); +return g_test_run (); } --
Quoted 1 line
1.8.3.1
This patch-set has been pushed upstream.
Signature · 1 line
Luiz Augusto von Dentz