diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2010-04-05 16:44:00 -0500 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2010-04-05 16:44:00 -0500 |
| commit | 97b0aa590d950d37f121b0a0b3b4d57993afaaaa (patch) | |
| tree | ea95d3fb6daf23e639c2fb33407b9c9604ca02a5 | |
| parent | 7739af4a26c7b41fc14f4233190445dac7cc28ae (diff) | |
| download | ofono-97b0aa590d950d37f121b0a0b3b4d57993afaaaa.tar.bz2 | |
Refactor: add pppcp_get_ppp
| -rw-r--r-- | gatchat/ppp_cp.c | 5 | ||||
| -rw-r--r-- | gatchat/ppp_cp.h | 2 | ||||
| -rw-r--r-- | gatchat/ppp_ipcp.c | 2 | ||||
| -rw-r--r-- | gatchat/ppp_lcp.c | 8 |
4 files changed, 12 insertions, 5 deletions
diff --git a/gatchat/ppp_cp.c b/gatchat/ppp_cp.c index dd56d71c..9ff55233 100644 --- a/gatchat/ppp_cp.c +++ b/gatchat/ppp_cp.c @@ -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; diff --git a/gatchat/ppp_cp.h b/gatchat/ppp_cp.h index 5798fbeb..fb2c89b6 100644 --- a/gatchat/ppp_cp.h +++ b/gatchat/ppp_cp.h @@ -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, diff --git a/gatchat/ppp_ipcp.c b/gatchat/ppp_ipcp.c index 49cf950f..db414f8a 100644 --- a/gatchat/ppp_ipcp.c +++ b/gatchat/ppp_ipcp.c @@ -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); diff --git a/gatchat/ppp_lcp.c b/gatchat/ppp_lcp.c index 8ad70d82..8580913a 100644 --- a/gatchat/ppp_lcp.c +++ b/gatchat/ppp_lcp.c @@ -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) { |