include dhcp-client-identifier in the DHCP request

diff --git a/src/libcharon/plugins/dhcp/dhcp_socket.c b/src/libcharon/plugins/dhcp/dhcp_socket.c
index f5bfe2a60de65ec50835bf77b835a2d7a2772d4b..f61b3a60e616bceaf23dd6bc8f2a5024b4a4ac8c 100644 (file)
--- a/src/libcharon/plugins/dhcp/dhcp_socket.c
+++ b/src/libcharon/plugins/dhcp/dhcp_socket.c
@@ -130,6 +130,7 @@ typedef enum {
        DHCP_MESSAGE_TYPE = 53,
        DHCP_SERVER_ID = 54,
        DHCP_PARAM_REQ_LIST = 55,
+       DHCP_CLIENT_ID = 61,
        DHCP_OPTEND = 255,
 } dhcp_option_type_t;
 
@@ -238,8 +239,17 @@ static int prepare_dhcp(private_dhcp_socket_t *this,
        option->data[0] = type;
        optlen += sizeof(dhcp_option_t) + option->len;
 
+       if (identity->get_type(identity) == ID_FQDN)
+       {
+               option = (dhcp_option_t*)&dhcp->options[optlen];
+               option->type = DHCP_HOST_NAME;
+               option->len = min(chunk.len, 64);
+               memcpy(option->data, chunk.ptr, option->len);
+               optlen += sizeof(dhcp_option_t) + option->len;
+       }
+
        option = (dhcp_option_t*)&dhcp->options[optlen];
-       option->type = DHCP_HOST_NAME;
+       option->type = DHCP_CLIENT_ID;
        option->len = min(chunk.len, 64);
        memcpy(option->data, chunk.ptr, option->len);
        optlen += sizeof(dhcp_option_t) + option->len;