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

Remove PPP event_queue handling and process events directly

This commit is contained in:
Marcel Holtmann 2010-04-01 20:26:24 -07:00
parent cdc1e3c31b
commit 7d6649680f
3 changed files with 27 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gatchat/gatppp.c
View File

@ -145,9 +145,6 @@ GAtPPP *g_at_ppp_new(GIOChannel *modem)
ppp->pfc = FALSE; ppp->pfc = FALSE;
ppp->acfc = FALSE; ppp->acfc = FALSE;
/* allocate the queues */
ppp->event_queue = g_queue_new();
ppp->index = 0; ppp->index = 0;
/* initialize the lcp state */ /* initialize the lcp state */

67
gatchat/ppp.c
View File

@ -411,9 +411,6 @@ static void ppp_dead(GAtPPP *ppp)
if (g_atomic_int_get(&ppp->ref_count)) if (g_atomic_int_get(&ppp->ref_count))
return; return;
/* clean up all the queues */
g_queue_free(ppp->event_queue);
/* cleanup modem channel */ /* cleanup modem channel */
g_source_remove(ppp->modem_watch); g_source_remove(ppp->modem_watch);
g_io_channel_unref(ppp->modem); g_io_channel_unref(ppp->modem);
@ -461,48 +458,38 @@ static void ppp_transition_phase(GAtPPP *ppp, enum ppp_phase phase)
} }
} }
static void ppp_handle_event(GAtPPP *ppp)
{
enum ppp_event event;
while ((event = GPOINTER_TO_UINT(g_queue_pop_head(ppp->event_queue)))){
switch (event) {
case PPP_UP:
/* causes transition to ppp establishment */
ppp_transition_phase(ppp, PPP_ESTABLISHMENT);
break;
case PPP_OPENED:
ppp_transition_phase(ppp, PPP_AUTHENTICATION);
break;
case PPP_CLOSING:
/* causes transition to termination phase */
ppp_transition_phase(ppp, PPP_TERMINATION);
break;
case PPP_DOWN:
/* cases transition to dead phase */
ppp_transition_phase(ppp, PPP_DEAD);
break;
case PPP_NONE:
case PPP_SUCCESS:
/* causes transition to network phase */
ppp_transition_phase(ppp, PPP_NETWORK);
break;
case PPP_FAIL:
if (ppp->phase == PPP_ESTABLISHMENT)
ppp_transition_phase(ppp, PPP_DEAD);
else if (ppp->phase == PPP_AUTHENTICATION)
ppp_transition_phase(ppp, PPP_TERMINATION);
}
}
}
/* /*
* send the event handler a new event to process * send the event handler a new event to process
*/ */
void ppp_generate_event(GAtPPP *ppp, enum ppp_event event) void ppp_generate_event(GAtPPP *ppp, enum ppp_event event)
{ {
g_queue_push_tail(ppp->event_queue, GUINT_TO_POINTER(event)); switch (event) {
ppp_handle_event(ppp); case PPP_UP:
/* causes transition to ppp establishment */
ppp_transition_phase(ppp, PPP_ESTABLISHMENT);
break;
case PPP_OPENED:
ppp_transition_phase(ppp, PPP_AUTHENTICATION);
break;
case PPP_CLOSING:
/* causes transition to termination phase */
ppp_transition_phase(ppp, PPP_TERMINATION);
break;
case PPP_DOWN:
/* cases transition to dead phase */
ppp_transition_phase(ppp, PPP_DEAD);
break;
case PPP_NONE:
case PPP_SUCCESS:
/* causes transition to network phase */
ppp_transition_phase(ppp, PPP_NETWORK);
break;
case PPP_FAIL:
if (ppp->phase == PPP_ESTABLISHMENT)
ppp_transition_phase(ppp, PPP_DEAD);
else if (ppp->phase == PPP_AUTHENTICATION)
ppp_transition_phase(ppp, PPP_TERMINATION);
}
} }
void ppp_set_auth(GAtPPP *ppp, guint8* auth_data) void ppp_set_auth(GAtPPP *ppp, guint8* auth_data)

1
gatchat/ppp.h
View File

@ -130,7 +130,6 @@ struct _GAtPPP {
guint32 xmit_accm[8]; guint32 xmit_accm[8];
guint32 recv_accm; guint32 recv_accm;
GIOChannel *modem; GIOChannel *modem;
GQueue *event_queue;
GAtPPPConnectFunc connect_cb; GAtPPPConnectFunc connect_cb;
gpointer connect_data; gpointer connect_data;
GAtDisconnectFunc disconnect_cb; GAtDisconnectFunc disconnect_cb;