main.conf: Add NetworkInterfaceBlacklist

[framework/connectivity/connman.git] / src / manager.c

diff --git a/src/manager.c b/src/manager.c
index b448185..1bf9189 100644 (file)
--- a/src/manager.c
+++ b/src/manager.c
@@ -394,33 +394,68 @@ static DBusMessage *release_private_network(DBusConnection *conn,
 }
 
 static const GDBusMethodTable manager_methods[] = {
-       { "GetProperties",     "",      "a{sv}", get_properties     },
-       { "SetProperty",       "sv",    "",      set_property,
-                                               G_DBUS_METHOD_FLAG_ASYNC },
-       { "GetTechnologies",   "",      "a(oa{sv})", get_technologies   },
-       { "RemoveProvider",    "o",     "",      remove_provider    },
-       { "GetServices",       "",      "a(oa{sv})", get_services   },
-       { "ConnectProvider",   "a{sv}", "o",     connect_provider,
-                                               G_DBUS_METHOD_FLAG_ASYNC },
-       { "RegisterAgent",     "o",     "",      register_agent     },
-       { "UnregisterAgent",   "o",     "",      unregister_agent   },
-       { "RegisterCounter",   "ouu",   "",      register_counter   },
-       { "UnregisterCounter", "o",     "",      unregister_counter },
-       { "CreateSession",     "a{sv}o", "o",    create_session     },
-       { "DestroySession",    "o",     "",      destroy_session    },
-       { "RequestPrivateNetwork",    "",     "oa{sv}h",
-                                               request_private_network,
-                                               G_DBUS_METHOD_FLAG_ASYNC },
-       { "ReleasePrivateNetwork",    "o",    "",
-                                               release_private_network },
+       { GDBUS_METHOD("GetProperties",
+                       NULL, GDBUS_ARGS({ "properties", "a{sv}" }),
+                       get_properties) },
+       { GDBUS_ASYNC_METHOD("SetProperty",
+                       GDBUS_ARGS({ "name", "s" }, { "value", "v" }),
+                       NULL, set_property) },
+       { GDBUS_METHOD("GetTechnologies",
+                       NULL, GDBUS_ARGS({ "technologies", "a(oa{sv})" }),
+                       get_technologies) },
+       { GDBUS_METHOD("RemoveProvider",
+                       GDBUS_ARGS({ "provider", "o" }), NULL,
+                       remove_provider) },
+       { GDBUS_METHOD("GetServices",
+                       NULL, GDBUS_ARGS({ "services", "a(oa{sv})" }),
+                       get_services) },
+       { GDBUS_ASYNC_METHOD("ConnectProvider",
+                             GDBUS_ARGS({ "provider", "a{sv}" }),
+                             GDBUS_ARGS({ "path", "o" }),
+                             connect_provider) },
+       { GDBUS_METHOD("RegisterAgent",
+                       GDBUS_ARGS({ "path", "o" }), NULL,
+                       register_agent) },
+       { GDBUS_METHOD("UnregisterAgent",
+                       GDBUS_ARGS({ "path", "o" }), NULL,
+                       unregister_agent) },
+       { GDBUS_METHOD("RegisterCounter",
+                       GDBUS_ARGS({ "path", "o" }, { "accuracy", "u" },
+                                       { "period", "u" }),
+                       NULL, register_counter) },
+       { GDBUS_METHOD("UnregisterCounter",
+                       GDBUS_ARGS({ "path", "o" }), NULL,
+                       unregister_counter) },
+       { GDBUS_METHOD("CreateSession",
+                       GDBUS_ARGS({ "settings", "a{sv}" },
+                                               { "notifier", "o" }),
+                       GDBUS_ARGS({ "session", "o" }),
+                       create_session) },
+       { GDBUS_METHOD("DestroySession",
+                       GDBUS_ARGS({ "session", "o" }), NULL,
+                       destroy_session) },
+       { GDBUS_ASYNC_METHOD("RequestPrivateNetwork",
+                             NULL, GDBUS_ARGS({ "path", "o" },
+                                              { "settings", "a{sv}" },
+                                              { "socket", "h" }),
+                             request_private_network) },
+       { GDBUS_METHOD("ReleasePrivateNetwork",
+                       GDBUS_ARGS({ "path", "o" }), NULL,
+                       release_private_network) },
        { },
 };
 
 static const GDBusSignalTable manager_signals[] = {
-       { "PropertyChanged", "sv" },
-       { "TechnologyAdded", "oa{sv}" },
-       { "TechnologyRemoved", "o" },
-       { "ServicesChanged",   "a(oa{sv})ao" },
+       { GDBUS_SIGNAL("PropertyChanged",
+                       GDBUS_ARGS({ "name", "s" }, { "value", "v" })) },
+       { GDBUS_SIGNAL("TechnologyAdded",
+                       GDBUS_ARGS({ "path", "o" },
+                                  { "properties", "a{sv}" })) },
+       { GDBUS_SIGNAL("TechnologyRemoved",
+                       GDBUS_ARGS({ "path", "o" })) },
+       { GDBUS_SIGNAL("ServicesChanged",
+                       GDBUS_ARGS({ "changed", "a(oa{sv})" },
+                                       { "removed", "ao" })) },
        { },
 };