chiark / gitweb /
sd-dhcp: split out packet handling from client
[elogind.git] / src / libsystemd-dhcp / sd-dhcp-client.c
index 4038785079e55d4f6a94654cbf34a786c733e2fc..4f41b4c06ac425178e74b1df2fec1b19e0b352ac 100644 (file)
 #include "list.h"
 
 #include "dhcp-protocol.h"
+#include "dhcp-lease.h"
 #include "dhcp-internal.h"
 #include "sd-dhcp-client.h"
 
 #define DHCP_CLIENT_MIN_OPTIONS_SIZE            312
 
-#define client_state_machine_check(s, r)                                \
-        do {                                                            \
-                if (s != DHCP_STATE_BOUND &&                            \
-                    s != DHCP_STATE_RENEWING &&                         \
-                    s != DHCP_STATE_REBINDING) {                        \
-                        return (r);                                     \
-                }                                                       \
-        } while (false)
-
-struct DHCPLease {
-        uint32_t t1;
-        uint32_t t2;
-        uint32_t lifetime;
-        be32_t address;
-        be32_t server_address;
-        be32_t subnet_mask;
-        be32_t router;
-        struct in_addr *dns;
-        size_t dns_size;
-        uint16_t mtu;
-        char *domainname;
-        char *hostname;
-};
-
-typedef struct DHCPLease DHCPLease;
-
 struct sd_dhcp_client {
         DHCPState state;
         sd_event *event;
@@ -75,6 +50,7 @@ struct sd_dhcp_client {
         struct ether_addr mac_addr;
         uint32_t xid;
         usec_t start_time;
+        uint16_t secs;
         unsigned int attempt;
         usec_t request_sent;
         sd_event_source *timeout_t1;
@@ -82,7 +58,7 @@ struct sd_dhcp_client {
         sd_event_source *timeout_expire;
         sd_dhcp_client_cb_t cb;
         void *userdata;
-        DHCPLease *lease;
+        sd_dhcp_lease *lease;
 };
 
 static const uint8_t default_req_opts[] = {
@@ -171,93 +147,16 @@ int sd_dhcp_client_set_mac(sd_dhcp_client *client,
         return 0;
 }
 
-int sd_dhcp_client_get_address(sd_dhcp_client *client, struct in_addr *addr) {
-        assert_return(client, -EINVAL);
-        assert_return(addr, -EINVAL);
-
-        client_state_machine_check (client->state, -EADDRNOTAVAIL);
-
-        addr->s_addr = client->lease->address;
-
-        return 0;
-}
-
-int sd_dhcp_client_get_mtu(sd_dhcp_client *client, uint16_t *mtu) {
-        assert_return(client, -EINVAL);
-        assert_return(mtu, -EINVAL);
-
-        client_state_machine_check (client->state, -EADDRNOTAVAIL);
-
-        if (client->lease->mtu)
-                *mtu = client->lease->mtu;
-        else
-                return -ENOENT;
-
-        return 0;
-}
-
-int sd_dhcp_client_get_dns(sd_dhcp_client *client, struct in_addr **addr, size_t *addr_size) {
-        assert_return(client, -EINVAL);
-        assert_return(addr, -EINVAL);
-        assert_return(addr_size, -EINVAL);
-
-        client_state_machine_check (client->state, -EADDRNOTAVAIL);
-
-        if (client->lease->dns_size) {
-                *addr_size = client->lease->dns_size;
-                *addr = client->lease->dns;
-        } else
-                return -ENOENT;
-
-        return 0;
-}
-
-int sd_dhcp_client_get_domainname(sd_dhcp_client *client, const char **domainname) {
-        assert_return(client, -EINVAL);
-        assert_return(domainname, -EINVAL);
-
-        client_state_machine_check (client->state, -EADDRNOTAVAIL);
-
-        if (client->lease->domainname)
-                *domainname = client->lease->domainname;
-        else
-                return -ENOENT;
-
-        return 0;
-}
-
-int sd_dhcp_client_get_hostname(sd_dhcp_client *client, const char **hostname) {
+int sd_dhcp_client_get_lease(sd_dhcp_client *client, sd_dhcp_lease **ret) {
         assert_return(client, -EINVAL);
-        assert_return(hostname, -EINVAL);
-
-        client_state_machine_check (client->state, -EADDRNOTAVAIL);
-
-        if (client->lease->hostname)
-                *hostname = client->lease->hostname;
-        else
-                return -ENOENT;
-
-        return 0;
-}
-
-int sd_dhcp_client_get_router(sd_dhcp_client *client, struct in_addr *addr) {
-        assert_return(client, -EINVAL);
-        assert_return(addr, -EINVAL);
-
-        client_state_machine_check (client->state, -EADDRNOTAVAIL);
-
-        addr->s_addr = client->lease->router;
-
-        return 0;
-}
-
-int sd_dhcp_client_get_netmask(sd_dhcp_client *client, struct in_addr *addr) {
-        assert_return(client, -EINVAL);
-        assert_return(addr, -EINVAL);
+        assert_return(ret, -EINVAL);
 
-        client_state_machine_check (client->state, -EADDRNOTAVAIL);
+        if (client->state != DHCP_STATE_BOUND &&
+            client->state != DHCP_STATE_RENEWING &&
+            client->state != DHCP_STATE_REBINDING)
+                return -EADDRNOTAVAIL;
 
-        addr->s_addr = client->lease->subnet_mask;
+        *ret = sd_dhcp_lease_ref(client->lease);
 
         return 0;
 }
@@ -269,19 +168,6 @@ static int client_notify(sd_dhcp_client *client, int event) {
         return 0;
 }
 
-static void lease_free(DHCPLease *lease) {
-        if (!lease)
-                return;
-
-        free(lease->hostname);
-        free(lease->domainname);
-        free(lease->dns);
-        free(lease);
-}
-
-DEFINE_TRIVIAL_CLEANUP_FUNC(DHCPLease*, lease_free);
-#define _cleanup_lease_free_ _cleanup_(lease_freep)
-
 static int client_stop(sd_dhcp_client *client, int error) {
         assert_return(client, -EINVAL);
 
@@ -303,128 +189,63 @@ static int client_stop(sd_dhcp_client *client, int error) {
         client_notify(client, error);
 
         client->start_time = 0;
+        client->secs = 0;
         client->state = DHCP_STATE_INIT;
 
-        if (client->lease) {
-                lease_free(client->lease);
-                client->lease = NULL;
-        }
+        if (client->lease)
+                client->lease = sd_dhcp_lease_unref(client->lease);
 
         return 0;
 }
 
-static int client_packet_init(sd_dhcp_client *client, uint8_t type,
-                              DHCPMessage *message, uint16_t secs,
-                              uint8_t **opt, size_t *optlen) {
-        int err;
-        be16_t max_size;
-
-        *opt = (uint8_t *)(message + 1);
-
-        if (*optlen < 4)
-                return -ENOBUFS;
-        *optlen -= 4;
+static int client_message_init(sd_dhcp_client *client, DHCPMessage *message,
+                               uint8_t type, uint16_t secs, uint8_t **opt,
+                               size_t *optlen) {
+        int r;
 
-        message->op = BOOTREQUEST;
-        message->htype = 1;
-        message->hlen = ETHER_ADDR_LEN;
-        message->xid = htobe32(client->xid);
+        r = dhcp_message_init(message, BOOTREQUEST, client->xid, type,
+                              secs, opt, optlen);
+        if (r < 0)
+                return r;
 
-        /* Although 'secs' field is a SHOULD in RFC 2131, certain DHCP servers
-           refuse to issue an DHCP lease if 'secs' is set to zero */
-        message->secs = htobe16(secs);
+        memcpy(&message->chaddr, &client->mac_addr, ETH_ALEN);
 
         if (client->state == DHCP_STATE_RENEWING ||
             client->state == DHCP_STATE_REBINDING)
                 message->ciaddr = client->lease->address;
 
-        memcpy(&message->chaddr, &client->mac_addr, ETH_ALEN);
-        (*opt)[0] = 0x63;
-        (*opt)[1] = 0x82;
-        (*opt)[2] = 0x53;
-        (*opt)[3] = 0x63;
-
-        *opt += 4;
-
-        err = dhcp_option_append(opt, optlen, DHCP_OPTION_MESSAGE_TYPE, 1,
-                                 &type);
-        if (err < 0)
-                return err;
-
         /* Some DHCP servers will refuse to issue an DHCP lease if the Cliient
            Identifier option is not set */
-        err = dhcp_option_append(opt, optlen, DHCP_OPTION_CLIENT_IDENTIFIER,
-                                 ETH_ALEN, &client->mac_addr);
-        if (err < 0)
-                return err;
+        r = dhcp_option_append(opt, optlen, DHCP_OPTION_CLIENT_IDENTIFIER,
+                               ETH_ALEN, &client->mac_addr);
+        if (r < 0)
+                return r;
 
         if (type == DHCP_DISCOVER || type == DHCP_REQUEST) {
-                err = dhcp_option_append(opt, optlen,
-                                         DHCP_OPTION_PARAMETER_REQUEST_LIST,
-                                         client->req_opts_size,
-                                         client->req_opts);
-                if (err < 0)
-                        return err;
+                be16_t max_size;
+
+                r = dhcp_option_append(opt, optlen,
+                                       DHCP_OPTION_PARAMETER_REQUEST_LIST,
+                                       client->req_opts_size,
+                                       client->req_opts);
+                if (r < 0)
+                        return r;
 
                 /* Some DHCP servers will send bigger DHCP packets than the
                    defined default size unless the Maximum Messge Size option
                    is explicitely set */
                 max_size = htobe16(DHCP_IP_UDP_SIZE + DHCP_MESSAGE_SIZE +
                                    DHCP_CLIENT_MIN_OPTIONS_SIZE);
-                err = dhcp_option_append(opt, optlen,
-                                         DHCP_OPTION_MAXIMUM_MESSAGE_SIZE,
-                                         2, &max_size);
-                if (err < 0)
-                        return err;
+                r = dhcp_option_append(opt, optlen,
+                                       DHCP_OPTION_MAXIMUM_MESSAGE_SIZE,
+                                       2, &max_size);
+                if (r < 0)
+                        return r;
         }
 
         return 0;
 }
 
-static uint16_t client_checksum(void *buf, int len) {
-        uint32_t sum;
-        uint16_t *check;
-        int i;
-        uint8_t *odd;
-
-        sum = 0;
-        check = buf;
-
-        for (i = 0; i < len / 2 ; i++)
-                sum += check[i];
-
-        if (len & 0x01) {
-                odd = buf;
-                sum += odd[len - 1];
-        }
-
-        while (sum >> 16)
-                sum = (sum & 0xffff) + (sum >> 16);
-
-        return ~sum;
-}
-
-static void client_append_ip_headers(DHCPPacket *packet, uint16_t len) {
-        packet->ip.version = IPVERSION;
-        packet->ip.ihl = DHCP_IP_SIZE / 4;
-        packet->ip.tot_len = htobe16(len);
-
-        packet->ip.protocol = IPPROTO_UDP;
-        packet->ip.saddr = INADDR_ANY;
-        packet->ip.daddr = INADDR_BROADCAST;
-
-        packet->udp.source = htobe16(DHCP_PORT_CLIENT);
-        packet->udp.dest = htobe16(DHCP_PORT_SERVER);
-        packet->udp.len = htobe16(len - DHCP_IP_SIZE);
-
-        packet->ip.check = packet->udp.len;
-        packet->udp.check = client_checksum(&packet->ip.ttl, len - 8);
-
-        packet->ip.ttl = IPDEFTTL;
-        packet->ip.check = 0;
-        packet->ip.check = client_checksum(&packet->ip, DHCP_IP_SIZE);
-}
-
 static int client_send_discover(sd_dhcp_client *client, uint16_t secs) {
         int err = 0;
         _cleanup_free_ DHCPPacket *discover;
@@ -439,8 +260,8 @@ static int client_send_discover(sd_dhcp_client *client, uint16_t secs) {
         if (!discover)
                 return -ENOMEM;
 
-        err = client_packet_init(client, DHCP_DISCOVER, &discover->dhcp,
-                                 secs, &opt, &optlen);
+        err = client_message_init(client, &discover->dhcp, DHCP_DISCOVER,
+                                  secs, &opt, &optlen);
         if (err < 0)
                 return err;
 
@@ -456,7 +277,7 @@ static int client_send_discover(sd_dhcp_client *client, uint16_t secs) {
         if (err < 0)
                 return err;
 
-        client_append_ip_headers(discover, len);
+        dhcp_packet_append_ip_headers(discover, BOOTREQUEST, len);
 
         err = dhcp_network_send_raw_socket(client->fd, &client->link,
                                            discover, len);
@@ -477,8 +298,8 @@ static int client_send_request(sd_dhcp_client *client, uint16_t secs) {
         if (!request)
                 return -ENOMEM;
 
-        err = client_packet_init(client, DHCP_REQUEST, &request->dhcp, secs,
-                                 &opt, &optlen);
+        err = client_message_init(client, &request->dhcp, DHCP_REQUEST, secs,
+                                  &opt, &optlen);
         if (err < 0)
                 return err;
 
@@ -506,7 +327,7 @@ static int client_send_request(sd_dhcp_client *client, uint16_t secs) {
                                                    &request->dhcp,
                                                    len - DHCP_IP_UDP_SIZE);
         } else {
-                client_append_ip_headers(request, len);
+                dhcp_packet_append_ip_headers(request, BOOTREQUEST, len);
 
                 err = dhcp_network_send_raw_socket(client->fd, &client->link,
                                                    request, len);
@@ -515,12 +336,18 @@ static int client_send_request(sd_dhcp_client *client, uint16_t secs) {
         return err;
 }
 
+static uint16_t client_update_secs(sd_dhcp_client *client, usec_t time_now)
+{
+        client->secs = (time_now - client->start_time) / USEC_PER_SEC;
+
+        return client->secs;
+}
+
 static int client_timeout_resend(sd_event_source *s, uint64_t usec,
                                  void *userdata) {
         sd_dhcp_client *client = userdata;
         usec_t next_timeout = 0;
         uint32_t time_left;
-        uint16_t secs;
         int r = 0;
 
         assert(s);
@@ -575,11 +402,12 @@ static int client_timeout_resend(sd_event_source *s, uint64_t usec,
         if (r < 0)
                 goto error;
 
-        secs = (usec - client->start_time) / USEC_PER_SEC;
-
         switch (client->state) {
         case DHCP_STATE_INIT:
-                r = client_send_discover(client, secs);
+
+                client_update_secs(client, usec);
+
+                r = client_send_discover(client, client->secs);
                 if (r >= 0) {
                         client->state = DHCP_STATE_SELECTING;
                         client->attempt = 1;
@@ -591,7 +419,9 @@ static int client_timeout_resend(sd_event_source *s, uint64_t usec,
                 break;
 
         case DHCP_STATE_SELECTING:
-                r = client_send_discover(client, secs);
+                client_update_secs(client, usec);
+
+                r = client_send_discover(client, client->secs);
                 if (r < 0 && client->attempt >= 64)
                         goto error;
 
@@ -600,7 +430,7 @@ static int client_timeout_resend(sd_event_source *s, uint64_t usec,
         case DHCP_STATE_REQUESTING:
         case DHCP_STATE_RENEWING:
         case DHCP_STATE_REBINDING:
-                r = client_send_request(client, secs);
+                r = client_send_request(client, client->secs);
                 if (r < 0 && client->attempt >= 64)
                          goto error;
 
@@ -710,136 +540,13 @@ static int client_timeout_t1(sd_event_source *s, uint64_t usec, void *userdata)
         return client_initialize_events(client, usec);
 }
 
-static int client_parse_options(uint8_t code, uint8_t len, const uint8_t *option,
-                              void *user_data) {
-        DHCPLease *lease = user_data;
-        be32_t val;
-
-        switch(code) {
-
-        case DHCP_OPTION_IP_ADDRESS_LEASE_TIME:
-                if (len == 4) {
-                        memcpy(&val, option, 4);
-                        lease->lifetime = be32toh(val);
-                }
-
-                break;
-
-        case DHCP_OPTION_SERVER_IDENTIFIER:
-                if (len >= 4)
-                        memcpy(&lease->server_address, option, 4);
-
-                break;
-
-        case DHCP_OPTION_SUBNET_MASK:
-                if (len >= 4)
-                        memcpy(&lease->subnet_mask, option, 4);
-
-                break;
-
-        case DHCP_OPTION_ROUTER:
-                if (len >= 4)
-                        memcpy(&lease->router, option, 4);
-
-                break;
-
-        case DHCP_OPTION_DOMAIN_NAME_SERVER:
-                if (len && !(len % 4)) {
-                        unsigned i;
-
-                        lease->dns_size = len / 4;
-
-                        free(lease->dns);
-                        lease->dns = new0(struct in_addr, lease->dns_size);
-                        if (!lease->dns)
-                                return -ENOMEM;
-
-                        for (i = 0; i < lease->dns_size; i++) {
-                                memcpy(&lease->dns[i].s_addr, option + 4 * i, 4);
-                        }
-                }
-
-                break;
-
-        case DHCP_OPTION_INTERFACE_MTU:
-                if (len >= 2) {
-                        be16_t mtu;
-
-                        memcpy(&mtu, option, 2);
-                        lease->mtu = be16toh(mtu);
-
-                        if (lease->mtu < 68)
-                                lease->mtu = 0;
-                }
-
-                break;
-
-        case DHCP_OPTION_DOMAIN_NAME:
-                if (len >= 1) {
-                        free(lease->domainname);
-                        lease->domainname = strndup((const char *)option, len);
-                }
-
-                break;
-
-        case DHCP_OPTION_HOST_NAME:
-                if (len >= 1) {
-                        free(lease->hostname);
-                        lease->hostname = strndup((const char *)option, len);
-                }
-
-                break;
-
-        case DHCP_OPTION_RENEWAL_T1_TIME:
-                if (len == 4) {
-                        memcpy(&val, option, 4);
-                        lease->t1 = be32toh(val);
-                }
-
-                break;
-
-        case DHCP_OPTION_REBINDING_T2_TIME:
-                if (len == 4) {
-                        memcpy(&val, option, 4);
-                        lease->t2 = be32toh(val);
-                }
-
-                break;
-        }
-
-        return 0;
-}
-
 static int client_verify_headers(sd_dhcp_client *client, DHCPPacket *message,
                                  size_t len) {
-        size_t hdrlen;
-
-        if (len < (DHCP_IP_UDP_SIZE + DHCP_MESSAGE_SIZE))
-                return -EINVAL;
-
-        hdrlen = message->ip.ihl * 4;
-        if (hdrlen < 20 || hdrlen > len || client_checksum(&message->ip,
-                                                           hdrlen))
-                return -EINVAL;
-
-        if (hdrlen + be16toh(message->udp.len) > len)
-                return -EINVAL;
-
-        if (message->udp.check) {
-                message->ip.check = message->udp.len;
-                message->ip.ttl = 0;
-
-                if (client_checksum(&message->ip.ttl,
-                                    be16toh(message->udp.len) + 12))
-                        return -EINVAL;
-        }
-
-        if (be16toh(message->udp.source) != DHCP_PORT_SERVER ||
-            be16toh(message->udp.dest) != DHCP_PORT_CLIENT)
-                return -EINVAL;
+        int r;
 
-        if (message->dhcp.op != BOOTREPLY)
-                return -EINVAL;
+        r = dhcp_packet_verify_headers(message, BOOTREPLY, len);
+        if (r < 0)
+                return r;
 
         if (be32toh(message->dhcp.xid) != client->xid)
                 return -EINVAL;
@@ -853,19 +560,19 @@ static int client_verify_headers(sd_dhcp_client *client, DHCPPacket *message,
 
 static int client_receive_offer(sd_dhcp_client *client, DHCPPacket *offer,
                                 size_t len) {
-        _cleanup_lease_free_ DHCPLease *lease = NULL;
+        _cleanup_dhcp_lease_unref_ sd_dhcp_lease *lease = NULL;
         int r;
 
         r = client_verify_headers(client, offer, len);
         if (r < 0)
                 return r;
 
-        lease = new0(DHCPLease, 1);
-        if (!lease)
-                return -ENOMEM;
+        r = dhcp_lease_new(&lease);
+        if (r < 0)
+                return r;
 
         len = len - DHCP_IP_UDP_SIZE;
-        r = dhcp_option_parse(&offer->dhcp, len, client_parse_options,
+        r = dhcp_option_parse(&offer->dhcp, len, dhcp_lease_parse_options,
                               lease);
         if (r != DHCP_OFFER)
                 return -ENOMSG;
@@ -888,7 +595,7 @@ static int client_receive_ack(sd_dhcp_client *client, const uint8_t *buf,
                               size_t len) {
         DHCPPacket *ack;
         DHCPMessage *dhcp;
-        _cleanup_lease_free_ DHCPLease *lease = NULL;
+        _cleanup_dhcp_lease_unref_ sd_dhcp_lease *lease = NULL;
         int r;
 
         if (client->state == DHCP_STATE_RENEWING) {
@@ -904,11 +611,11 @@ static int client_receive_ack(sd_dhcp_client *client, const uint8_t *buf,
                 len -= DHCP_IP_UDP_SIZE;
         }
 
-        lease = new0(DHCPLease, 1);
-        if (!lease)
-                return -ENOMEM;
+        r = dhcp_lease_new(&lease);
+        if (r < 0)
+                return r;
 
-        r = dhcp_option_parse(dhcp, len, client_parse_options, lease);
+        r = dhcp_option_parse(dhcp, len, dhcp_lease_parse_options, lease);
         if (r == DHCP_NAK)
                 return DHCP_EVENT_NO_LEASE;
 
@@ -930,7 +637,7 @@ static int client_receive_ack(sd_dhcp_client *client, const uint8_t *buf,
                         r = DHCP_EVENT_IP_CHANGE;
                 }
 
-                lease_free(client->lease);
+                client->lease = sd_dhcp_lease_unref(client->lease);
         }
 
         client->lease = lease;
@@ -1145,6 +852,7 @@ int sd_dhcp_client_start(sd_dhcp_client *client) {
 
         client->fd = r;
         client->start_time = now(CLOCK_MONOTONIC);
+        client->secs = 0;
 
         return client_initialize_events(client, client->start_time);
 }