summaryrefslogtreecommitdiffstats
path: root/gatchat/ppp_lcp.c
diff options
context:
space:
mode:
authorDenis Kenzior <denkenz@gmail.com>2010-04-13 14:11:44 -0500
committerDenis Kenzior <denkenz@gmail.com>2010-04-13 14:21:12 -0500
commitfed99b926553bfec68afa65663e4148172eb12ec (patch)
tree463479bf03b31903c74f4f4e34c0d95ac5c675e2 /gatchat/ppp_lcp.c
parent552db428ef06f1dfd650bcb549dda93a743640eb (diff)
downloadofono-fed99b926553bfec68afa65663e4148172eb12ec.tar.bz2
ppp: Transition the phase directly
Use of the generate event function, while more 'pure' with regard to how the spec views transitions, actually makes code more difficult to read. Instead use phase transitions directly inside gatppp. This still bleeds through a little into lcp code, and probably should be fixed in a better way eventually.
Diffstat (limited to 'gatchat/ppp_lcp.c')
-rw-r--r--gatchat/ppp_lcp.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/gatchat/ppp_lcp.c b/gatchat/ppp_lcp.c
index daa39071..802209eb 100644
--- a/gatchat/ppp_lcp.c
+++ b/gatchat/ppp_lcp.c
@@ -103,7 +103,7 @@ static void lcp_reset_config_options(struct lcp_data *lcp)
*/
static void lcp_up(struct pppcp_data *pppcp)
{
- ppp_generate_event(pppcp_get_ppp(pppcp), PPP_OPENED);
+ ppp_enter_phase(pppcp_get_ppp(pppcp), PPP_PHASE_AUTHENTICATION);
}
/*
@@ -115,6 +115,7 @@ static void lcp_down(struct pppcp_data *pppcp)
lcp_reset_config_options(lcp);
pppcp_set_local_options(pppcp, lcp->options, lcp->options_len);
+ ppp_enter_phase(pppcp_get_ppp(pppcp), PPP_PHASE_TERMINATION);
}
/*
@@ -123,7 +124,7 @@ static void lcp_down(struct pppcp_data *pppcp)
*/
static void lcp_finished(struct pppcp_data *pppcp)
{
- ppp_generate_event(pppcp_get_ppp(pppcp), PPP_DOWN);
+ ppp_enter_phase(pppcp_get_ppp(pppcp), PPP_PHASE_DEAD);
}
static void lcp_rca(struct pppcp_data *pppcp, const struct pppcp_packet *packet)