Skip to content

P
PPSi
Commit 67870053 authored by Aurelio Colosimo's avatar Aurelio Colosimo Committed by Alessandro Rubini
Browse files
Options

time-unix/unix-socket.c: correctly handle fd's in select when invalid (-1) 

In case a port is inactive, its fd is not valid, so do not handle it
in select.
Signed-off-by: Aurelio Colosimo's avatarAurelio Colosimo <aurelio@aureliocolosimo.it>
parent c0ae706a
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 3 deletions
time-unix/unix-socket.c
View file @ 67870053
......@@ -406,7 +406,7 @@ int unix_net_check_pkt(struct pp_globals *ppg, int delay_ms)
fd_set set;
int i, j;
int ret = 0;
int maxfd = 0;
int maxfd = -1;
struct unix_arch_data *arch_data = POSIX_ARCH(ppg);
int old_delay_ms;
......@@ -436,6 +436,10 @@ int unix_net_check_pkt(struct pp_globals *ppg, int delay_ms)
if (ppi->ethernet_mode) {
fd_to_set = NP(ppi)->ch[PP_NP_GEN].fd;
if (fd_to_set < 0)
continue;
FD_SET(fd_to_set, &set);
maxfd = fd_to_set > maxfd ? fd_to_set : maxfd;
continue;
......@@ -451,6 +455,11 @@ int unix_net_check_pkt(struct pp_globals *ppg, int delay_ms)
maxfd = fd_to_set > maxfd ? fd_to_set : maxfd;
}
if (maxfd < 0) {
usleep(1000 * delay_ms);
return 0;
}
i = select(maxfd + 1, &set, NULL, NULL, &arch_data->tv);
if (i < 0 && errno != EINTR)
......@@ -464,13 +473,16 @@ int unix_net_check_pkt(struct pp_globals *ppg, int delay_ms)
for (j = 0; j < ppg->nlinks; j++) {
struct pp_instance *ppi = &ppg->pp_instances[j];
int fd = NP(ppi)->ch[PP_NP_GEN].fd;
if (FD_ISSET(NP(ppi)->ch[PP_NP_GEN].fd, &set)) {
if (fd >= 0 && FD_ISSET(fd, &set)) {
ret++;
NP(ppi)->ch[PP_NP_GEN].pkt_present = 1;
}
if (FD_ISSET(NP(ppi)->ch[PP_NP_EVT].fd, &set)) {
fd = NP(ppi)->ch[PP_NP_EVT].fd;
if (fd >= 0 && FD_ISSET(fd, &set)) {
ret++;
NP(ppi)->ch[PP_NP_EVT].pkt_present = 1;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment