Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d157870 authored by TK MUN's avatar TK MUN Committed by Irfan Sheriff
Browse files

Add per interface dhcp client support 



Added when using dhcp on both wimax and wifi. But should be useful across multiple
services running dhcp now. Also adds a renewal api

Change-Id: Ic850a612dd429cd675b5b0224ff58895f9d8e4d9
Signed-off-by: default avatarTK MUN <tk.mun@samsung.com>
parent e31f2cdd

libnetutils/dhcp_utils.c

+81 −7
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ static const char HOSTNAME_PROP_NAME[] = "net.hostname"; 
static const char DHCP_PROP_NAME_PREFIX[]  = "dhcp";

static const int NAP_TIME = 200;   /* wait for 200ms at a time */

                                  /* when polling for property values */

static const char DAEMON_NAME_RENEW[]  = "iprenew";

static char errmsg[100];



/*
@@ -138,6 +139,7 @@ int dhcp_do_request(const char *interface, 
                    uint32_t  *lease)

{

    char result_prop_name[PROPERTY_KEY_MAX];

    char daemon_prop_name[PROPERTY_KEY_MAX];

    char prop_value[PROPERTY_VALUE_MAX] = {'\0'};

    char daemon_cmd[PROPERTY_VALUE_MAX * 2];

    const char *ctrl_prop = "ctl.start";
@@ -146,18 +148,23 @@ int dhcp_do_request(const char *interface, 
    snprintf(result_prop_name, sizeof(result_prop_name), "%s.%s.result",

            DHCP_PROP_NAME_PREFIX,

            interface);



    snprintf(daemon_prop_name, sizeof(daemon_prop_name), "%s_%s",

            DAEMON_PROP_NAME,

            interface);



    /* Erase any previous setting of the dhcp result property */

    property_set(result_prop_name, "");



    /* Start the daemon and wait until it's ready */

    if (property_get(HOSTNAME_PROP_NAME, prop_value, NULL) && (prop_value[0] != '\0'))

        snprintf(daemon_cmd, sizeof(daemon_cmd), "%s:-h %s %s", DAEMON_NAME,

        snprintf(daemon_cmd, sizeof(daemon_cmd), "%s_%s:-h %s %s", DAEMON_NAME, interface,

                 prop_value, interface);

    else

        snprintf(daemon_cmd, sizeof(daemon_cmd), "%s:%s", DAEMON_NAME, interface);

        snprintf(daemon_cmd, sizeof(daemon_cmd), "%s_%s:%s", DAEMON_NAME, interface, interface);

    memset(prop_value, '\0', PROPERTY_VALUE_MAX);

    property_set(ctrl_prop, daemon_cmd);

    if (wait_for_property(DAEMON_PROP_NAME, desired_status, 10) < 0) {

    if (wait_for_property(daemon_prop_name, desired_status, 10) < 0) {

        snprintf(errmsg, sizeof(errmsg), "%s", "Timed out waiting for dhcpcd to start");

        return -1;

    }
@@ -199,15 +206,24 @@ int dhcp_do_request(const char *interface, 
int dhcp_stop(const char *interface)

{

    char result_prop_name[PROPERTY_KEY_MAX];

    char daemon_prop_name[PROPERTY_KEY_MAX];

    char daemon_cmd[PROPERTY_VALUE_MAX * 2];

    const char *ctrl_prop = "ctl.stop";

    const char *desired_status = "stopped";



    snprintf(result_prop_name, sizeof(result_prop_name), "%s.%s.result",

            DHCP_PROP_NAME_PREFIX,

            interface);



    snprintf(daemon_prop_name, sizeof(daemon_prop_name), "%s_%s",

            DAEMON_PROP_NAME,

            interface);



    snprintf(daemon_cmd, sizeof(daemon_cmd), "%s_%s", DAEMON_NAME, interface);



    /* Stop the daemon and wait until it's reported to be stopped */

    property_set(ctrl_prop, DAEMON_NAME);

    if (wait_for_property(DAEMON_PROP_NAME, desired_status, 5) < 0) {

    property_set(ctrl_prop, daemon_cmd);

    if (wait_for_property(daemon_prop_name, desired_status, 5) < 0) {

        return -1;

    }

    property_set(result_prop_name, "failed");
@@ -219,12 +235,20 @@ int dhcp_stop(const char *interface) 
 */

int dhcp_release_lease(const char *interface)

{

    char daemon_prop_name[PROPERTY_KEY_MAX];

    char daemon_cmd[PROPERTY_VALUE_MAX * 2];

    const char *ctrl_prop = "ctl.stop";

    const char *desired_status = "stopped";



    snprintf(daemon_prop_name, sizeof(daemon_prop_name), "%s_%s",

            DAEMON_PROP_NAME,

            interface);



    snprintf(daemon_cmd, sizeof(daemon_cmd), "%s_%s", DAEMON_NAME, interface);



    /* Stop the daemon and wait until it's reported to be stopped */

    property_set(ctrl_prop, DAEMON_NAME);

    if (wait_for_property(DAEMON_PROP_NAME, desired_status, 5) < 0) {

    property_set(ctrl_prop, daemon_cmd);

    if (wait_for_property(daemon_prop_name, desired_status, 5) < 0) {

        return -1;

    }

    return 0;
@@ -233,3 +257,53 @@ int dhcp_release_lease(const char *interface) 
char *dhcp_get_errmsg() {

    return errmsg;

}



/**

 * Run WiMAX dhcp renew service.

 * "wimax_renew" service shoud be included in init.rc.

 */

int dhcp_do_request_renew(const char *interface,

                    in_addr_t *ipaddr,

                    in_addr_t *gateway,

                    in_addr_t *mask,

                    in_addr_t *dns1,

                    in_addr_t *dns2,

                    in_addr_t *server,

                    uint32_t  *lease)

{

    char result_prop_name[PROPERTY_KEY_MAX];

    char prop_value[PROPERTY_VALUE_MAX] = {'\0'};

    char daemon_cmd[PROPERTY_VALUE_MAX * 2];

    const char *ctrl_prop = "ctl.start";



    snprintf(result_prop_name, sizeof(result_prop_name), "%s.%s.result",

            DHCP_PROP_NAME_PREFIX,

            interface);



    /* Erase any previous setting of the dhcp result property */

    property_set(result_prop_name, "");



    /* Start the renew daemon and wait until it's ready */

    snprintf(daemon_cmd, sizeof(daemon_cmd), "%s_%s:%s", DAEMON_NAME_RENEW, interface, interface);

    memset(prop_value, '\0', PROPERTY_VALUE_MAX);

    property_set(ctrl_prop, daemon_cmd);



    /* Wait for the daemon to return a result */

    if (wait_for_property(result_prop_name, NULL, 30) < 0) {

        snprintf(errmsg, sizeof(errmsg), "%s", "Timed out waiting for DHCP Renew to finish");

        return -1;

    }



    if (!property_get(result_prop_name, prop_value, NULL)) {

        /* shouldn't ever happen, given the success of wait_for_property() */

        snprintf(errmsg, sizeof(errmsg), "%s", "DHCP Renew result property was not set");

        return -1;

    }

    if (strcmp(prop_value, "ok") == 0) {

        fill_ip_info(interface, ipaddr, gateway, mask, dns1, dns2, server, lease);

        return 0;

    } else {

        snprintf(errmsg, sizeof(errmsg), "DHCP Renew result was %s", prop_value);

        return -1;

    }

}