X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gdhcp%2Fclient.c;h=ec1b2a2cd80497bcf2b53dcf78fc3594d7bfa7f7;hb=99cf044b1796c0698e58d6bb1f1647521a029e8e;hp=99f9951011f5da1cdd8a1b206c516245ab93880b;hpb=53f38ce0bc6505c8b8a7342b0243df442b7db5a4;p=platform%2Fupstream%2Fconnman.git diff --git a/gdhcp/client.c b/gdhcp/client.c index 99f9951..ec1b2a2 100644 --- a/gdhcp/client.c +++ b/gdhcp/client.c @@ -2,7 +2,7 @@ * * DHCP client library with GLib integration * - * Copyright (C) 2009-2011 Intel Corporation. All rights reserved. + * Copyright (C) 2009-2012 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -88,6 +88,7 @@ struct _GDHCPClient { uint32_t server_ip; uint32_t requested_ip; char *assigned_ip; + time_t start; uint32_t lease_seconds; ListenMode listen_mode; int listener_sockfd; @@ -339,6 +340,17 @@ static void add_send_options(GDHCPClient *dhcp_client, add_binary_option, packet); } +/* + * Return an RFC 951- and 2131-complaint BOOTP 'secs' value that + * represents the number of seconds elapsed from the start of + * attempting DHCP to satisfy some DHCP servers that allow for an + * "authoritative" reply before responding. + */ +static uint16_t dhcp_attempt_secs(GDHCPClient *dhcp_client) +{ + return htons(MIN(time(NULL) - dhcp_client->start, UINT16_MAX)); +} + static int send_discover(GDHCPClient *dhcp_client, uint32_t requested) { struct dhcp_packet packet; @@ -348,6 +360,7 @@ static int send_discover(GDHCPClient *dhcp_client, uint32_t requested) init_packet(dhcp_client, &packet, DHCPDISCOVER); packet.xid = dhcp_client->xid; + packet.secs = dhcp_attempt_secs(dhcp_client); if (requested) dhcp_add_simple_option(&packet, DHCP_REQUESTED_IP, requested); @@ -374,6 +387,7 @@ static int send_select(GDHCPClient *dhcp_client) init_packet(dhcp_client, &packet, DHCPREQUEST); packet.xid = dhcp_client->xid; + packet.secs = dhcp_attempt_secs(dhcp_client); dhcp_add_simple_option(&packet, DHCP_REQUESTED_IP, dhcp_client->requested_ip); @@ -570,7 +584,7 @@ int g_dhcpv6_create_duid(GDHCPDuidType duid_type, int index, int type, get_interface_mac_address(index, &(*duid)[2 + 2 + 4]); (*duid)[2] = 0; (*duid)[3] = type; - duid_time = time(0) - DUID_TIME_EPOCH; + duid_time = time(NULL) - DUID_TIME_EPOCH; (*duid)[4] = duid_time >> 24; (*duid)[5] = duid_time >> 16; (*duid)[6] = duid_time >> 8; @@ -896,7 +910,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 = dhcp_client->last_rebind = time(0); + dhcp_client->last_renew = dhcp_client->last_rebind = time(NULL); dhcp_client->expire = 0; *error = G_DHCP_CLIENT_ERROR_NONE; @@ -1112,7 +1126,6 @@ static int ipv4ll_recv_arp_packet(GDHCPClient *dhcp_client) int target_conflict; memset(&arp, 0, sizeof(arp)); - bytes = 0; bytes = read(dhcp_client->listener_sockfd, &arp, sizeof(arp)); if (bytes < 0) return bytes; @@ -1582,6 +1595,9 @@ static GList *get_addresses(GDHCPClient *dhcp_client, uint8_t *option; char *str; + if (value == NULL || len < 4) + return NULL; + iaid = get_uint32(&value[0]); if (dhcp_client->iaid != iaid) return NULL; @@ -1686,6 +1702,9 @@ static GList *get_dhcpv6_option_value_list(GDHCPClient *dhcp_client, char *str; int i; + if (value == NULL) + return NULL; + switch (code) { case G_DHCPV6_DNS_SERVERS: /* RFC 3646, chapter 3 */ case G_DHCPV6_SNTP_SERVERS: /* RFC 4075, chapter 4 */ @@ -1833,7 +1852,7 @@ static gboolean listener_event(GIOChannel *channel, GIOCondition condition, re = dhcp_recv_l3_packet(&packet, dhcp_client->listener_sockfd); } else if (dhcp_client->listen_mode == L_ARP) { - re = ipv4ll_recv_arp_packet(dhcp_client); + ipv4ll_recv_arp_packet(dhcp_client); return TRUE; } else @@ -1846,6 +1865,9 @@ static gboolean listener_event(GIOChannel *channel, GIOCondition condition, return TRUE; if (dhcp_client->type == G_DHCP_IPV6) { + if (packet6 == NULL) + return TRUE; + count = 0; client_id = dhcpv6_get_option(packet6, pkt_len, G_DHCPV6_CLIENTID, &option_len, &count); @@ -1878,8 +1900,11 @@ static gboolean listener_event(GIOChannel *channel, GIOCondition condition, } else dhcp_client->status_code = 0; - } else + } else { message_type = dhcp_get_option(&packet, DHCP_MESSAGE_TYPE); + if (message_type == NULL) + return TRUE; + } if (message_type == NULL && client_id == NULL) /* No message type / client id option, ignore package */ @@ -2240,6 +2265,7 @@ int g_dhcp_client_start(GDHCPClient *dhcp_client, const char *last_address) return re; dhcp_client->xid = rand(); + dhcp_client->start = time(NULL); } if (last_address == NULL) { @@ -2445,19 +2471,53 @@ void g_dhcp_client_clear_values(GDHCPClient *dhcp_client) g_hash_table_remove_all(dhcp_client->send_value_hash); } -static uint8_t *alloc_dhcp_option(int code, const char *str, int extra) +static uint8_t *alloc_dhcp_option(int code, const uint8_t *data, unsigned size) { uint8_t *storage; - int len = strnlen(str, 255); - storage = malloc(len + extra + OPT_DATA); + storage = g_try_malloc(size + OPT_DATA); + if (storage == NULL) + return NULL; + storage[OPT_CODE] = code; - storage[OPT_LEN] = len + extra; - memcpy(storage + extra + OPT_DATA, str, len); + storage[OPT_LEN] = size; + memcpy(&storage[OPT_DATA], data, size); return storage; } +static uint8_t *alloc_dhcp_data_option(int code, const uint8_t *data, unsigned size) +{ + return alloc_dhcp_option(code, data, MIN(size, 255)); +} + +static uint8_t *alloc_dhcp_string_option(int code, const char *str) +{ + return alloc_dhcp_data_option(code, (const uint8_t *)str, strlen(str)); +} + +GDHCPClientError g_dhcp_client_set_id(GDHCPClient *dhcp_client) +{ + const unsigned maclen = 6; + const unsigned idlen = maclen + 1; + const uint8_t option_code = G_DHCP_CLIENT_ID; + uint8_t idbuf[idlen]; + uint8_t *data_option; + + idbuf[0] = ARPHRD_ETHER; + + memcpy(&idbuf[1], dhcp_client->mac_address, maclen); + + data_option = alloc_dhcp_data_option(option_code, idbuf, idlen); + if (data_option == NULL) + return G_DHCP_CLIENT_ERROR_NOMEM; + + g_hash_table_insert(dhcp_client->send_value_hash, + GINT_TO_POINTER((int) option_code), data_option); + + return G_DHCP_CLIENT_ERROR_NONE; +} + /* Now only support send hostname */ GDHCPClientError g_dhcp_client_set_send(GDHCPClient *dhcp_client, unsigned char option_code, const char *option_value) @@ -2465,8 +2525,10 @@ GDHCPClientError g_dhcp_client_set_send(GDHCPClient *dhcp_client, uint8_t *binary_option; if (option_code == G_DHCP_HOST_NAME && option_value != NULL) { - binary_option = alloc_dhcp_option(option_code, - option_value, 0); + binary_option = alloc_dhcp_string_option(option_code, + option_value); + if (binary_option == NULL) + return G_DHCP_CLIENT_ERROR_NOMEM; g_hash_table_insert(dhcp_client->send_value_hash, GINT_TO_POINTER((int) option_code), binary_option); @@ -2518,7 +2580,7 @@ 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); + dhcp_client->last_renew = time(NULL); } void g_dhcpv6_client_reset_rebind(GDHCPClient *dhcp_client) @@ -2526,7 +2588,7 @@ void g_dhcpv6_client_reset_rebind(GDHCPClient *dhcp_client) if (dhcp_client == NULL || dhcp_client->type == G_DHCP_IPV4) return; - dhcp_client->last_rebind = time(0); + dhcp_client->last_rebind = time(NULL); } void g_dhcpv6_client_set_expire(GDHCPClient *dhcp_client, uint32_t timeout) @@ -2534,7 +2596,7 @@ 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; + dhcp_client->expire = time(NULL) + timeout; } uint16_t g_dhcpv6_client_get_status(GDHCPClient *dhcp_client)