From: Andrew Zaborowski <andrew.zaborowski@intel.com>
To: ell@lists.01.org
Subject: [PATCH 05/15] dhcp-server: Copy client identifier from the client message
Date: Mon, 02 Aug 2021 16:04:14 +0200 [thread overview]
Message-ID: <20210802140424.170150-5-andrew.zaborowski@intel.com> (raw)
In-Reply-To: <20210802140424.170150-1-andrew.zaborowski@intel.com>
[-- Attachment #1: Type: text/plain, Size: 4288 bytes --]
As mandated by RFC 6842 copy the client identifier option from the
client message we're replying to into the reply message.
---
ell/dhcp-server.c | 31 +++++++++++++++++++++++--------
1 file changed, 23 insertions(+), 8 deletions(-)
diff --git a/ell/dhcp-server.c b/ell/dhcp-server.c
index e4d9d72..5c511f7 100644
--- a/ell/dhcp-server.c
+++ b/ell/dhcp-server.c
@@ -525,6 +525,16 @@ static void add_server_options(struct l_dhcp_server *server,
}
}
+/* Copy the client identifier option from the client message per RFC6842 */
+static void copy_client_id(struct dhcp_message_builder *builder,
+ const uint8_t *client_id)
+{
+ if (client_id)
+ _dhcp_message_builder_append(builder,
+ DHCP_OPTION_CLIENT_IDENTIFIER,
+ client_id[0], client_id + 1);
+}
+
static void send_offer(struct l_dhcp_server *server,
const struct dhcp_message *client_msg,
struct l_dhcp_lease *lease, uint32_t requested_ip,
@@ -570,6 +580,7 @@ static void send_offer(struct l_dhcp_server *server,
4, &server->address);
add_server_options(server, &builder);
+ copy_client_id(&builder, client_id);
_dhcp_message_builder_finalize(&builder, &len);
@@ -580,7 +591,8 @@ static void send_offer(struct l_dhcp_server *server,
}
static void send_inform(struct l_dhcp_server *server,
- const struct dhcp_message *client_msg)
+ const struct dhcp_message *client_msg,
+ const uint8_t *client_id)
{
struct dhcp_message_builder builder;
size_t len = sizeof(struct dhcp_message) + DHCP_MIN_OPTIONS_SIZE;
@@ -593,6 +605,7 @@ static void send_inform(struct l_dhcp_server *server,
_dhcp_message_builder_init(&builder, reply, len, DHCP_MESSAGE_TYPE_ACK);
add_server_options(server, &builder);
+ copy_client_id(&builder, client_id);
_dhcp_message_builder_finalize(&builder, &len);
@@ -600,7 +613,8 @@ static void send_inform(struct l_dhcp_server *server,
}
static void send_nak(struct l_dhcp_server *server,
- const struct dhcp_message *client_msg)
+ const struct dhcp_message *client_msg,
+ const uint8_t *client_id)
{
struct dhcp_message_builder builder;
size_t len = sizeof(struct dhcp_message) + DHCP_MIN_OPTIONS_SIZE;
@@ -611,7 +625,7 @@ static void send_nak(struct l_dhcp_server *server,
server_message_init(server, client_msg, reply);
_dhcp_message_builder_init(&builder, reply, len, DHCP_MESSAGE_TYPE_NAK);
-
+ copy_client_id(&builder, client_id);
_dhcp_message_builder_finalize(&builder, &len);
server_message_send(server, reply, len, DHCP_MESSAGE_TYPE_NAK);
@@ -640,6 +654,7 @@ static void send_ack(struct l_dhcp_server *server,
4, &lease_time);
add_server_options(server, &builder);
+ copy_client_id(&builder, client_id);
_dhcp_message_builder_append(&builder, L_DHCP_OPTION_SERVER_IDENTIFIER,
4, &server->address);
@@ -738,7 +753,7 @@ static void listener_event(const void *data, size_t len, void *user_data)
*/
if (!server_id_match) {
if (server->authoritative) {
- send_nak(server, message);
+ send_nak(server, message, client_id_opt);
break;
}
@@ -760,7 +775,7 @@ static void listener_event(const void *data, size_t len, void *user_data)
*/
if (!lease) {
if (server_id_opt || server->authoritative)
- send_nak(server, message);
+ send_nak(server, message, client_id_opt);
break;
}
@@ -792,7 +807,7 @@ static void listener_event(const void *data, size_t len, void *user_data)
if (!lease->offering ||
(requested_ip_opt &&
requested_ip_opt != lease->address)) {
- send_nak(server, message);
+ send_nak(server, message, client_id_opt);
break;
}
} else {
@@ -804,7 +819,7 @@ static void listener_event(const void *data, size_t len, void *user_data)
if (lease->offering ||
(requested_ip_opt &&
requested_ip_opt != lease->address)) {
- send_nak(server, message);
+ send_nak(server, message, client_id_opt);
break;
}
}
@@ -839,7 +854,7 @@ static void listener_event(const void *data, size_t len, void *user_data)
if (!server_id_match)
break;
- send_inform(server, message);
+ send_inform(server, message, client_id_opt);
break;
}
}
--
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 ` Andrew Zaborowski [this message]
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 ` [PATCH 14/15] unit: Stricter checks in unit-dhcp Andrew Zaborowski
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-5-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).