diff options
Diffstat (limited to 'src/ipcpd')
| -rw-r--r-- | src/ipcpd/ipcp.c | 11 | ||||
| -rw-r--r-- | src/ipcpd/shim-udp/main.c | 2 | 
2 files changed, 7 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, | 
