Add priority field to plugin descriptor definition

diff --git a/include/plugin.h b/include/plugin.h
index 350937e..059c50a 100644 (file)
--- a/include/plugin.h
+++ b/include/plugin.h
@@ -78,10 +78,9 @@ struct connman_plugin_desc {
  *                                     example_init, example_exit)
  * ]|
  */
-#define CONNMAN_PLUGIN_DEFINE(name, description, version, init, exit) \
+#define CONNMAN_PLUGIN_DEFINE(name, description, version, priority, init, exit) \
                struct connman_plugin_desc connman_plugin_desc = { \
-                       #name, description, version, \
-                       CONNMAN_PLUGIN_PRIORITY_DEFAULT, init, exit \
+                       #name, description, version, priority, init, exit \
                };
 
 #ifdef __cplusplus

diff --git a/plugins/bluetooth.c b/plugins/bluetooth.c
index 25dc0ca..12519c5 100644 (file)
--- a/plugins/bluetooth.c
+++ b/plugins/bluetooth.c
@@ -849,4 +849,4 @@ static void bluetooth_exit(void)
 }
 
 CONNMAN_PLUGIN_DEFINE(bluetooth, "Bluetooth technology plugin", VERSION,
-                                               bluetooth_init, bluetooth_exit)
+               CONNMAN_PLUGIN_PRIORITY_DEFAULT, bluetooth_init, bluetooth_exit)

diff --git a/plugins/dhclient.c b/plugins/dhclient.c
index cb0e875..7e5e6d0 100644 (file)
--- a/plugins/dhclient.c
+++ b/plugins/dhclient.c
@@ -364,4 +364,4 @@ static void dhclient_exit(void)
 }
 
 CONNMAN_PLUGIN_DEFINE(dhclient, "ISC DHCP client plugin", VERSION,
-                                               dhclient_init, dhclient_exit)
+               CONNMAN_PLUGIN_PRIORITY_DEFAULT, dhclient_init, dhclient_exit)

diff --git a/plugins/dnsproxy.c b/plugins/dnsproxy.c
index c97553d..ee65f03 100644 (file)
--- a/plugins/dnsproxy.c
+++ b/plugins/dnsproxy.c
@@ -383,4 +383,4 @@ static void dnsproxy_exit(void)
 }
 
 CONNMAN_PLUGIN_DEFINE(dnsproxy, "DNS proxy resolver plugin", VERSION,
-                                               dnsproxy_init, dnsproxy_exit)
+                CONNMAN_PLUGIN_PRIORITY_DEFAULT, dnsproxy_init, dnsproxy_exit)

diff --git a/plugins/ethernet.c b/plugins/ethernet.c
index 4ef163c..79ddf2b 100644 (file)
--- a/plugins/ethernet.c
+++ b/plugins/ethernet.c
@@ -150,4 +150,4 @@ static void ethernet_exit(void)
 }
 
 CONNMAN_PLUGIN_DEFINE(ethernet, "Ethernet interface plugin", VERSION,
-                                               ethernet_init, ethernet_exit)
+               CONNMAN_PLUGIN_PRIORITY_DEFAULT, ethernet_init, ethernet_exit)

diff --git a/plugins/fake.c b/plugins/fake.c
index 4f57837..8a271be 100644 (file)
--- a/plugins/fake.c
+++ b/plugins/fake.c
@@ -106,4 +106,5 @@ static void fake_exit(void)
        connman_device_driver_unregister(&device_driver);
 }
 
-CONNMAN_PLUGIN_DEFINE(fake, "Tesing plugin", VERSION, fake_init, fake_exit)
+CONNMAN_PLUGIN_DEFINE(fake, "Tesing plugin", VERSION,
+               CONNMAN_PLUGIN_PRIORITY_DEFAULT, fake_init, fake_exit)

diff --git a/plugins/hso.c b/plugins/hso.c
index 9489cf1..21df00d 100644 (file)
--- a/plugins/hso.c
+++ b/plugins/hso.c
@@ -243,4 +243,4 @@ static void hso_exit(void)
 }
 
 CONNMAN_PLUGIN_DEFINE(hso, "Option HSO device plugin", VERSION,
-                                               hso_init, hso_exit)
+               CONNMAN_PLUGIN_PRIORITY_DEFAULT, hso_init, hso_exit)

diff --git a/plugins/huawei.c b/plugins/huawei.c
index c165aea..c1a2c0d 100644 (file)
--- a/plugins/huawei.c
+++ b/plugins/huawei.c
@@ -80,4 +80,4 @@ static void huawei_exit(void)
 }
 
 CONNMAN_PLUGIN_DEFINE(huawei, "HUAWEI Mobile device plugin", VERSION,
-                                               huawei_init, huawei_exit)
+               CONNMAN_PLUGIN_PRIORITY_DEFAULT, huawei_init, huawei_exit)

