colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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:
Beniamino Galvani
2023-06-12 14:10:08 +02:00
parent 8dfca3d552 90b0404e8d
commit b8bbcea744
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/n-dhcp4/src/n-dhcp4-c-connection.c
View File

@@ -152,6 +152,7 @@ int n_dhcp4_c_connection_listen(NDhcp4CConnection *connection) {
if (connection->fd_packet >= 0) { if (connection->fd_packet >= 0) {
epoll_ctl(connection->fd_epoll, EPOLL_CTL_DEL, connection->fd_packet, NULL); epoll_ctl(connection->fd_epoll, EPOLL_CTL_DEL, connection->fd_packet, NULL);
connection->fd_packet = c_close(connection->fd_packet); connection->fd_packet = c_close(connection->fd_packet);
connection->ns_drain_timeout = 0;
} }
if (connection->fd_udp >= 0) { if (connection->fd_udp >= 0) {
@@ -211,6 +212,7 @@ int n_dhcp4_c_connection_connect(NDhcp4CConnection *connection,
} }
connection->state = N_DHCP4_C_CONNECTION_STATE_DRAINING; connection->state = N_DHCP4_C_CONNECTION_STATE_DRAINING;
connection->ns_drain_timeout = n_dhcp4_gettime(CLOCK_BOOTTIME) + UINT64_C(10000000000);
connection->fd_udp = fd_udp; connection->fd_udp = fd_udp;
fd_udp = -1; fd_udp = -1;
connection->client_ip = client->s_addr; connection->client_ip = client->s_addr;
@@ -231,6 +233,7 @@ void n_dhcp4_c_connection_close(NDhcp4CConnection *connection) {
connection->fd_epoll = -1; connection->fd_epoll = -1;
connection->state = N_DHCP4_C_CONNECTION_STATE_CLOSED; connection->state = N_DHCP4_C_CONNECTION_STATE_CLOSED;
connection->ns_drain_timeout = 0;
} }
static int n_dhcp4_c_connection_verify_incoming(NDhcp4CConnection *connection, static int n_dhcp4_c_connection_verify_incoming(NDhcp4CConnection *connection,
@@ -325,7 +328,7 @@ void n_dhcp4_c_connection_get_timeout(NDhcp4CConnection *connection,
size_t n_send; size_t n_send;
if (!connection->request) { if (!connection->request) {
*timeoutp = 0; *timeoutp = connection->ns_drain_timeout;
return; return;
} }
@@ -369,6 +372,9 @@ void n_dhcp4_c_connection_get_timeout(NDhcp4CConnection *connection,
c_assert(0); c_assert(0);
} }
if (connection->ns_drain_timeout != 0 && connection->ns_drain_timeout < timeout)
timeout = connection->ns_drain_timeout;
*timeoutp = timeout; *timeoutp = timeout;
} }
@@ -1122,6 +1128,13 @@ int n_dhcp4_c_connection_dispatch_timer(NDhcp4CConnection *connection,
uint64_t timeout; uint64_t timeout;
int r; int r;
if (connection->ns_drain_timeout != 0 && connection->ns_drain_timeout < timestamp) {
epoll_ctl(connection->fd_epoll, EPOLL_CTL_DEL, connection->fd_packet, NULL);
connection->fd_packet = c_close(connection->fd_packet);
connection->state = N_DHCP4_C_CONNECTION_STATE_UDP;
connection->ns_drain_timeout = 0;
}
if (!connection->request) if (!connection->request)
return 0; return 0;
@@ -1189,6 +1202,7 @@ int n_dhcp4_c_connection_dispatch_io(NDhcp4CConnection *connection,
c_assert(!r); c_assert(!r);
connection->fd_packet = c_close(connection->fd_packet); connection->fd_packet = c_close(connection->fd_packet);
connection->state = N_DHCP4_C_CONNECTION_STATE_UDP; connection->state = N_DHCP4_C_CONNECTION_STATE_UDP;
connection->ns_drain_timeout = 0;
/* fall-through */ /* fall-through */
case N_DHCP4_C_CONNECTION_STATE_UDP: case N_DHCP4_C_CONNECTION_STATE_UDP:

1
src/n-dhcp4/src/n-dhcp4-private.h
View File

@@ -331,6 +331,7 @@ struct NDhcp4CConnection {
NDhcp4Outgoing *request; /* current request */ NDhcp4Outgoing *request; /* current request */
uint64_t ns_drain_timeout; /* timeout for closing packet socket */
uint32_t client_ip; /* client IP address, or 0 */ uint32_t client_ip; /* client IP address, or 0 */
uint32_t server_ip; /* server IP address, or 0 */ uint32_t server_ip; /* server IP address, or 0 */
uint16_t mtu; /* client mtu, or 0 */ uint16_t mtu; /* client mtu, or 0 */