From: Andrew Zaborowski <andrew.zaborowski@intel.com>
To: ell@lists.01.org
Subject: [PATCH 14/15] unit: Stricter checks in unit-dhcp
Date: Mon, 02 Aug 2021 16:04:23 +0200 [thread overview]
Message-ID: <20210802140424.170150-14-andrew.zaborowski@intel.com> (raw)
In-Reply-To: <20210802140424.170150-1-andrew.zaborowski@intel.com>
[-- Attachment #1: Type: text/plain, Size: 5962 bytes --]
When the client state machine is expected to have generated a packet and
the transport l2_send callback is expected to have filled in
client_packet/client_packet_len, make sure this has actually happened.
Without this the test passes with rapid-commit enabled even though the
code looks like it's requiring 4 messages -- the DHCPDISCOVER is being
re-sent and the server generates a second DHCPACK.
---
unit/test-dhcp.c | 40 ++++++++++++++++++++++++++++++++++------
1 file changed, 34 insertions(+), 6 deletions(-)
diff --git a/unit/test-dhcp.c b/unit/test-dhcp.c
index e03eaca..079f037 100644
--- a/unit/test-dhcp.c
+++ b/unit/test-dhcp.c
@@ -655,13 +655,17 @@ static bool dhcp_message_compare(const uint8_t *expected, size_t expected_len,
return r;
}
+static bool client_send_called = false;
+
static int fake_transport_send(struct dhcp_transport *transport,
const struct sockaddr_in *dest,
const void *data, size_t len)
{
assert(len <= sizeof(client_packet));
+ assert(!client_send_called);
memcpy(client_packet, data, len);
client_packet_len = len;
+ client_send_called = true;
return len;
}
@@ -673,8 +677,10 @@ static int fake_transport_l2_send(struct dhcp_transport *transprot,
const void *data, size_t len)
{
assert(len <= sizeof(client_packet));
+ assert(!client_send_called);
memcpy(client_packet, data, len);
client_packet_len = len;
+ client_send_called = true;
return len;
}
@@ -710,16 +716,21 @@ static void test_discover(const void *data)
assert(l_dhcp_client_start(client));
+ assert(client_send_called);
+ client_send_called = false;
assert(dhcp_message_compare(discover_data_1, sizeof(discover_data_1),
client_packet, client_packet_len));
transport->rx_cb(offer_data_1, sizeof(offer_data_1), client);
+ assert(client_send_called);
+ client_send_called = false;
assert(dhcp_message_compare(request_data_1, sizeof(request_data_1),
client_packet, client_packet_len));
event_handler_called = false;
transport->rx_cb(ack_data_1, sizeof(ack_data_1), client);
+ assert(!client_send_called);
assert(event_handler_called);
lease = l_dhcp_client_get_lease(client);
@@ -736,6 +747,8 @@ static void test_discover(const void *data)
assert(lease->t2 == 0x00012750);
l_dhcp_client_destroy(client);
+ assert(client_send_called);
+ client_send_called = false;
}
static bool l2_send_called = false;
@@ -749,6 +762,7 @@ static int fake_transport_server_l2_send(struct dhcp_transport *s,
const void *data, size_t len)
{
assert(len <= sizeof(server_packet));
+ assert(!l2_send_called);
memcpy(server_packet, data, len);
server_packet_len = len;
@@ -774,9 +788,11 @@ static void server_event(struct l_dhcp_server *server,
{
switch (event) {
case L_DHCP_SERVER_EVENT_NEW_LEASE:
+ assert(!new_client);
new_client = l_dhcp_lease_get_address(lease);
break;
case L_DHCP_SERVER_EVENT_LEASE_EXPIRED:
+ assert(!expired_client);
expired_client = l_dhcp_lease_get_address(lease);
break;
}
@@ -806,15 +822,17 @@ static struct l_dhcp_client *client_init(const uint8_t *mac)
return client;
}
-static bool client_connect(struct l_dhcp_client *client,
+static void client_connect(struct l_dhcp_client *client,
struct l_dhcp_server *server)
{
struct dhcp_transport *srv_transport =
_dhcp_server_get_transport(server);
struct dhcp_transport *cli_transport =
_dhcp_client_get_transport(client);
- if (!l_dhcp_client_start(client))
- return false;
+
+ assert(l_dhcp_client_start(client));
+ assert(client_send_called);
+ client_send_called = false;
/* RX DISCOVER */
srv_transport->rx_cb(client_packet, client_packet_len, server);
@@ -823,6 +841,8 @@ static bool client_connect(struct l_dhcp_client *client,
/* RX OFFER */
cli_transport->rx_cb(server_packet, server_packet_len, client);
+ assert(client_send_called);
+ client_send_called = false;
/* RX REQUEST */
srv_transport->rx_cb(client_packet, client_packet_len, server);
@@ -831,10 +851,9 @@ static bool client_connect(struct l_dhcp_client *client,
/* RX ACK */
cli_transport->rx_cb(server_packet, server_packet_len, client);
+ assert(!client_send_called);
assert(event_handler_called);
-
- return true;
}
static struct l_dhcp_server *server_init()
@@ -941,7 +960,8 @@ static void test_complete_run(const void *data)
l_free(cli_addr);
l_dhcp_client_stop(client1);
-
+ assert(client_send_called);
+ client_send_called = false;
srv_transport->rx_cb(client_packet, client_packet_len, server);
assert(expired_client);
assert(!strcmp(expired_client, "192.168.1.2"));
@@ -949,6 +969,8 @@ static void test_complete_run(const void *data)
expired_client = NULL;
l_dhcp_client_stop(client2);
+ assert(client_send_called);
+ client_send_called = false;
srv_transport->rx_cb(client_packet, client_packet_len, server);
assert(expired_client);
assert(!strcmp(expired_client, "192.168.1.3"));
@@ -956,7 +978,9 @@ static void test_complete_run(const void *data)
expired_client = NULL;
l_dhcp_client_destroy(client1);
+ assert(!client_send_called);
l_dhcp_client_destroy(client2);
+ assert(!client_send_called);
l_dhcp_server_stop(server);
l_dhcp_server_destroy(server);
@@ -992,6 +1016,8 @@ static void test_expired_ip_reuse(const void *data)
new_client = NULL;
l_dhcp_client_destroy(client);
+ assert(client_send_called);
+ client_send_called = false;
srv_transport->rx_cb(client_packet, client_packet_len, server);
l_free(expired_client);
expired_client = NULL;
@@ -1010,6 +1036,8 @@ static void test_expired_ip_reuse(const void *data)
l_free(cli_addr);
l_dhcp_client_destroy(client_new);
+ assert(client_send_called);
+ client_send_called = false;
l_dhcp_server_destroy(server);
}
--
2.30.2
next prev parent reply other threads:[~2021-08-02 14:04 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-02 14:04 [PATCH 01/15] dhcp-server: Add "authoritative" mode Andrew Zaborowski
2021-08-02 14:04 ` [PATCH 02/15] dhcp-server: Handle DHCPDECLINE for active leases Andrew Zaborowski
2021-08-02 14:04 ` [PATCH 03/15] dhcp-server: Respect client's broadcast flag Andrew Zaborowski
2021-08-02 14:04 ` [PATCH 04/15] dhcp-server: Look up leases by client identifier option Andrew Zaborowski
2021-08-02 14:04 ` [PATCH 05/15] dhcp-server: Copy client identifier from the client message Andrew Zaborowski
2021-08-02 14:04 ` [PATCH 06/15] dhcp-server: Save lease mac before calling add_lease Andrew Zaborowski
2021-08-02 14:04 ` [PATCH 07/15] dhcp-server: Ensure broadcast address is not selected Andrew Zaborowski
2021-08-02 14:04 ` [PATCH 08/15] dhcp-server: Reuse leases in find_free_or_expired_ip Andrew Zaborowski
2021-08-02 14:04 ` [PATCH 09/15] dhcp-server: Refactor lease lookup Andrew Zaborowski
2021-08-02 14:04 ` [PATCH 10/15] dhcp-server: Allow reactivating expired leases Andrew Zaborowski
2021-08-02 14:04 ` [PATCH 11/15] dhcp: Support RFC4039 Rapid Commit Andrew Zaborowski
2021-08-02 14:04 ` [PATCH 12/15] dhcp-server: " Andrew Zaborowski
2021-08-02 14:04 ` [PATCH 13/15] dhcp-server: Rapid commit enable/disable setter Andrew Zaborowski
2021-08-02 14:04 ` Andrew Zaborowski [this message]
2021-08-02 14:04 ` [PATCH 15/15] unit: Test DHCP rapid commit Andrew Zaborowski
2021-08-02 18:15 ` [PATCH 01/15] dhcp-server: Add "authoritative" mode Denis Kenzior
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210802140424.170150-14-andrew.zaborowski@intel.com \
--to=andrew.zaborowski@intel.com \
--cc=ell@lists.01.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).