sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

ppp: transition to dead when read io destroyed 

remove call to signal_close for lcp object, it is redundent.  If
our io is destroyed we are dead, so transition the ppp phase to
DEAD so our disconnect callback can be called.
This commit is contained in:
Kristen Carlson Accardi 2010-04-29 11:03:09 -07:00 committed by Denis Kenzior
parent c9edf56fc6
commit 9d5eb5110f
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gatchat/gatppp.c
View File

@ -180,7 +180,6 @@ void ppp_enter_phase(GAtPPP *ppp, enum ppp_phase phase)
case PPP_PHASE_TERMINATION:
pppcp_signal_down(ppp->ipcp);
pppcp_signal_close(ppp->ipcp);
pppcp_signal_close(ppp->lcp);
break;
case PPP_PHASE_DEAD:
ppp_dead(ppp);
@ -269,6 +268,7 @@ static void io_disconnect(gpointer user_data)
GAtPPP *ppp = user_data;
pppcp_signal_down(ppp->lcp);
ppp_enter_phase(ppp, PPP_PHASE_DEAD);
}
/* Administrative Open */

2
gatchat/ppp_cp.c
View File

@ -523,6 +523,7 @@ static void pppcp_send_terminate_ack(struct pppcp_data *data,
{
struct pppcp_packet *packet;
struct pppcp_packet *pppcp_header = (struct pppcp_packet *) request;
struct pppcp_timer_data *timer_data = &data->terminate_timer_data;
pppcp_trace(data);
@ -535,6 +536,7 @@ static void pppcp_send_terminate_ack(struct pppcp_data *data,
ntohs(pppcp_header->length));
pppcp_packet_free(packet);
pppcp_start_timer(timer_data);
}
/*