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

Refactor: add pppcp_get_ppp

This commit is contained in:
Denis Kenzior 2010-04-05 16:44:00 -05:00
parent 7739af4a26
commit 97b0aa590d
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gatchat/ppp_cp.c
View File

@ -1284,6 +1284,11 @@ gpointer pppcp_get_data(struct pppcp_data *pppcp)
return pppcp->priv;
}
GAtPPP *pppcp_get_ppp(struct pppcp_data *pppcp)
{
return pppcp->ppp;
}
void pppcp_set_option_strings(struct pppcp_data *pppcp, const char **opts)
{
pppcp->option_strings = opts;

2
gatchat/ppp_cp.h
View File

@ -106,6 +106,8 @@ void pppcp_free(struct pppcp_data *data);
void pppcp_set_data(struct pppcp_data *pppcp, gpointer data);
gpointer pppcp_get_data(struct pppcp_data *pppcp);
GAtPPP *pppcp_get_ppp(struct pppcp_data *pppcp);
void pppcp_set_option_strings(struct pppcp_data *pppcp, const char **opts);
void pppcp_add_config_option(struct pppcp_data *data,

2
gatchat/ppp_ipcp.c
View File

@ -83,7 +83,7 @@ static void ipcp_up(struct pppcp_data *pppcp)
addr.s_addr = __get_unaligned_long(data->secondary_dns);
inet_ntop(AF_INET, &addr, dns2, INET_ADDRSTRLEN);
ppp_connect_cb(pppcp->ppp, G_AT_PPP_CONNECT_SUCCESS,
ppp_connect_cb(pppcp_get_ppp(pppcp), G_AT_PPP_CONNECT_SUCCESS,
ip[0] ? ip : NULL,
dns1[0] ? dns1 : NULL,
dns2[0] ? dns2 : NULL);

8
gatchat/ppp_lcp.c
View File

@ -63,7 +63,7 @@ enum lcp_options {
*/
static void lcp_up(struct pppcp_data *pppcp)
{
ppp_generate_event(pppcp->ppp, PPP_OPENED);
ppp_generate_event(pppcp_get_ppp(pppcp), PPP_OPENED);
}
/*
@ -80,7 +80,7 @@ static void lcp_down(struct pppcp_data *pppcp)
*/
static void lcp_started(struct pppcp_data *pppcp)
{
ppp_generate_event(pppcp->ppp, PPP_UP);
ppp_generate_event(pppcp_get_ppp(pppcp), PPP_UP);
}
/*
@ -89,7 +89,7 @@ static void lcp_started(struct pppcp_data *pppcp)
*/
static void lcp_finished(struct pppcp_data *pppcp)
{
ppp_generate_event(pppcp->ppp, PPP_DOWN);
ppp_generate_event(pppcp_get_ppp(pppcp), PPP_DOWN);
}
/*
@ -123,7 +123,7 @@ static guint lcp_option_scan(struct pppcp_data *pppcp,
static void lcp_option_process(struct pppcp_data *pppcp,
struct ppp_option *option)
{
GAtPPP *ppp = pppcp->ppp;
GAtPPP *ppp = pppcp_get_ppp(pppcp);
guint32 magic;
switch (option->type) {