char *ifname;
};
+static void dhclient_unlink(const char *ifname)
+{
+ char *pathname;
+
+ pathname = g_strdup_printf("%s/dhclient.%s.pid",
+ STATEDIR, ifname);
+ unlink(pathname);
+ g_free(pathname);
+
+ pathname = g_strdup_printf("%s/dhclient.%s.leases",
+ STATEDIR, ifname);
+ unlink(pathname);
+ g_free(pathname);
+}
+
static void dhclient_died(struct connman_task *task, void *user_data)
{
struct dhclient_data *dhclient = user_data;
+ connman_dhcp_set_data(dhclient->dhcp, NULL);
+
connman_dhcp_unref(dhclient->dhcp);
connman_task_destroy(dhclient->task);
dhclient->task = NULL;
+ dhclient_unlink(dhclient->ifname);
+
g_free(dhclient->ifname);
g_free(dhclient);
}
static void dhclient_setup(struct connman_task *task, const char *ifname)
{
const char *path, *intf = "org.moblin.connman.Task";
- const char *hostname;
path = connman_task_get_path(task);
STATEDIR, ifname);
connman_task_add_argument(task, "-cf", "%s/dhclient.conf", SCRIPTDIR);
connman_task_add_argument(task, "-sf", "%s/dhclient-script", SCRIPTDIR);
-
- hostname = connman_utsname_get_hostname();
- if (hostname != NULL)
- connman_task_add_argument(task, "-H", hostname);
-
connman_task_add_argument(task, ifname, NULL);
connman_task_add_argument(task, "-n", NULL);
}
-static void dhclient_unlink(const char *ifname)
-{
- char *pathname;
-
- pathname = g_strdup_printf("%s/dhclient.%s.pid",
- STATEDIR, ifname);
- unlink(pathname);
- g_free(pathname);
-
- pathname = g_strdup_printf("%s/dhclient.%s.leases",
- STATEDIR, ifname);
- unlink(pathname);
- g_free(pathname);
-}
-
static int dhclient_request(struct connman_dhcp *dhcp)
{
struct dhclient_data *dhclient;
DBG("dhcp %p", dhcp);
- if (dhclient->task != NULL)
- connman_task_stop(dhclient->task);
+ if (dhclient == NULL)
+ return -ESRCH;
- dhclient_unlink(dhclient->ifname);
+ connman_task_stop(dhclient->task);
return 0;
}
static struct connman_dhcp_driver dhclient_driver = {
.name = "dhclient",
+ .priority = CONNMAN_DHCP_PRIORITY_LOW,
.request = dhclient_request,
.release = dhclient_release,
};