From d5c963f5d8db3f5509e2b9b6ad2acaf87ca142c9 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Mon, 28 Jun 2010 11:15:44 -0500 Subject: [PATCH] ppp: Simplify the logic by re-using code --- gatchat/ppp_ipcp.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/gatchat/ppp_ipcp.c b/gatchat/ppp_ipcp.c index 2abab850..9eec0591 100644 --- a/gatchat/ppp_ipcp.c +++ b/gatchat/ppp_ipcp.c @@ -135,18 +135,13 @@ void ipcp_set_server_info(struct pppcp_data *pppcp, guint32 local_addr, { struct ipcp_data *ipcp = pppcp_get_data(pppcp); - if (local_addr != 0) - ipcp->req_options = REQ_OPTION_IPADDR; - else - ipcp->req_options = 0; - ipcp->local_addr = local_addr; ipcp->peer_addr = peer_addr; ipcp->dns1 = dns1; ipcp->dns2 = dns2; ipcp->is_server = TRUE; - ipcp_generate_config_options(ipcp); + ipcp_reset_server_config_options(ipcp); pppcp_set_local_options(pppcp, ipcp->options, ipcp->options_len); }