diff options
| author | Kozlov Dmitry <xeb@mail.ru> | 2012-07-11 17:00:06 +0400 |
|---|---|---|
| committer | Kozlov Dmitry <xeb@mail.ru> | 2012-07-11 17:00:20 +0400 |
| commit | 578cf993e5cb4eee4efb4d62f28e6c6b36697498 (patch) | |
| tree | 79c176b6e1622c70e826c4134175d7a5dce36482 | |
| parent | 7b4edf7fe4bd0e20979fdb39ff851b13b55d1acf (diff) | |
| parent | 1c11bdd4467dcd7a2266994eda344b546f962aaa (diff) | |
| download | accel-ppp-578cf993e5cb4eee4efb4d62f28e6c6b36697498.tar.gz accel-ppp-578cf993e5cb4eee4efb4d62f28e6c6b36697498.zip | |
Merge commit 1c11bdd4467dcd7a2266994eda344b546f962aaa
| -rw-r--r-- | accel-pppd/logs/log_file.c | 1 | ||||
| -rw-r--r-- | accel-pppd/ppp/ppp_ccp.c | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/accel-pppd/logs/log_file.c b/accel-pppd/logs/log_file.c index 1da3ee3..60d8eee 100644 --- a/accel-pppd/logs/log_file.c +++ b/accel-pppd/logs/log_file.c @@ -514,7 +514,6 @@ static void ev_ses_authorized1(struct ap_session *ses) out_err: _free(fname); - list_del(&lpd->pd.entry); free_lpd(lpd); } diff --git a/accel-pppd/ppp/ppp_ccp.c b/accel-pppd/ppp/ppp_ccp.c index 058e7b3..cddc78d 100644 --- a/accel-pppd/ppp/ppp_ccp.c +++ b/accel-pppd/ppp/ppp_ccp.c @@ -139,6 +139,8 @@ int ccp_layer_start(struct ppp_layer_data_t *ld) log_ppp_debug("ccp_layer_start\n"); + ccp_set_flags(ccp->ppp->unit_fd, 0, 0); + if (list_empty(&ccp->options) || !conf_ccp) { ccp->started = 1; ppp_layer_started(ccp->ppp, &ccp->ld); @@ -180,9 +182,6 @@ void ccp_layer_free(struct ppp_layer_data_t *ld) struct ppp_ccp_t *ccp = container_of(ld, typeof(*ccp), ld); log_ppp_debug("ccp_layer_free\n"); - - if (ccp->ppp->unit_fd != -1) - ccp_set_flags(ccp->ppp->unit_fd, 0, 0); ppp_unregister_handler(ccp->ppp, &ccp->hnd); ccp_options_free(ccp); |