mirrors/dhcpcd
0
0
Fork 0
mirror of https://github.com/rsmarples/dhcpcd.git synced 2024-12-12 19:33:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

When polling and interupted, continue as the signal will then be in our pipe.

Browse Source
This commit is contained in:
Roy Marples 2008-02-11 21:43:34 +00:00
parent 0ee2469dc7
commit 1f765cc21b
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client.c
View File

@ -500,6 +500,10 @@ static int wait_for_packet (struct pollfd *fds, state_t *state,
timeout = TIMEOUT_MINI_INF; timeout = TIMEOUT_MINI_INF;
retval = poll (fds, 2, timeout * 1000); retval = poll (fds, 2, timeout * 1000);
if (retval == -1 && errno == EINTR) {
retval = 0;
continue;
}
if (retval == 0) if (retval == 0)
_send_message (state, state->last_type, _send_message (state, state->last_type,
options); options);
@ -530,8 +534,12 @@ static int wait_for_packet (struct pollfd *fds, state_t *state,
} }
timeout *= 1000; timeout *= 1000;
state->start = uptime (); state->start = uptime ();
retval = poll (fds, iface->fd == -1 ? 1 : 2, timeout); retval = poll (fds, 2, timeout);
state->timeout -= uptime () - state->start; state->timeout -= uptime () - state->start;
if (retval == -1 && errno == EINTR) {
retval = 0;
continue;
}
if (retval == 0 && iface->fd != -1 && state->timeout > 0) if (retval == 0 && iface->fd != -1 && state->timeout > 0)
_send_message (state, state->last_type, options); _send_message (state, state->last_type, options);
} }
@ -1039,7 +1047,7 @@ int dhcp_run (const options_t *options, int *pidfd)
interface_t *iface; interface_t *iface;
state_t *state = NULL; state_t *state = NULL;
struct pollfd fds[] = { struct pollfd fds[] = {
{ -1, POLLIN, 0 }, { -1, POLLIN | POLLERR | POLLPRI | POLLOUT | POLLERR | POLLHUP | POLLNVAL, 0 },
{ -1, POLLIN, 0 } { -1, POLLIN, 0 }
}; };
int retval = -1; int retval = -1;

1
signal.c
View File

@ -88,7 +88,6 @@ int signal_read (struct pollfd *fd)
int sig = -1; int sig = -1;
/* Pop a signal off the our stack */ /* Pop a signal off the our stack */
if (signals[0]) { if (signals[0]) {
unsigned int i = 0; unsigned int i = 0;
sig = signals[0]; sig = signals[0];