diff --git a/plugins/loopback.c b/plugins/loopback.c
index c0a8f3b..7607eea 100644 (file)
--- a/plugins/loopback.c
+++ b/plugins/loopback.c
@@ -106,4 +106,4 @@ static void loopback_exit(void)
 }
 
 CONNMAN_PLUGIN_DEFINE(loopback, "Loopback device plugin", VERSION,
-                                               loopback_init, loopback_exit)
+               CONNMAN_PLUGIN_PRIORITY_HIGH, loopback_init, loopback_exit)

diff --git a/plugins/novatel.c b/plugins/novatel.c
index b1d7bb4..4c0c9aa 100644 (file)
--- a/plugins/novatel.c
+++ b/plugins/novatel.c
@@ -80,4 +80,4 @@ static void novatel_exit(void)
 }
 
 CONNMAN_PLUGIN_DEFINE(novatel, "Novatel Wireless device plugin", VERSION,
-                                               novatel_init, novatel_exit)
+               CONNMAN_PLUGIN_PRIORITY_DEFAULT, novatel_init, novatel_exit)

diff --git a/plugins/ospm.c b/plugins/ospm.c
index 87f18c6..7d2ebf5 100644 (file)
--- a/plugins/ospm.c
+++ b/plugins/ospm.c
@@ -37,4 +37,4 @@ static void ospm_exit(void)
 }
 
 CONNMAN_PLUGIN_DEFINE(ospm, "OSPM notification plugin", VERSION,
-                                                       ospm_init, ospm_exit)
+               CONNMAN_PLUGIN_PRIORITY_DEFAULT, ospm_init, ospm_exit)

diff --git a/plugins/polkit.c b/plugins/polkit.c
index 247721e..16dd9d5 100644 (file)
--- a/plugins/polkit.c
+++ b/plugins/polkit.c
@@ -176,4 +176,4 @@ static void polkit_exit(void)
 }
 
 CONNMAN_PLUGIN_DEFINE(polkit, "PolicyKit authorization plugin", VERSION,
-                                               polkit_init, polkit_exit)
+               CONNMAN_PLUGIN_PRIORITY_DEFAULT, polkit_init, polkit_exit)

diff --git a/plugins/pppd.c b/plugins/pppd.c
index 3cd65bf..bd026b9 100644 (file)
--- a/plugins/pppd.c
+++ b/plugins/pppd.c
@@ -58,4 +58,4 @@ static void pppd_exit(void)
 }
 
 CONNMAN_PLUGIN_DEFINE(pppd, "Point-to-point protocol plugin", VERSION,
-                                                       pppd_init, pppd_exit)
+               CONNMAN_PLUGIN_PRIORITY_DEFAULT, pppd_init, pppd_exit)

diff --git a/plugins/resolvconf.c b/plugins/resolvconf.c
index d59fc5e..df3a834 100644 (file)
--- a/plugins/resolvconf.c
+++ b/plugins/resolvconf.c
@@ -94,4 +94,4 @@ static void resolvconf_exit(void)
 }
 
 CONNMAN_PLUGIN_DEFINE(resolvconf, "Name resolver plugin", VERSION,
-                                       resolvconf_init, resolvconf_exit)
+               CONNMAN_PLUGIN_PRIORITY_DEFAULT, resolvconf_init, resolvconf_exit)

diff --git a/plugins/udhcp.c b/plugins/udhcp.c
index f58f833..36ea23f 100644 (file)
--- a/plugins/udhcp.c
+++ b/plugins/udhcp.c
@@ -212,4 +212,4 @@ static void udhcp_exit(void)
 }
 
 CONNMAN_PLUGIN_DEFINE(udhcp, "uDHCP client plugin", VERSION,
-                                               udhcp_init, udhcp_exit)
+               CONNMAN_PLUGIN_PRIORITY_DEFAULT, udhcp_init, udhcp_exit)

diff --git a/plugins/wifi.c b/plugins/wifi.c
index 92e5787..a86b00e 100644 (file)
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -189,4 +189,4 @@ static void wifi_exit(void)
 }
 
 CONNMAN_PLUGIN_DEFINE(wifi, "WiFi interface plugin", VERSION,
-                                                       wifi_init, wifi_exit)
+               CONNMAN_PLUGIN_PRIORITY_DEFAULT, wifi_init, wifi_exit)

diff --git a/plugins/wimax.c b/plugins/wimax.c
index e008dc9..1509e74 100644 (file)
--- a/plugins/wimax.c
+++ b/plugins/wimax.c
@@ -74,4 +74,4 @@ static void wimax_exit(void)
 }
 
 CONNMAN_PLUGIN_DEFINE(wimax, "WiMAX interface plugin", VERSION,
-                                               wimax_init, wimax_exit)
+               CONNMAN_PLUGIN_PRIORITY_DEFAULT, wimax_init, wimax_exit)