fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-26 10:00:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

n-dhcp4: re-import git-subtree for 'src/n-dhcp4'

Browse source 
git subtree pull --prefix src/n-dhcp4 git@github.com:nettools/n-dhcp4.git master --squash
This commit is contained in:
Jan Vaclav 2025-10-22 20:09:41 +02:00
commit 191ebb439a
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/n-dhcp4/src/n-dhcp4-c-connection.c
View file

@ -379,6 +379,10 @@ void n_dhcp4_c_connection_get_timeout(NDhcp4CConnection *connection,
*timeoutp = timeout;
}
void n_dhcp4_c_connection_clear_client_ip(NDhcp4CConnection *connection) {
connection->client_ip = INADDR_ANY;
}
static int n_dhcp4_c_connection_packet_broadcast(NDhcp4CConnection *connection,
NDhcp4Outgoing *message) {
int r;

4
src/n-dhcp4/src/n-dhcp4-c-probe.c
View file

@ -198,7 +198,7 @@ _c_public_ void n_dhcp4_client_probe_config_set_init_reboot(NDhcp4ClientProbeCon
*
* This sets the DSCP property of the configuration object, which specifies
* the DSCP value to set in the first six bits of the DS field in the IPv4
* header. If this function is not called, the DSCP will be set to CS0.
* header. If this function is not called, the DSCP will be set to CS0 (0).
*/
_c_public_ void n_dhcp4_client_probe_config_set_dscp(NDhcp4ClientProbeConfig *config, uint8_t dscp) {
config->dscp = dscp & 0x3F;
@ -703,6 +703,8 @@ static int n_dhcp4_client_probe_transition_deferred(NDhcp4ClientProbe *probe, ui
switch (probe->state) {
case N_DHCP4_CLIENT_PROBE_STATE_INIT:
/* reset client IP (CIADDR) */
n_dhcp4_c_connection_clear_client_ip(&probe->connection);
r = n_dhcp4_c_connection_listen(&probe->connection);
if (r)
return r;

2
src/n-dhcp4/src/n-dhcp4-private.h
View file

@ -617,6 +617,8 @@ void n_dhcp4_c_connection_close(NDhcp4CConnection *connection);
void n_dhcp4_c_connection_get_timeout(NDhcp4CConnection *connection,
uint64_t *timeoutp);
void n_dhcp4_c_connection_clear_client_ip(NDhcp4CConnection *connection);
int n_dhcp4_c_connection_discover_new(NDhcp4CConnection *connection,
NDhcp4Outgoing **request);
int n_dhcp4_c_connection_select_new(NDhcp4CConnection *connection,