diff options
| -rw-r--r-- | src/ipcpd/ipcp.c | 11 | ||||
| -rw-r--r-- | src/ipcpd/shim-udp/main.c | 2 | ||||
| -rw-r--r-- | src/irmd/main.c | 1 | ||||
| -rw-r--r-- | src/lib/cdap_req.c | 1 |
4 files changed, 9 insertions, 6 deletions
diff --git a/src/ipcpd/ipcp.c b/src/ipcpd/ipcp.c index 4737b1cd..e86487af 100644 --- a/src/ipcpd/ipcp.c +++ b/src/ipcpd/ipcp.c @@ -222,12 +222,13 @@ static void * ipcp_main_loop(void * o) break; } if (conf_msg->ipcp_type == IPCP_NORMAL) { - conf.addr_size = conf_msg->addr_size; - conf.fd_size = conf_msg->fd_size; - conf.has_ttl = conf_msg->has_ttl; + conf.addr_size = conf_msg->addr_size; + conf.fd_size = conf_msg->fd_size; + conf.has_ttl = conf_msg->has_ttl; conf.addr_auth_type = conf_msg->addr_auth_type; - conf.dt_gam_type = conf_msg->dt_gam_type; - conf.rm_gam_type = conf_msg->rm_gam_type; + conf.dt_gam_type = conf_msg->dt_gam_type; + conf.rm_gam_type = conf_msg->rm_gam_type; + conf.routing_type = conf_msg->routing_type; } if (conf_msg->ipcp_type == IPCP_SHIM_UDP) { diff --git a/src/ipcpd/shim-udp/main.c b/src/ipcpd/shim-udp/main.c index 309e0588..892334b2 100644 --- a/src/ipcpd/shim-udp/main.c +++ b/src/ipcpd/shim-udp/main.c @@ -970,7 +970,7 @@ static int ipcp_udp_flow_alloc(int fd, log_dbg("Flow pending on fd %d, UDP port %d.", fd, ntohs(f_saddr.sin_port)); - return fd; + return 0; } static int ipcp_udp_flow_alloc_resp(int fd, diff --git a/src/irmd/main.c b/src/irmd/main.c index 377cc565..b2e6ba9c 100644 --- a/src/irmd/main.c +++ b/src/irmd/main.c @@ -1320,6 +1320,7 @@ static struct irm_flow * flow_req_arr(pid_t api, return NULL; pthread_rwlock_wrlock(&irmd.reg_lock); + /* FALLTHRU */ case REG_NAME_FLOW_ACCEPT: h_api = reg_entry_get_api(re); if (h_api == -1) { diff --git a/src/lib/cdap_req.c b/src/lib/cdap_req.c index 4eab6fa6..bb11dbf6 100644 --- a/src/lib/cdap_req.c +++ b/src/lib/cdap_req.c @@ -126,6 +126,7 @@ int cdap_req_wait(struct cdap_req * creq) switch(creq->state) { case REQ_DESTROY: ret = -1; + /* FALLTHRU */ case REQ_PENDING: creq->state = REQ_NULL; pthread_cond_broadcast(&creq->cond); |