release IP addresses before fire EV_SESSION_FINISHED (fixes segfault when using IPoE)

4 files changed, 0 insertions, 20 deletions

diff --git a/accel-pppd/ppp/ipcp_opt_ipaddr.c b/accel-pppd/ppp/ipcp_opt_ipaddr.c
index e5246d55..8a77848e 100644
--- a/accel-pppd/ppp/ipcp_opt_ipaddr.c
+++ b/accel-pppd/ppp/ipcp_opt_ipaddr.c
@@ -58,11 +58,6 @@ static void ipaddr_free(struct ppp_ipcp_t *ipcp, struct ipcp_option_t *opt)
 {
 	struct ipaddr_option_t *ipaddr_opt = container_of(opt, typeof(*ipaddr_opt), opt);
 
-	if (ipcp->ppp->ses.ipv4) {
-		ipdb_put_ipv4(&ipcp->ppp->ses, ipcp->ppp->ses.ipv4);
-		ipcp->ppp->ses.ipv4 = NULL;
-	}
-
 	_free(ipaddr_opt);
 }
 
diff --git a/accel-pppd/ppp/ipv6cp_opt_intfid.c b/accel-pppd/ppp/ipv6cp_opt_intfid.c
index 11b35ff7..d2b8127a 100644
--- a/accel-pppd/ppp/ipv6cp_opt_intfid.c
+++ b/accel-pppd/ppp/ipv6cp_opt_intfid.c
@@ -108,11 +108,6 @@ static void ipaddr_free(struct ppp_ipv6cp_t *ipv6cp, struct ipv6cp_option_t *opt
 {
 	struct ipaddr_option_t *ipaddr_opt=container_of(opt,typeof(*ipaddr_opt),opt);
 
-	if (ipv6cp->ppp->ses.ipv6) {
-		ipdb_put_ipv6(&ipv6cp->ppp->ses, ipv6cp->ppp->ses.ipv6);
-		ipv6cp->ppp->ses.ipv6 = NULL;
-	}
-
 	_free(ipaddr_opt);
 }
 
diff --git a/accel-pppd/ppp/ppp_ipcp.c b/accel-pppd/ppp/ppp_ipcp.c
index c05e20b1..6cb86a4b 100644
--- a/accel-pppd/ppp/ppp_ipcp.c
+++ b/accel-pppd/ppp/ppp_ipcp.c
@@ -209,11 +209,6 @@ static void ipcp_layer_finished(struct ppp_fsm_t *fsm)
 		ap_session_terminate(&ipcp->ppp->ses, TERM_USER_ERROR, 0);
 	
 	fsm->fsm_state = FSM_Closed;
-	
-	if (ipcp->ppp->ses.ipv4) {
-		ipdb_put_ipv4(&ipcp->ppp->ses, ipcp->ppp->ses.ipv4);
-		ipcp->ppp->ses.ipv4 = NULL;
-	}
 }
 
 static void ipcp_layer_down(struct ppp_fsm_t *fsm)
diff --git a/accel-pppd/ppp/ppp_ipv6cp.c b/accel-pppd/ppp/ppp_ipv6cp.c
index ee666267..9a879227 100644
--- a/accel-pppd/ppp/ppp_ipv6cp.c
+++ b/accel-pppd/ppp/ppp_ipv6cp.c
@@ -209,11 +209,6 @@ static void ipv6cp_layer_finished(struct ppp_fsm_t *fsm)
 		ap_session_terminate(&ipv6cp->ppp->ses, TERM_USER_ERROR, 0);
 	
 	fsm->fsm_state = FSM_Closed;
-
-	if (ipv6cp->ppp->ses.ipv6) {
-		ipdb_put_ipv6(&ipv6cp->ppp->ses, ipv6cp->ppp->ses.ipv6);
-		ipv6cp->ppp->ses.ipv6 = NULL;
-	}
 }
 
 static void ipv6cp_layer_down(struct ppp_fsm_t *fsm)