From 9ae0dcb47d71803681a205c4708be82d27111443 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Fri, 30 Apr 2010 14:37:17 -0500 Subject: ppp: get rid of ppp_enter_phase This function simply didn't have the context of why the phase was being entered. Instead have each protocol notify GAtPPP as to what is happening. We already had this more or less for IPCP and AUTH events, this just now formalizes it for LCP as well. --- gatchat/ppp_ipcp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gatchat/ppp_ipcp.c') diff --git a/gatchat/ppp_ipcp.c b/gatchat/ppp_ipcp.c index 7402f9a9..a1eacdfc 100644 --- a/gatchat/ppp_ipcp.c +++ b/gatchat/ppp_ipcp.c @@ -135,7 +135,7 @@ static void ipcp_up(struct pppcp_data *pppcp) addr.s_addr = ipcp->dns2; inet_ntop(AF_INET, &addr, dns2, INET_ADDRSTRLEN); - ppp_net_up_notify(pppcp_get_ppp(pppcp), ip[0] ? ip : NULL, + ppp_ipcp_up_notify(pppcp_get_ppp(pppcp), ip[0] ? ip : NULL, dns1[0] ? dns1 : NULL, dns2[0] ? dns2 : NULL); } @@ -146,11 +146,12 @@ static void ipcp_down(struct pppcp_data *pppcp) ipcp_reset_config_options(ipcp); pppcp_set_local_options(pppcp, ipcp->options, ipcp->options_len); - ppp_net_down_notify(pppcp_get_ppp(pppcp)); + ppp_ipcp_down_notify(pppcp_get_ppp(pppcp)); } static void ipcp_finished(struct pppcp_data *pppcp) { + ppp_ipcp_finished_notify(pppcp_get_ppp(pppcp)); } static void ipcp_rca(struct pppcp_data *pppcp, -- cgit v1.2.3