SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dhcp-protocol: introduce DHCPMessageHeader struct

Browse Source 
It is similar to DHCPMessage, but does not have the tail 'options'
variable array. Then, we can use it in another struct.
This commit is contained in:
Yu Watanabe
2026-04-19 08:31:07 +09:00
parent c651876cc9
commit 68553bb03a
2 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd-network/dhcp-protocol.h
+7
View File
@@ -35,12 +35,19 @@
uint8_t file[128]; \
be32_t magic;
struct DHCPMessageHeader {
DHCP_MESSAGE_HEADER_DEFINITION;
} _packed_;
typedef struct DHCPMessageHeader DHCPMessageHeader;
struct DHCPMessage {
DHCP_MESSAGE_HEADER_DEFINITION;
uint8_t options[];
} _packed_;
typedef struct DHCPMessage DHCPMessage;
assert_cc(sizeof(DHCPMessageHeader) == offsetof(DHCPMessage, options));
struct DHCPPacket {
struct iphdr ip;
src/libsystemd-network/test-dhcp-server.c
+14 -16
View File
@@ -83,9 +83,7 @@ static int test_basic(bool bind_to_interface) {
static void test_message_handler(void) {
_cleanup_(sd_dhcp_server_unrefp) sd_dhcp_server *server = NULL;
struct {
struct {
DHCP_MESSAGE_HEADER_DEFINITION;
} _packed_ message;
DHCPMessageHeader header;
struct {
uint8_t code;
uint8_t length;
@@ -113,11 +111,11 @@ static void test_message_handler(void) {
} _packed_ option_hostname;
uint8_t end;
} _packed_ test = {
.message.op = BOOTREQUEST,
.message.htype = ARPHRD_ETHER,
.message.hlen = ETHER_ADDR_LEN,
.message.xid = htobe32(0x12345678),
.message.chaddr = { 'A', 'B', 'C', 'D', 'E', 'F' },
.header.op = BOOTREQUEST,
.header.htype = ARPHRD_ETHER,
.header.hlen = ETHER_ADDR_LEN,
.header.xid = htobe32(0x12345678),
.header.chaddr = { 'A', 'B', 'C', 'D', 'E', 'F' },
.option_type.code = SD_DHCP_OPTION_MESSAGE_TYPE,
.option_type.length = 1,
.option_type.type = DHCP_DISCOVER,
@@ -168,19 +166,19 @@ static void test_message_handler(void) {
test.option_type.type = DHCP_DISCOVER;
ASSERT_OK_EQ(dhcp_server_handle_message(server, (DHCPMessage*)&test, sizeof(test), NULL), DHCP_OFFER);
test.message.op = 0;
test.header.op = 0;
ASSERT_OK_ZERO(dhcp_server_handle_message(server, (DHCPMessage*)&test, sizeof(test), NULL));
test.message.op = BOOTREQUEST;
test.header.op = BOOTREQUEST;
ASSERT_OK_EQ(dhcp_server_handle_message(server, (DHCPMessage*)&test, sizeof(test), NULL), DHCP_OFFER);
test.message.htype = 0;
test.header.htype = 0;
ASSERT_OK_EQ(dhcp_server_handle_message(server, (DHCPMessage*)&test, sizeof(test), NULL), DHCP_OFFER);
test.message.htype = ARPHRD_ETHER;
test.header.htype = ARPHRD_ETHER;
ASSERT_OK_EQ(dhcp_server_handle_message(server, (DHCPMessage*)&test, sizeof(test), NULL), DHCP_OFFER);
test.message.hlen = 0;
test.header.hlen = 0;
ASSERT_ERROR(dhcp_server_handle_message(server, (DHCPMessage*)&test, sizeof(test), NULL), EBADMSG);
test.message.hlen = ETHER_ADDR_LEN;
test.header.hlen = ETHER_ADDR_LEN;
ASSERT_OK_EQ(dhcp_server_handle_message(server, (DHCPMessage*)&test, sizeof(test), NULL), DHCP_OFFER);
test.option_type.type = DHCP_REQUEST;
@@ -246,7 +244,7 @@ static void test_message_handler(void) {
ASSERT_OK_EQ(dhcp_server_handle_message(server, (DHCPMessage*)&test, sizeof(test), NULL), DHCP_ACK);
/* release the bound static lease */
test.message.ciaddr = htobe32(INADDR_LOOPBACK + 31);
test.header.ciaddr = htobe32(INADDR_LOOPBACK + 31);
test.option_type.type = DHCP_RELEASE;
ASSERT_OK_ZERO(dhcp_server_handle_message(server, (DHCPMessage*)&test, sizeof(test), NULL));
@@ -261,7 +259,7 @@ static void test_message_handler(void) {
ASSERT_OK(sd_dhcp_server_start(server));
/* request a new non-static address */
test.message.ciaddr = 0;
test.header.ciaddr = 0;
test.option_type.type = DHCP_REQUEST;
test.option_requested_ip.address = htobe32(INADDR_LOOPBACK + 29);
ASSERT_OK_EQ(dhcp_server_handle_message(server, (DHCPMessage*)&test, sizeof(test), NULL), DHCP_ACK);