diff options
| author | Kozlov Dmitry <dima@server> | 2011-08-16 13:08:54 +0400 |
|---|---|---|
| committer | Kozlov Dmitry <dima@server> | 2011-08-16 13:08:54 +0400 |
| commit | 2f48232a6f2fcba1707aa772e571aced765aff91 (patch) | |
| tree | 84762d356f02ac22500c05150ff9b67be27c9f83 /accel-pppd/ppp/ppp_ccp.c | |
| parent | c2cd908d15d70219b7154653ab088837d4c9613a (diff) | |
| download | accel-ppp-2f48232a6f2fcba1707aa772e571aced765aff91.tar.gz accel-ppp-2f48232a6f2fcba1707aa772e571aced765aff91.zip | |
ppp: improved CCP/IPCP handling
Diffstat (limited to 'accel-pppd/ppp/ppp_ccp.c')
| -rw-r--r-- | accel-pppd/ppp/ppp_ccp.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/accel-pppd/ppp/ppp_ccp.c b/accel-pppd/ppp/ppp_ccp.c index e59a0638..fd5a1f76 100644 --- a/accel-pppd/ppp/ppp_ccp.c +++ b/accel-pppd/ppp/ppp_ccp.c @@ -32,6 +32,7 @@ static LIST_HEAD(option_handlers); static void ccp_layer_up(struct ppp_fsm_t*); static void ccp_layer_down(struct ppp_fsm_t*); +static void ccp_layer_finished(struct ppp_fsm_t*); static int send_conf_req(struct ppp_fsm_t*); static void send_conf_ack(struct ppp_fsm_t*); static void send_conf_nak(struct ppp_fsm_t*); @@ -116,7 +117,8 @@ static struct ppp_layer_data_t *ccp_layer_init(struct ppp_t *ppp) ccp->fsm.max_configure = conf_ccp_max_configure; ccp->fsm.layer_up = ccp_layer_up; - ccp->fsm.layer_finished = ccp_layer_down; + ccp->fsm.layer_finished = ccp_layer_finished; + ccp->fsm.layer_down = ccp_layer_down; ccp->fsm.send_conf_req = send_conf_req; ccp->fsm.send_conf_ack = send_conf_ack; ccp->fsm.send_conf_nak = send_conf_nak; @@ -199,7 +201,7 @@ static void ccp_layer_up(struct ppp_fsm_t *fsm) } } -static void ccp_layer_down(struct ppp_fsm_t *fsm) +static void ccp_layer_finished(struct ppp_fsm_t *fsm) { struct ppp_ccp_t *ccp = container_of(fsm, typeof(*ccp), fsm); @@ -207,11 +209,20 @@ static void ccp_layer_down(struct ppp_fsm_t *fsm) if (!ccp->started) { ccp->started = 1; - ppp_fsm_close(fsm); ppp_layer_started(ccp->ppp, &ccp->ld); } } +static void ccp_layer_down(struct ppp_fsm_t *fsm) +{ + struct ppp_ccp_t *ccp = container_of(fsm, typeof(*ccp), fsm); + + log_ppp_debug("ccp_layer_down\n"); + + ppp_fsm_close(fsm); +} + + static void print_ropt(struct recv_opt_t *ropt) { int i; @@ -644,9 +655,9 @@ static void ccp_recv(struct ppp_handler_t*h) case CONFREQ: r = ccp_recv_conf_req(ccp, (uint8_t*)(hdr + 1), ntohs(hdr->len) - PPP_HDRLEN); if (ccp->passive) { + ccp->passive = 0; ppp_fsm_lower_up(&ccp->fsm); ppp_fsm_open(&ccp->fsm); - ccp->passive = 0; } if (ccp->started) { if (r == CCP_OPT_ACK) |