diff options
| author | Kozlov Dmitry <xeb@mail.ru> | 2013-01-25 00:01:13 +0400 |
|---|---|---|
| committer | Kozlov Dmitry <xeb@mail.ru> | 2013-01-25 00:01:13 +0400 |
| commit | 5be67a04fe1a4185732bf8dd143873b1c1553df3 (patch) | |
| tree | 178a4af4ed379b15008fad5f8cfef0d435284570 /accel-pppd/session.c | |
| parent | beab958fd001b41fb819c68d41c7fd0a89979ca2 (diff) | |
| download | accel-ppp-5be67a04fe1a4185732bf8dd143873b1c1553df3.tar.gz accel-ppp-5be67a04fe1a4185732bf8dd143873b1c1553df3.zip | |
Revert "altered session finishing procedure"
This reverts commit 9f4f36169f03857b6910402028717210270a0339.
Diffstat (limited to 'accel-pppd/session.c')
| -rw-r--r-- | accel-pppd/session.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/accel-pppd/session.c b/accel-pppd/session.c index 1fd0075c..51264f88 100644 --- a/accel-pppd/session.c +++ b/accel-pppd/session.c @@ -125,6 +125,10 @@ void __export ap_session_finished(struct ap_session *ses) { ses->terminated = 1; + ap_session_read_stats(ses, NULL); + + triton_event_fire(EV_SES_PRE_FINISHED, ses); + pthread_rwlock_wrlock(&ses_lock); list_del(&ses->entry); pthread_rwlock_unlock(&ses_lock); @@ -202,11 +206,10 @@ void __export ap_session_terminate(struct ap_session *ses, int cause, int hard) log_ppp_debug("terminate\n"); ap_session_ifdown(ses); - ap_session_read_stats(ses, NULL); + triton_event_fire(EV_SES_FINISHING, ses); + ses->ctrl->terminate(ses, hard); - - triton_event_fire(EV_SES_FINISHING, ses); } void ap_shutdown_soft(void (*cb)(void)) |