sd-dhcp-client: move magic cookie into DHCPMessage struct

[elogind.git] / src / libsystemd-network / sd-dhcp-client.c

diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c
index 0728a15550cd7d51f7bb503bb1ee4c8bc19cf064..5824e6ee91121359c7792014431116253eac9668 100644 (file)
--- a/src/libsystemd-network/sd-dhcp-client.c
+++ b/src/libsystemd-network/sd-dhcp-client.c
@@ -22,6 +22,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <net/ethernet.h>
+#include <net/if_arp.h>
 #include <sys/param.h>
 #include <sys/ioctl.h>
 
@@ -292,7 +293,7 @@ static int dhcp_client_send_raw(sd_dhcp_client *client, DHCPPacket *packet,
 }
 
 static int client_send_discover(sd_dhcp_client *client) {
-        _cleanup_free_ DHCPPacket *discover;
+        _cleanup_free_ DHCPPacket *discover = NULL;
         size_t optlen, len;
         uint8_t *opt;
         usec_t time_now;
@@ -300,7 +301,7 @@ static int client_send_discover(sd_dhcp_client *client) {
 
         assert(client);
 
-        r = sd_event_get_now_monotonic(client->event, &time_now);
+        r = sd_event_now(client->event, CLOCK_MONOTONIC, &time_now);
         if (r < 0)
                 return r;
         assert(time_now >= client->start_time);
@@ -427,7 +428,7 @@ static int client_timeout_resend(sd_event_source *s, uint64_t usec,
         assert(client);
         assert(client->event);
 
-        r = sd_event_get_now_monotonic(client->event, &time_now);
+        r = sd_event_now(client->event, CLOCK_MONOTONIC, &time_now);
         if (r < 0)
                 goto error;
 
@@ -476,11 +477,11 @@ static int client_timeout_resend(sd_event_source *s, uint64_t usec,
 
         client->timeout_resend = sd_event_source_unref(client->timeout_resend);
 
-        r = sd_event_add_monotonic(client->event,
-                                     &client->timeout_resend,
-                                     next_timeout,
-                                     10 * USEC_PER_MSEC,
-                                     client_timeout_resend, client);
+        r = sd_event_add_time(client->event,
+                              &client->timeout_resend,
+                              CLOCK_MONOTONIC,
+                              next_timeout, 10 * USEC_PER_MSEC,
+                              client_timeout_resend, client);
         if (r < 0)
                 goto error;
 
@@ -560,9 +561,11 @@ static int client_initialize_events(sd_dhcp_client *client,
 
         client->timeout_resend = sd_event_source_unref(client->timeout_resend);
 
-        r = sd_event_add_monotonic(client->event,
-                                   &client->timeout_resend, 0, 0,
-                                   client_timeout_resend, client);
+        r = sd_event_add_time(client->event,
+                              &client->timeout_resend,
+                              CLOCK_MONOTONIC,
+                              0, 0,
+                              client_timeout_resend, client);
         if (r < 0)
                 goto error;
 
@@ -806,7 +809,7 @@ static int client_set_lease_timeouts(sd_dhcp_client *client) {
         if (client->lease->lifetime == 0xffffffff)
                 return 0;
 
-        r = sd_event_get_now_monotonic(client->event, &time_now);
+        r = sd_event_now(client->event, CLOCK_MONOTONIC, &time_now);
         if (r < 0)
                 return r;
         assert(client->request_sent <= time_now);
@@ -856,10 +859,10 @@ static int client_set_lease_timeouts(sd_dhcp_client *client) {
         }
 
         /* arm lifetime timeout */
-        r = sd_event_add_monotonic(client->event,
-                                   &client->timeout_expire, lifetime_timeout,
-                                   10 * USEC_PER_MSEC,
-                                   client_timeout_expire, client);
+        r = sd_event_add_time(client->event, &client->timeout_expire,
+                              CLOCK_MONOTONIC,
+                              lifetime_timeout, 10 * USEC_PER_MSEC,
+                              client_timeout_expire, client);
         if (r < 0)
                 return r;
 
@@ -877,11 +880,12 @@ static int client_set_lease_timeouts(sd_dhcp_client *client) {
                 return 0;
 
         /* arm T2 timeout */
-        r = sd_event_add_monotonic(client->event,
-                                   &client->timeout_t2,
-                                   t2_timeout,
-                                   10 * USEC_PER_MSEC,
-                                   client_timeout_t2, client);
+        r = sd_event_add_time(client->event,
+                              &client->timeout_t2,
+                              CLOCK_MONOTONIC,
+                              t2_timeout,
+                              10 * USEC_PER_MSEC,
+                              client_timeout_t2, client);
         if (r < 0)
                 return r;
 
@@ -899,11 +903,11 @@ static int client_set_lease_timeouts(sd_dhcp_client *client) {
                 return 0;
 
         /* arm T1 timeout */
-        r = sd_event_add_monotonic(client->event,
-                                   &client->timeout_t1,
-                                   t1_timeout,
-                                   10 * USEC_PER_MSEC,
-                                   client_timeout_t1, client);
+        r = sd_event_add_time(client->event,
+                              &client->timeout_t1,
+                              CLOCK_MONOTONIC,
+                              t1_timeout, 10 * USEC_PER_MSEC,
+                              client_timeout_t1, client);
         if (r < 0)
                 return r;
 
@@ -933,6 +937,11 @@ static int client_handle_message(sd_dhcp_client *client, DHCPMessage *message,
                 return 0;
         }
 
+        if (be32toh(message->magic) != DHCP_MAGIC_COOKIE) {
+                log_dhcp_client(client, "not a DHCP message: ignoring");
+                return 0;
+        }
+
         if (message->op != BOOTREPLY) {
                 log_dhcp_client(client, "not a BOOTREPLY message: ignoring");
                 return 0;
@@ -945,6 +954,11 @@ static int client_handle_message(sd_dhcp_client *client, DHCPMessage *message,
                 return 0;
         }
 
+        if (message->htype != ARPHRD_ETHER || message->hlen != ETHER_ADDR_LEN) {
+                log_dhcp_client(client, "not an ethernet packet");
+                return 0;
+        }
+
         if (memcmp(&message->chaddr[0], &client->client_id.mac_addr,
                    ETH_ALEN)) {
                 log_dhcp_client(client, "received chaddr does not match "
@@ -964,10 +978,11 @@ static int client_handle_message(sd_dhcp_client *client, DHCPMessage *message,
                         client->state = DHCP_STATE_REQUESTING;
                         client->attempt = 1;
 
-                        r = sd_event_add_monotonic(client->event,
-                                                   &client->timeout_resend, 0,
-                                                   0, client_timeout_resend,
-                                                   client);
+                        r = sd_event_add_time(client->event,
+                                              &client->timeout_resend,
+                                              CLOCK_MONOTONIC,
+                                              0, 0,
+                                              client_timeout_resend, client);
                         if (r < 0)
                                 goto error;