system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-09-06 08:46:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

networkd: support setting dhcp server port

Browse source
This commit is contained in:
Martin Ivicic 2024-02-21 02:07:26 +01:00 committed by Yu Watanabe
parent e5aa8c193d
commit ea932bd34d
6 changed files with 37 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
man/systemd.network.xml
View file

@ -2736,6 +2736,15 @@ NFTSet=prefix:netdev:filter:eth_ipv4_prefix</programlisting>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term><varname>ServerPort=</varname></term>
<listitem>
<para>Set the port on which the DHCP server is listening.</para>
<xi:include href="version-info.xml" xpointer="v256"/>
</listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term><varname>DenyList=</varname></term> <term><varname>DenyList=</varname></term>
<listitem> <listitem>

22
src/libsystemd-network/sd-dhcp-client.c
View file

@ -62,6 +62,7 @@ struct sd_dhcp_client {
int fd; int fd;
uint16_t port; uint16_t port;
uint16_t server_port;
union sockaddr_union link; union sockaddr_union link;
sd_event_source *receive_message; sd_event_source *receive_message;
bool request_broadcast; bool request_broadcast;
@ -516,6 +517,18 @@ int sd_dhcp_client_set_client_port(
return 0; return 0;
} }
int sd_dhcp_client_set_port(
sd_dhcp_client *client,
uint16_t port) {
assert_return(client, -EINVAL);
assert_return(!sd_dhcp_client_is_running(client), -EBUSY);
client->server_port = port;
return 0;
}
int sd_dhcp_client_set_mtu(sd_dhcp_client *client, uint32_t mtu) { int sd_dhcp_client_set_mtu(sd_dhcp_client *client, uint32_t mtu) {
assert_return(client, -EINVAL); assert_return(client, -EINVAL);
assert_return(mtu >= DHCP_MIN_PACKET_SIZE, -ERANGE); assert_return(mtu >= DHCP_MIN_PACKET_SIZE, -ERANGE);
@ -891,7 +904,7 @@ static int dhcp_client_send_raw(
size_t len) { size_t len) {
dhcp_packet_append_ip_headers(packet, INADDR_ANY, client->port, dhcp_packet_append_ip_headers(packet, INADDR_ANY, client->port,
INADDR_BROADCAST, DHCP_PORT_SERVER, len, client->ip_service_type); INADDR_BROADCAST, client->server_port, len, client->ip_service_type);
return dhcp_network_send_raw_socket(client->fd, &client->link, return dhcp_network_send_raw_socket(client->fd, &client->link,
packet, len); packet, len);
@ -1113,7 +1126,7 @@ static int client_send_request(sd_dhcp_client *client) {
if (client->state == DHCP_STATE_RENEWING) if (client->state == DHCP_STATE_RENEWING)
r = dhcp_network_send_udp_socket(client->fd, r = dhcp_network_send_udp_socket(client->fd,
client->lease->server_address, client->lease->server_address,
DHCP_PORT_SERVER, client->server_port,
&request->dhcp, &request->dhcp,
sizeof(DHCPMessage) + optoffset); sizeof(DHCPMessage) + optoffset);
else else
@ -2203,7 +2216,7 @@ int sd_dhcp_client_send_release(sd_dhcp_client *client) {
r = dhcp_network_send_udp_socket(client->fd, r = dhcp_network_send_udp_socket(client->fd,
client->lease->server_address, client->lease->server_address,
DHCP_PORT_SERVER, client->server_port,
&release->dhcp, &release->dhcp,
sizeof(DHCPMessage) + optoffset); sizeof(DHCPMessage) + optoffset);
if (r < 0) if (r < 0)
@ -2237,7 +2250,7 @@ int sd_dhcp_client_send_decline(sd_dhcp_client *client) {
r = dhcp_network_send_udp_socket(client->fd, r = dhcp_network_send_udp_socket(client->fd,
client->lease->server_address, client->lease->server_address,
DHCP_PORT_SERVER, client->server_port,
&release->dhcp, &release->dhcp,
sizeof(DHCPMessage) + optoffset); sizeof(DHCPMessage) + optoffset);
if (r < 0) if (r < 0)
@ -2382,6 +2395,7 @@ int sd_dhcp_client_new(sd_dhcp_client **ret, int anonymize) {
.fd = -EBADF, .fd = -EBADF,
.mtu = DHCP_MIN_PACKET_SIZE, .mtu = DHCP_MIN_PACKET_SIZE,
.port = DHCP_PORT_CLIENT, .port = DHCP_PORT_CLIENT,
.server_port = DHCP_PORT_SERVER,
.anonymize = !!anonymize, .anonymize = !!anonymize,
.max_discover_attempts = UINT64_MAX, .max_discover_attempts = UINT64_MAX,
.max_request_attempts = 5, .max_request_attempts = 5,

5
src/network/networkd-dhcp4.c
View file

@ -1634,6 +1634,11 @@ static int dhcp4_configure(Link *link) {
if (r < 0) if (r < 0)
return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to set listen port: %m"); return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to set listen port: %m");
} }
if (link->network->dhcp_port > 0) {
r = sd_dhcp_client_set_port(link->dhcp_client, link->network->dhcp_port);
if (r < 0)
return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to set server port: %m");
}
if (link->network->dhcp_max_attempts > 0) { if (link->network->dhcp_max_attempts > 0) {
r = sd_dhcp_client_set_max_attempts(link->dhcp_client, link->network->dhcp_max_attempts); r = sd_dhcp_client_set_max_attempts(link->dhcp_client, link->network->dhcp_max_attempts);

1
src/network/networkd-network-gperf.gperf
View file

@ -248,6 +248,7 @@ DHCPv4.RouteMetric, config_parse_dhcp_route_metric,
DHCPv4.RouteTable, config_parse_dhcp_or_ra_route_table, AF_INET, 0 DHCPv4.RouteTable, config_parse_dhcp_or_ra_route_table, AF_INET, 0
DHCPv4.UseTimezone, config_parse_bool, 0, offsetof(Network, dhcp_use_timezone) DHCPv4.UseTimezone, config_parse_bool, 0, offsetof(Network, dhcp_use_timezone)
DHCPv4.ListenPort, config_parse_uint16, 0, offsetof(Network, dhcp_client_port) DHCPv4.ListenPort, config_parse_uint16, 0, offsetof(Network, dhcp_client_port)
DHCPv4.ServerPort, config_parse_uint16, 0, offsetof(Network, dhcp_port)
DHCPv4.SendRelease, config_parse_bool, 0, offsetof(Network, dhcp_send_release) DHCPv4.SendRelease, config_parse_bool, 0, offsetof(Network, dhcp_send_release)
DHCPv4.SendDecline, config_parse_bool, 0, offsetof(Network, dhcp_send_decline) DHCPv4.SendDecline, config_parse_bool, 0, offsetof(Network, dhcp_send_decline)
DHCPv4.DenyList, config_parse_in_addr_prefixes, AF_INET, offsetof(Network, dhcp_deny_listed_ip) DHCPv4.DenyList, config_parse_in_addr_prefixes, AF_INET, offsetof(Network, dhcp_deny_listed_ip)

1
src/network/networkd-network.h
View file

@ -132,6 +132,7 @@ struct Network {
usec_t dhcp_fallback_lease_lifetime_usec; usec_t dhcp_fallback_lease_lifetime_usec;
uint32_t dhcp_route_mtu; uint32_t dhcp_route_mtu;
uint16_t dhcp_client_port; uint16_t dhcp_client_port;
uint16_t dhcp_port;
int dhcp_critical; int dhcp_critical;
int dhcp_ip_service_type; int dhcp_ip_service_type;
int dhcp_socket_priority; int dhcp_socket_priority;

3
src/systemd/sd-dhcp-client.h
View file

@ -120,6 +120,9 @@ int sd_dhcp_client_set_max_attempts(
int sd_dhcp_client_set_client_port( int sd_dhcp_client_set_client_port(
sd_dhcp_client *client, sd_dhcp_client *client,
uint16_t port); uint16_t port);
int sd_dhcp_client_set_port(
sd_dhcp_client *client,
uint16_t port);
int sd_dhcp_client_set_hostname( int sd_dhcp_client_set_hostname(
sd_dhcp_client *client, sd_dhcp_client *client,
const char *hostname); const char *hostname);