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

ppp: Use pppcp_signal functions directly 

No real need to wrap them behind lcp_ functions
This commit is contained in:
Denis Kenzior 2010-04-09 13:30:56 -05:00
parent 36d15b4366
commit f5270cc9bd
3 changed files with 6 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gatchat/gatppp.c
View File

@ -386,8 +386,8 @@ static void ppp_transition_phase(GAtPPP *ppp, enum ppp_phase phase)
switch (phase) { switch (phase) {
case PPP_ESTABLISHMENT: case PPP_ESTABLISHMENT:
/* signal UP event to LCP */ /* send an UP event to the lcp layer */
lcp_establish(ppp->lcp); pppcp_signal_up(ppp->lcp);
break; break;
case PPP_AUTHENTICATION: case PPP_AUTHENTICATION:
/* we don't do authentication right now, so send NONE */ /* we don't do authentication right now, so send NONE */
@ -396,7 +396,8 @@ static void ppp_transition_phase(GAtPPP *ppp, enum ppp_phase phase)
/* otherwise we need to wait for the peer to send us a challenge */ /* otherwise we need to wait for the peer to send us a challenge */
break; break;
case PPP_TERMINATION: case PPP_TERMINATION:
lcp_terminate(ppp->lcp); /* send a CLOSE event to the lcp layer */
pppcp_signal_close(ppp->lcp);
break; break;
case PPP_DEAD: case PPP_DEAD:
ppp_dead(ppp); ppp_dead(ppp);
@ -497,8 +498,8 @@ gboolean ppp_get_acfc(GAtPPP *ppp)
/* Administrative Open */ /* Administrative Open */
void g_at_ppp_open(GAtPPP *ppp) void g_at_ppp_open(GAtPPP *ppp)
{ {
/* send an OPEN event to the lcp layer */ /* send an open event to the lcp layer */
lcp_open(ppp->lcp); pppcp_signal_open(ppp->lcp);
} }
void g_at_ppp_set_credentials(GAtPPP *ppp, const char *username, void g_at_ppp_set_credentials(GAtPPP *ppp, const char *username,

3
gatchat/ppp.h
View File

@ -101,9 +101,6 @@ void ppp_set_acfc(GAtPPP *ppp, gboolean acfc);
gboolean ppp_get_acfc(GAtPPP *ppp); gboolean ppp_get_acfc(GAtPPP *ppp);
struct pppcp_data * lcp_new(GAtPPP *ppp); struct pppcp_data * lcp_new(GAtPPP *ppp);
void lcp_free(struct pppcp_data *lcp); void lcp_free(struct pppcp_data *lcp);
void lcp_open(struct pppcp_data *data);
void lcp_establish(struct pppcp_data *data);
void lcp_terminate(struct pppcp_data *data);
void lcp_protocol_reject(struct pppcp_data *lcp, guint8 *packet, gsize len); void lcp_protocol_reject(struct pppcp_data *lcp, guint8 *packet, gsize len);
void auth_process_packet(struct auth_data *data, guint8 *new_packet); void auth_process_packet(struct auth_data *data, guint8 *new_packet);
void auth_set_credentials(struct auth_data *data, const char *username, void auth_set_credentials(struct auth_data *data, const char *username,

27
gatchat/ppp_lcp.c
View File

@ -230,33 +230,6 @@ struct pppcp_proto lcp_proto = {
.rcr = lcp_rcr, .rcr = lcp_rcr,
}; };
void lcp_open(struct pppcp_data *data)
{
if (data == NULL)
return;
/* send an open event to the lcp layer */
pppcp_signal_open(data);
}
void lcp_establish(struct pppcp_data *data)
{
if (data == NULL)
return;
/* send an UP event to the lcp layer */
pppcp_signal_up(data);
}
void lcp_terminate(struct pppcp_data *data)
{
if (data == NULL)
return;
/* send a CLOSE event to the lcp layer */
pppcp_signal_close(data);
}
void lcp_free(struct pppcp_data *pppcp) void lcp_free(struct pppcp_data *pppcp)
{ {
struct ipcp_data *lcp = pppcp_get_data(pppcp); struct ipcp_data *lcp = pppcp_get_data(pppcp);