diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ipcpd/common/connmgr.c | 2 | ||||
| -rw-r--r-- | src/lib/dev.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ipcpd/common/connmgr.c b/src/ipcpd/common/connmgr.c index 4b5fd420..aa9f043e 100644 --- a/src/ipcpd/common/connmgr.c +++ b/src/ipcpd/common/connmgr.c @@ -179,6 +179,8 @@ static void * flow_acceptor(void * o) continue; } + fccntl(fd, FLOWSRCVTIMEO, NULL); + err = add_comp_conn(id, fd, qs, &rcv_info); if (err < 0) { log_err("Failed to add new connection: %d.", err); diff --git a/src/lib/dev.c b/src/lib/dev.c index 9df5fd46..6c8fdbc1 100644 --- a/src/lib/dev.c +++ b/src/lib/dev.c @@ -372,7 +372,7 @@ static void _flow_keepalive(struct flow * flow) timeo = flow->info.qs.timeout; acl = shm_rbuff_get_acl(flow->rx_rb); - if (timeo == 0 || acl & (ACL_FLOWPEER | ACL_FLOWDOWN)) + if (timeo == 0 || acl & (ACL_FLOWPEER | ACL_FLOWDOWN)) return; clock_gettime(PTHREAD_COND_CLOCK, &now); @@ -1895,6 +1895,7 @@ int ipcp_flow_req_arr(const buffer_t * dst, flow.n_1_pid = flow.n_pid; flow.n_pid = getpid(); flow.mpl = 0; + flow.qs = qos_np1; return flow_init(&flow, NULL); } @@ -2006,7 +2007,7 @@ int np1_flow_read(int fd, pthread_rwlock_rdlock(&ai.lock); - idx = shm_rbuff_read(flow->rx_rb);; + idx = shm_rbuff_read(flow->rx_rb); if (idx < 0) { pthread_rwlock_unlock(&ai.lock); return idx; |