Imported Upstream version 1.26

[platform/upstream/connman.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 4f635de..21d1e06 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -644,6 +644,7 @@ int main(int argc, char *argv[])
        __connman_notifier_init();
        __connman_agent_init();
        __connman_service_init();
+       __connman_peer_service_init();
        __connman_peer_init();
        __connman_provider_init();
        __connman_network_init();
@@ -678,6 +679,7 @@ int main(int argc, char *argv[])
        __connman_wpad_init();
        __connman_wispr_init();
        __connman_rfkill_init();
+       __connman_machine_init();
 
        g_free(option_config);
        g_free(option_device);
@@ -689,6 +691,7 @@ int main(int argc, char *argv[])
 
        g_source_remove(signal);
 
+       __connman_machine_cleanup();
        __connman_rfkill_cleanup();
        __connman_wispr_cleanup();
        __connman_wpad_cleanup();
@@ -713,12 +716,13 @@ int main(int argc, char *argv[])
        __connman_nat_cleanup();
        __connman_firewall_cleanup();
        __connman_iptables_cleanup();
+       __connman_peer_service_cleanup();
+       __connman_peer_cleanup();
        __connman_ippool_cleanup();
        __connman_device_cleanup();
        __connman_network_cleanup();
        __connman_dhcp_cleanup();
        __connman_service_cleanup();
-       __connman_peer_cleanup();
        __connman_agent_cleanup();
        __connman_ipconfig_cleanup();
        __connman_notifier_cleanup();