dhcpv6: Renew message implemented.

[framework/connectivity/connman.git] / gdhcp / client.c

diff --git a/gdhcp/client.c b/gdhcp/client.c
index 425f1cb..a1f0309 100644 (file)
--- a/gdhcp/client.c
+++ b/gdhcp/client.c
@@ -71,6 +71,8 @@ typedef enum _dhcp_client_state {
        IPV4LL_DEFEND,
        INFORMATION_REQ,
        SOLICITATION,
+       REQUEST,
+       RENEW,
 } ClientState;
 
 struct _GDHCPClient {
@@ -117,6 +119,10 @@ struct _GDHCPClient {
        gpointer solicitation_data;
        GDHCPClientEventFunc advertise_cb;
        gpointer advertise_data;
+       GDHCPClientEventFunc request_cb;
+       gpointer request_data;
+       GDHCPClientEventFunc renew_cb;
+       gpointer renew_data;
        char *last_address;
        unsigned char *duid;
        int duid_len;
@@ -127,6 +133,7 @@ struct _GDHCPClient {
        uint32_t T1, T2;
        struct in6_addr ia_na;
        struct in6_addr ia_ta;
+       time_t last_renew;
 };
 
 static inline void debug(GDHCPClient *client, const char *format, ...)
@@ -615,7 +622,7 @@ void g_dhcpv6_client_create_iaid(GDHCPClient *dhcp_client, int index,
 }
 
 int g_dhcpv6_client_get_timeouts(GDHCPClient *dhcp_client,
-                               uint32_t *T1, uint32_t *T2)
+                               uint32_t *T1, uint32_t *T2, time_t *last_renew)
 {
        if (dhcp_client == NULL || dhcp_client->type == G_DHCP_IPV4)
                return -EINVAL;
@@ -626,6 +633,9 @@ int g_dhcpv6_client_get_timeouts(GDHCPClient *dhcp_client,
        if (T2 != NULL)
                *T2 = dhcp_client->T2;
 
+       if (last_renew != NULL)
+               *last_renew = dhcp_client->last_renew;
+
        return 0;
 }
 
@@ -779,6 +789,16 @@ static int send_solicitation(GDHCPClient *dhcp_client)
        return send_dhcpv6_msg(dhcp_client, DHCPV6_SOLICIT, "solicit");
 }
 
+static int send_dhcpv6_request(GDHCPClient *dhcp_client)
+{
+       return send_dhcpv6_msg(dhcp_client, DHCPV6_REQUEST, "request");
+}
+
+static int send_dhcpv6_renew(GDHCPClient *dhcp_client)
+{
+       return send_dhcpv6_msg(dhcp_client, DHCPV6_RENEW, "renew");
+}
+
 static int send_information_req(GDHCPClient *dhcp_client)
 {
        return send_dhcpv6_msg(dhcp_client, DHCPV6_INFORMATION_REQ,
@@ -850,6 +870,7 @@ GDHCPClient *g_dhcp_client_new(GDHCPType type,
        dhcp_client->require_list = NULL;
        dhcp_client->duid = NULL;
        dhcp_client->duid_len = 0;
+       dhcp_client->last_renew = time(0);
 
        *error = G_DHCP_CLIENT_ERROR_NONE;
 
@@ -1957,6 +1978,8 @@ static gboolean listener_event(GIOChannel *channel, GIOCondition condition,
                }
                break;
        case INFORMATION_REQ:
+       case REQUEST:
+       case RENEW:
                if (dhcp_client->type != G_DHCP_IPV6)
                        return TRUE;
 
@@ -1967,7 +1990,10 @@ static gboolean listener_event(GIOChannel *channel, GIOCondition condition,
                option_len = 0;
                server_id = dhcpv6_get_option(packet6, pkt_len,
                                G_DHCPV6_SERVERID, &option_len, &count);
-               if (server_id == NULL || count != 1 || option_len == 0) {
+               if (server_id == NULL || count != 1 || option_len == 0 ||
+                               (dhcp_client->server_duid_len > 0 &&
+                               memcmp(dhcp_client->server_duid, server_id,
+                                       dhcp_client->server_duid_len) != 0)) {
                        /* RFC 3315, 15.10 */
                        debug(dhcp_client,
                                "server duid error, discarding msg %p/%d/%d",
@@ -1990,6 +2016,16 @@ static gboolean listener_event(GIOChannel *channel, GIOCondition condition,
                                        dhcp_client->information_req_data);
                        return TRUE;
                }
+               if (dhcp_client->request_cb != NULL) {
+                       dhcp_client->request_cb(dhcp_client,
+                                       dhcp_client->request_data);
+                       return TRUE;
+               }
+               if (dhcp_client->renew_cb != NULL) {
+                       dhcp_client->renew_cb(dhcp_client,
+                                       dhcp_client->renew_data);
+                       return TRUE;
+               }
                break;
        default:
                break;
@@ -2103,6 +2139,26 @@ int g_dhcp_client_start(GDHCPClient *dhcp_client, const char *last_address)
                                return re;
                        }
                        send_solicitation(dhcp_client);
+
+               } else if (dhcp_client->request_cb) {
+                       dhcp_client->state = REQUEST;
+                       re = switch_listening_mode(dhcp_client, L3);
+                       if (re != 0) {
+                               switch_listening_mode(dhcp_client, L_NONE);
+                               dhcp_client->state = 0;
+                               return re;
+                       }
+                       send_dhcpv6_request(dhcp_client);
+
+               } else if (dhcp_client->renew_cb) {
+                       dhcp_client->state = RENEW;
+                       re = switch_listening_mode(dhcp_client, L3);
+                       if (re != 0) {
+                               switch_listening_mode(dhcp_client, L_NONE);
+                               dhcp_client->state = 0;
+                               return re;
+                       }
+                       send_dhcpv6_renew(dhcp_client);
                }
 
                return 0;
@@ -2235,6 +2291,18 @@ void g_dhcp_client_register_event(GDHCPClient *dhcp_client,
                dhcp_client->advertise_cb = func;
                dhcp_client->advertise_data = data;
                return;
+       case G_DHCP_CLIENT_EVENT_REQUEST:
+               if (dhcp_client->type == G_DHCP_IPV4)
+                       return;
+               dhcp_client->request_cb = func;
+               dhcp_client->request_data = data;
+               return;
+       case G_DHCP_CLIENT_EVENT_RENEW:
+               if (dhcp_client->type == G_DHCP_IPV4)
+                       return;
+               dhcp_client->renew_cb = func;
+               dhcp_client->renew_data = data;
+               return;
        }
 }
 
@@ -2272,6 +2340,8 @@ char *g_dhcp_client_get_netmask(GDHCPClient *dhcp_client)
        case IPV4LL_ANNOUNCE:
        case INFORMATION_REQ:
        case SOLICITATION:
+       case REQUEST:
+       case RENEW:
                break;
        }
        return NULL;
@@ -2368,6 +2438,14 @@ void g_dhcpv6_client_set_send(GDHCPClient *dhcp_client,
        }
 }
 
+void g_dhcpv6_client_reset_renew(GDHCPClient *dhcp_client)
+{
+       if (dhcp_client == NULL || dhcp_client->type == G_DHCP_IPV4)
+               return;
+
+       dhcp_client->last_renew = time(0);
+}
+
 uint16_t g_dhcpv6_client_get_status(GDHCPClient *dhcp_client)
 {
        if (dhcp_client == NULL || dhcp_client->type == G_DHCP_IPV4)