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

Remove obfuscation for some of the event handling

This commit is contained in:
Marcel Holtmann 2010-04-01 20:40:39 -07:00
parent 6607b5985e
commit a845dc8da7
2 changed files with 13 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
gatchat/gatppp.c
View File

@ -351,7 +351,7 @@ void ppp_transmit(GAtPPP *ppp, guint8 *packet, guint infolen)
g_free(frame); g_free(frame);
} }
gboolean ppp_cb(GIOChannel *channel, GIOCondition cond, gpointer data) static gboolean ppp_cb(GIOChannel *channel, GIOCondition cond, gpointer data)
{ {
GAtPPP *ppp = data; GAtPPP *ppp = data;
GIOStatus status; GIOStatus status;
@ -376,33 +376,6 @@ gboolean ppp_cb(GIOChannel *channel, GIOCondition cond, gpointer data)
return TRUE; return TRUE;
} }
/* Administrative Close */
void ppp_close(GAtPPP *ppp)
{
/* send a CLOSE event to the lcp layer */
lcp_close(ppp->lcp);
}
static void ppp_link_establishment(GAtPPP *ppp)
{
/* signal UP event to LCP */
lcp_establish(ppp->lcp);
}
static void ppp_terminate(GAtPPP *ppp)
{
/* signal DOWN event to LCP */
lcp_terminate(ppp->lcp);
}
static void ppp_authenticate(GAtPPP *ppp)
{
/* we don't do authentication right now, so send NONE */
if (!ppp->auth_proto)
ppp_generate_event(ppp, PPP_NONE);
/* otherwise we need to wait for the peer to send us a challenge */
}
static void ppp_dead(GAtPPP *ppp) static void ppp_dead(GAtPPP *ppp)
{ {
/* notify interested parties */ /* notify interested parties */
@ -425,12 +398,6 @@ static void ppp_dead(GAtPPP *ppp)
g_free(ppp); g_free(ppp);
} }
static void ppp_network(GAtPPP *ppp)
{
/* bring network phase up */
ppp_net_open(ppp->net);
}
static void ppp_transition_phase(GAtPPP *ppp, enum ppp_phase phase) static void ppp_transition_phase(GAtPPP *ppp, enum ppp_phase phase)
{ {
/* don't do anything if we're already there */ /* don't do anything if we're already there */
@ -442,19 +409,25 @@ static void ppp_transition_phase(GAtPPP *ppp, enum ppp_phase phase)
switch (phase) { switch (phase) {
case PPP_ESTABLISHMENT: case PPP_ESTABLISHMENT:
ppp_link_establishment(ppp); /* signal UP event to LCP */
lcp_establish(ppp->lcp);
break; break;
case PPP_AUTHENTICATION: case PPP_AUTHENTICATION:
ppp_authenticate(ppp); /* we don't do authentication right now, so send NONE */
if (!ppp->auth_proto)
ppp_generate_event(ppp, PPP_NONE);
/* otherwise we need to wait for the peer to send us a challenge */
break; break;
case PPP_TERMINATION: case PPP_TERMINATION:
ppp_terminate(ppp); /* signal DOWN event to LCP */
lcp_terminate(ppp->lcp);
break; break;
case PPP_DEAD: case PPP_DEAD:
ppp_dead(ppp); ppp_dead(ppp);
break; break;
case PPP_NETWORK: case PPP_NETWORK:
ppp_network(ppp); /* bring network phase up */
ppp_net_open(ppp->net);
break; break;
} }
} }
@ -597,8 +570,8 @@ void g_at_ppp_set_recording(GAtPPP *ppp, const char *filename)
void g_at_ppp_shutdown(GAtPPP *ppp) void g_at_ppp_shutdown(GAtPPP *ppp)
{ {
/* close the ppp link */ /* send a CLOSE event to the lcp layer */
ppp_close(ppp); lcp_close(ppp->lcp);
} }
void g_at_ppp_ref(GAtPPP *ppp) void g_at_ppp_ref(GAtPPP *ppp)

2
gatchat/ppp.h
View File

@ -140,8 +140,6 @@ struct _GAtPPP {
int record_fd; int record_fd;
}; };
gboolean ppp_cb(GIOChannel *channel, GIOCondition cond, gpointer data);
void ppp_close(GAtPPP *ppp);
void ppp_generate_event(GAtPPP *ppp, enum ppp_event event); void ppp_generate_event(GAtPPP *ppp, enum ppp_event event);
void ppp_register_packet_handler(struct ppp_packet_handler *handler); void ppp_register_packet_handler(struct ppp_packet_handler *handler);
void ppp_transmit(GAtPPP *ppp, guint8 *packet, guint infolen); void ppp_transmit(GAtPPP *ppp, guint8 *packet, guint infolen);