general preparation for IPoE integration

1 files changed, 12 insertions, 12 deletions

diff --git a/accel-pppd/auth/auth_chap_md5.c b/accel-pppd/auth/auth_chap_md5.c
index 4b8206b..a43081d 100644
--- a/accel-pppd/auth/auth_chap_md5.c
+++ b/accel-pppd/auth/auth_chap_md5.c
@@ -163,7 +163,7 @@ static void chap_timeout_timer(struct triton_timer_t *t)
 
 	if (++d->failure == conf_max_failure) {
 		if (d->started)
-			ppp_terminate(d->ppp, TERM_USER_ERROR, 0);
+			ap_session_terminate(&d->ppp->ses, TERM_USER_ERROR, 0);
 		else
 			ppp_auth_failed(d->ppp, NULL);
 	} else {
@@ -248,7 +248,7 @@ static void chap_send_challenge(struct chap_auth_data_t *ad, int new)
 	ppp_chan_send(ad->ppp, &msg, ntohs(msg.hdr.len) + 2);
 
 	if (conf_timeout && !ad->timeout.tpd)
-		triton_timer_add(ad->ppp->ctrl->ctx, &ad->timeout, 0);
+		triton_timer_add(ad->ppp->ses.ctrl->ctx, &ad->timeout, 0);
 }
 
 static void chap_recv_response(struct chap_auth_data_t *ad, struct chap_hdr_t *hdr)
@@ -281,7 +281,7 @@ static void chap_recv_response(struct chap_auth_data_t *ad, struct chap_hdr_t *h
 		log_ppp_error("chap-md5: incorrect value-size (%i)\n", msg->val_size);
 		chap_send_failure(ad);
 		if (ad->started)
-			ppp_terminate(ad->ppp, TERM_USER_ERROR, 0);
+			ap_session_terminate(&ad->ppp->ses, TERM_USER_ERROR, 0);
 		else
 			ppp_auth_failed(ad->ppp, NULL);
 		return;
@@ -292,7 +292,7 @@ static void chap_recv_response(struct chap_auth_data_t *ad, struct chap_hdr_t *h
 	if (conf_any_login) {
 		if (ppp_auth_successed(ad->ppp, name)) {
 			chap_send_failure(ad);
-			ppp_terminate(ad->ppp, TERM_AUTH_ERROR, 0);
+			ap_session_terminate(&ad->ppp->ses, TERM_AUTH_ERROR, 0);
 			_free(name);
 			return;
 		}
@@ -301,10 +301,10 @@ static void chap_recv_response(struct chap_auth_data_t *ad, struct chap_hdr_t *h
 		return;
 	}
 
-	r = pwdb_check(ad->ppp, name, PPP_CHAP, CHAP_MD5, ad->id, ad->val, VALUE_SIZE, msg->val);
+	r = pwdb_check(&ad->ppp->ses, name, PPP_CHAP, CHAP_MD5, ad->id, ad->val, VALUE_SIZE, msg->val);
 
 	if (r == PWDB_NO_IMPL) {
-		passwd = pwdb_get_passwd(ad->ppp,name);
+		passwd = pwdb_get_passwd(&ad->ppp->ses, name);
 		if (!passwd)
 		{
 			_free(name);
@@ -326,7 +326,7 @@ static void chap_recv_response(struct chap_auth_data_t *ad, struct chap_hdr_t *h
 				log_ppp_warn("chap-md5: challenge response mismatch\n");
 			chap_send_failure(ad);
 			if (ad->started)
-				ppp_terminate(ad->ppp, TERM_USER_ERROR, 0);
+				ap_session_terminate(&ad->ppp->ses, TERM_USER_ERROR, 0);
 			else
 				ppp_auth_failed(ad->ppp, name);
 			_free(name);
@@ -334,13 +334,13 @@ static void chap_recv_response(struct chap_auth_data_t *ad, struct chap_hdr_t *h
 			if (!ad->started) {
 				if (ppp_auth_successed(ad->ppp, name)) {
 					chap_send_failure(ad);
-					ppp_terminate(ad->ppp, TERM_AUTH_ERROR, 0);
+					ap_session_terminate(&ad->ppp->ses, TERM_AUTH_ERROR, 0);
 					_free(name);
 				} else {
 					chap_send_success(ad);
 					ad->started = 1;
 					if (conf_interval)
-						triton_timer_add(ad->ppp->ctrl->ctx, &ad->interval, 0);
+						triton_timer_add(ad->ppp->ses.ctrl->ctx, &ad->interval, 0);
 				}
 			} else
 				_free(name);
@@ -349,7 +349,7 @@ static void chap_recv_response(struct chap_auth_data_t *ad, struct chap_hdr_t *h
 	} else if (r == PWDB_DENIED) {
 		chap_send_failure(ad);
 		if (ad->started)
-			ppp_terminate(ad->ppp, TERM_USER_ERROR, 0);
+			ap_session_terminate(&ad->ppp->ses, TERM_USER_ERROR, 0);
 		else
 			ppp_auth_failed(ad->ppp, name);
 		_free(name);
@@ -357,13 +357,13 @@ static void chap_recv_response(struct chap_auth_data_t *ad, struct chap_hdr_t *h
 		if (!ad->started) {
 			if (ppp_auth_successed(ad->ppp, name)) {
 				chap_send_failure(ad);
-				ppp_terminate(ad->ppp, TERM_AUTH_ERROR, 0);
+				ap_session_terminate(&ad->ppp->ses, TERM_AUTH_ERROR, 0);
 				_free(name);
 			} else {
 				chap_send_success(ad);
 				ad->started = 1;
 				if (conf_interval)
-					triton_timer_add(ad->ppp->ctrl->ctx, &ad->interval, 0);
+					triton_timer_add(ad->ppp->ses.ctrl->ctx, &ad->interval, 0);
 			}
 		} else {
 			chap_send_success(ad);