espressif/esp-lwip
1
0
Fork 0
mirror of https://github.com/espressif/esp-lwip.git synced 2026-06-05 21:04:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

dhcp/test: Fix dhcp-opts test to calc ticks from ESP platform hooks

Browse Source
This commit is contained in:
David Cermak
2024-04-19 10:52:52 +02:00
parent 5adabc7101
commit 52b30c9a7a
3 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/unit/Filelists.mk
-1
View File
@@ -53,4 +53,3 @@ TESTFILES=$(TESTDIR)/lwip_unittests.c \
$(TESTDIR)/udp/test_udp.c \
$(TESTDIR)/ppp/test_pppos.c \
$(TESTDIR)/esp_platform_hooks.c
test/unit/dhcp/test_dhcp.c
+30 -29
View File
@@ -134,6 +134,7 @@ static const u8_t arpreply[] = {
};
static int txpacket;
static int tx_arp;
static enum tcase {
TEST_LWIP_DHCP,
TEST_LWIP_DHCP_NAK,
@@ -157,7 +158,7 @@ static void tick_lwip(void)
if (tick % 5 == 0) {
dhcp_fine_tmr();
}
if (tick % 600 == 0) {
if (tick % (DHCP_COARSE_TIMER_SECS * 10) == 0) {
dhcp_coarse_tmr();
}
}
@@ -492,40 +493,37 @@ static err_t lwip_tx_func(struct netif *netif, struct pbuf *p)
}
break;
case TEST_LWIP_DHCP_OPTS:
switch (txpacket) {
case 1:
case 2:
case 7:
{
u8_t requested_opts[16];
u8_t len = get_opt(DHCP_OPTION_MESSAGE_TYPE, p, requested_opts, sizeof(requested_opts));
fail_unless(len > 0);
last_message_type = requested_opts[0];
len = get_opt(DHCP_OPTION_PARAMETER_REQUEST_LIST, p, requested_opts, sizeof(requested_opts));
if (p->tot_len <= sizeof(arpreply) && memcmp(p->payload, broadcast, sizeof(broadcast)) == 0) {
/* skip ARP packets, but count them to check number DHCP packets transmitted */
tx_arp++;
break;
}
{
u8_t requested_opts[16];
u8_t len = get_opt(DHCP_OPTION_MESSAGE_TYPE, p, requested_opts, sizeof(requested_opts));
fail_unless(len > 0);
last_message_type = requested_opts[0];
len = get_opt(DHCP_OPTION_PARAMETER_REQUEST_LIST, p, requested_opts, sizeof(requested_opts));
#if ESP_LWIP
#if LWIP_DHCP_ENABLE_VENDOR_SPEC_IDS
/* Check the opt 43 is amond the requested items */
fail_unless(len > 0 && memchr(requested_opts, 43, len) != NULL);
/* Test the vendor class ID option is available */
len = get_opt(60, p, requested_opts, sizeof(requested_opts));
fail_unless(len > 0 && memcmp(requested_opts, vci_string, sizeof(vci_string)) == 0);
/* Check the opt 43 is amond the requested items */
fail_unless(len > 0 && memchr(requested_opts, 43, len) != NULL);
/* Test the vendor class ID option is available */
len = get_opt(60, p, requested_opts, sizeof(requested_opts));
fail_unless(len > 0 && memcmp(requested_opts, vci_string, sizeof(vci_string)) == 0);
#else /* !LWIP_DHCP_ENABLE_VENDOR_SPEC_IDS */
fail_unless(memchr(requested_opts, 43, len) == NULL); /* VSI mustn't be in the reqested opts */
fail_unless(memchr(requested_opts, 43, len) == NULL); /* VSI mustn't be in the reqested opts */
#endif /* LWIP_DHCP_ENABLE_VENDOR_SPEC_IDS */
#if LWIP_DHCP_ENABLE_CLIENT_ID
/* Test the client ID option is available */
len = get_opt(DHCP_OPTION_CLIENT_ID, p, requested_opts, sizeof(requested_opts));
fail_unless(len > 0 && requested_opts[0] == LWIP_IANA_HWTYPE_ETHERNET &&
memcmp(requested_opts + 1, netif->hwaddr, len - 1) == 0);
/* Test the client ID option is available */
len = get_opt(DHCP_OPTION_CLIENT_ID, p, requested_opts, sizeof(requested_opts));
fail_unless(len > 0 && requested_opts[0] == LWIP_IANA_HWTYPE_ETHERNET &&
memcmp(requested_opts + 1, netif->hwaddr, len - 1) == 0);
#endif /* LWIP_DHCP_ENABLE_CLIENT_ID */
#else /* ! ESP_LWIP */
/* vanilla lwip: at least subnet mask should be in the requested opt list */
fail_unless(len > 0 && memchr(requested_opts, DHCP_OPTION_SUBNET_MASK, len) != NULL);
/* vanilla lwip: at least subnet mask should be in the requested opt list */
fail_unless(len > 0 && memchr(requested_opts, DHCP_OPTION_SUBNET_MASK, len) != NULL);
#endif /* ESP_LWIP */
}
break;
default:
break;
}
break;
@@ -1173,6 +1171,7 @@ START_TEST(test_options)
tcase = TEST_LWIP_DHCP_OPTS;
setdebug(0);
tx_arp = 0;
IP4_ADDR(&addr, 0, 0, 0, 0);
IP4_ADDR(&netmask, 0, 0, 0, 0);
@@ -1242,14 +1241,16 @@ START_TEST(test_options)
last_message_type = 0;
/* wait after the rebinding period to expect:
* 4 ARP packets (pkt 3, 4, 5, 6)
* several ARP packets
* we count them, as in ESP_LWIP we redefine dhcp ticks and backoff timeouts,
* so that we don't have to update this test every time we update the hooks/period
* 1 DHCP request packet with renewal */
for (i = 0; i < 1200; i++) {
tick_lwip();
if (last_message_type == DHCP_REQUEST)
break;
}
fail_unless(txpacket == 7, "TX %d packets, expected 7", txpacket); /* DHCP renewal */
fail_unless(txpacket == 3 + tx_arp, "TX %d packets, expected %d", txpacket, 3 + DHCP_TEST_NUM_ARP_FRAMES); /* DHCP renewal */
#if ESP_LWIP && LWIP_DHCP_ENABLE_VENDOR_SPEC_IDS
dhcp_free_vendor_class_identifier();
test/unit/lwipopts.h
+8 -8
View File
@@ -98,7 +98,7 @@
#define LWIP_DHCP_ENABLE_MTU_UPDATE 1
#if LWIP_DHCP_ENABLE_VENDOR_SPEC_IDS
#define DHCP_OPTION_VSI 43
#define LWIP_HOOK_DHCP_EXTRA_REQUEST_OPTIONS , DHCP_OPTION_VSI
#define DHCP_ADD_EXTRA_REQUEST_OPTIONS , DHCP_OPTION_VSI
#endif
#define ESP_LWIP 1
@@ -106,7 +106,7 @@
#define DHCP_DEFINE_CUSTOM_TIMEOUTS 1
#define DHCP_COARSE_TIMER_SECS (1)
#define DHCP_NEXT_TIMEOUT_THRESHOLD (3)
#define DHCP_REQUEST_TIMEOUT_SEQUENCE(tries) (( (tries) < 6 ? 1 << (tries) : 60) * 250)
#define DHCP_REQUEST_BACKOFF_SEQUENCE(tries) (( (tries) < 6 ? 1 << (tries) : 60) * 250)
#include <stdint.h>
static inline uint32_t timeout_from_offered(uint32_t lease, uint32_t min)
@@ -117,12 +117,12 @@ static inline uint32_t timeout_from_offered(uint32_t lease, uint32_t min)
}
return timeout;
}
#define DHCP_CALC_TIMEOUT_FROM_OFFERED_T0_LEASE(dhcp) \
timeout_from_offered((dhcp)->offered_t0_lease, 120)
#define DHCP_CALC_TIMEOUT_FROM_OFFERED_T1_RENEW(dhcp) \
timeout_from_offered((dhcp)->offered_t1_renew, (dhcp)->t0_timeout>>1 /* 50% */ )
#define DHCP_CALC_TIMEOUT_FROM_OFFERED_T2_REBIND(dhcp) \
timeout_from_offered((dhcp)->offered_t2_rebind, ((dhcp)->t0_timeout/8)*7 /* 87.5% */ )
#define DHCP_SET_TIMEOUT_FROM_OFFERED_T0_LEASE(tout, dhcp) do { \
(tout) = timeout_from_offered((dhcp)->offered_t0_lease, 120); } while(0)
#define DHCP_SET_TIMEOUT_FROM_OFFERED_T1_RENEW(tout, dhcp) do { \
(tout) = timeout_from_offered((dhcp)->offered_t1_renew, (dhcp)->t0_timeout>>1 /* 50% */ ); } while(0)
#define DHCP_SET_TIMEOUT_FROM_OFFERED_T2_REBIND(tout, dhcp) do { \
(tout) = timeout_from_offered((dhcp)->offered_t2_rebind, ((dhcp)->t0_timeout/8)*7 /* 87.5% */ ); } while(0)
struct dhcp;
struct pbuf;