dhcpv6: Release message implemented.

[platform/upstream/connman.git] / gdhcp / client.c

diff --git a/gdhcp/client.c b/gdhcp/client.c
index cd428cf..99f9951 100644 (file)
--- a/gdhcp/client.c
+++ b/gdhcp/client.c
@@ -74,6 +74,7 @@ typedef enum _dhcp_client_state {
        REQUEST,
        RENEW,
        REBIND,
+       RELEASE,
 } ClientState;
 
 struct _GDHCPClient {
@@ -126,6 +127,8 @@ struct _GDHCPClient {
        gpointer renew_data;
        GDHCPClientEventFunc rebind_cb;
        gpointer rebind_data;
+       GDHCPClientEventFunc release_cb;
+       gpointer release_data;
        char *last_address;
        unsigned char *duid;
        int duid_len;
@@ -138,6 +141,7 @@ struct _GDHCPClient {
        struct in6_addr ia_ta;
        time_t last_renew;
        time_t last_rebind;
+       time_t expire;
 };
 
 static inline void debug(GDHCPClient *client, const char *format, ...)
@@ -627,7 +631,8 @@ 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,
-                               time_t *last_renew, time_t *last_rebind)
+                               time_t *last_renew, time_t *last_rebind,
+                               time_t *expire)
 {
        if (dhcp_client == NULL || dhcp_client->type == G_DHCP_IPV4)
                return -EINVAL;
@@ -644,6 +649,9 @@ int g_dhcpv6_client_get_timeouts(GDHCPClient *dhcp_client,
        if (last_rebind != NULL)
                *last_rebind = dhcp_client->last_rebind;
 
+       if (expire != NULL)
+               *expire = dhcp_client->expire;
+
        return 0;
 }
 
@@ -812,6 +820,11 @@ static int send_dhcpv6_rebind(GDHCPClient *dhcp_client)
        return send_dhcpv6_msg(dhcp_client, DHCPV6_REBIND, "rebind");
 }
 
+static int send_dhcpv6_release(GDHCPClient *dhcp_client)
+{
+       return send_dhcpv6_msg(dhcp_client, DHCPV6_RELEASE, "release");
+}
+
 static int send_information_req(GDHCPClient *dhcp_client)
 {
        return send_dhcpv6_msg(dhcp_client, DHCPV6_INFORMATION_REQ,
@@ -884,6 +897,7 @@ GDHCPClient *g_dhcp_client_new(GDHCPType type,
        dhcp_client->duid = NULL;
        dhcp_client->duid_len = 0;
        dhcp_client->last_renew = dhcp_client->last_rebind = time(0);
+       dhcp_client->expire = 0;
 
        *error = G_DHCP_CLIENT_ERROR_NONE;
 
@@ -1656,6 +1670,8 @@ static GList *get_addresses(GDHCPClient *dhcp_client,
                else
                        memcpy(&dhcp_client->ia_ta, &addr,
                                                sizeof(struct in6_addr));
+
+               g_dhcpv6_client_set_expire(dhcp_client, valid);
        }
 
        return list;
@@ -1994,6 +2010,7 @@ static gboolean listener_event(GIOChannel *channel, GIOCondition condition,
        case REQUEST:
        case RENEW:
        case REBIND:
+       case RELEASE:
                if (dhcp_client->type != G_DHCP_IPV6)
                        return TRUE;
 
@@ -2045,6 +2062,11 @@ static gboolean listener_event(GIOChannel *channel, GIOCondition condition,
                                        dhcp_client->rebind_data);
                        return TRUE;
                }
+               if (dhcp_client->release_cb != NULL) {
+                       dhcp_client->release_cb(dhcp_client,
+                                       dhcp_client->release_data);
+                       return TRUE;
+               }
                break;
        default:
                break;
@@ -2188,6 +2210,16 @@ int g_dhcp_client_start(GDHCPClient *dhcp_client, const char *last_address)
                                return re;
                        }
                        send_dhcpv6_rebind(dhcp_client);
+
+               } else if (dhcp_client->release_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_release(dhcp_client);
                }
 
                return 0;
@@ -2338,6 +2370,12 @@ void g_dhcp_client_register_event(GDHCPClient *dhcp_client,
                dhcp_client->rebind_cb = func;
                dhcp_client->rebind_data = data;
                return;
+       case G_DHCP_CLIENT_EVENT_RELEASE:
+               if (dhcp_client->type == G_DHCP_IPV4)
+                       return;
+               dhcp_client->release_cb = func;
+               dhcp_client->release_data = data;
+               return;
        }
 }
 
@@ -2378,6 +2416,7 @@ char *g_dhcp_client_get_netmask(GDHCPClient *dhcp_client)
        case REQUEST:
        case RENEW:
        case REBIND:
+       case RELEASE:
                break;
        }
        return NULL;
@@ -2490,6 +2529,14 @@ void g_dhcpv6_client_reset_rebind(GDHCPClient *dhcp_client)
        dhcp_client->last_rebind = time(0);
 }
 
+void g_dhcpv6_client_set_expire(GDHCPClient *dhcp_client, uint32_t timeout)
+{
+       if (dhcp_client == NULL || dhcp_client->type == G_DHCP_IPV4)
+               return;
+
+       dhcp_client->expire = time(0) + timeout;
+}
+
 uint16_t g_dhcpv6_client_get_status(GDHCPClient *dhcp_client)
 {
        if (dhcp_client == NULL || dhcp_client->type == G_DHCP_IPV4)