diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2010-04-03 22:25:09 -0700 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2010-04-03 22:25:09 -0700 |
| commit | 5772ad5d8b736f9a8639ad3c68beae059f04eb31 (patch) | |
| tree | 87fc209b3f32d500cae6bfad40ae63569dfb51f7 /gatchat/ppp_ipcp.c | |
| parent | 352ea97f8fb4977d2d3ae086472ee6c3032dc21f (diff) | |
| download | ofono-5772ad5d8b736f9a8639ad3c68beae059f04eb31.tar.bz2 | |
Make GAtPPP fields really private
Diffstat (limited to 'gatchat/ppp_ipcp.c')
| -rw-r--r-- | gatchat/ppp_ipcp.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/gatchat/ppp_ipcp.c b/gatchat/ppp_ipcp.c index a7ce2a5a..6b1566fe 100644 --- a/gatchat/ppp_ipcp.c +++ b/gatchat/ppp_ipcp.c @@ -66,15 +66,11 @@ enum ipcp_option_types { static void ipcp_up(struct pppcp_data *pppcp) { struct ipcp_data *data = pppcp->priv; - GAtPPP *ppp = pppcp->ppp; char ip[INET_ADDRSTRLEN]; char dns1[INET_ADDRSTRLEN]; char dns2[INET_ADDRSTRLEN]; struct in_addr addr; - if (ppp->connect_cb == NULL) - return; - memset(ip, 0, sizeof(ip)); addr.s_addr = __get_unaligned_long(data->ip_address); inet_ntop(AF_INET, &addr, ip, INET_ADDRSTRLEN); @@ -87,12 +83,10 @@ 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(G_AT_PPP_CONNECT_SUCCESS, - pppcp->ppp->net->if_name, - ip[0] ? ip : NULL, - dns1[0] ? dns1 : NULL, - dns2[0] ? dns2 : NULL, - ppp->connect_data); + ppp_connect_cb(pppcp->ppp, G_AT_PPP_CONNECT_SUCCESS, + ip[0] ? ip : NULL, + dns1[0] ? dns1 : NULL, + dns2[0] ? dns2 : NULL); } static void ipcp_down(struct pppcp_data *data) |