---
src/resolver.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/resolver.c b/src/resolver.c
index a9d1341..f772721 100644
--- a/src/resolver.c
+++ b/src/resolver.c
@@ -239,17 +239,17 @@ static gboolean resolver_expire_cb(gpointer user_data)
{
struct entry_data *entry = user_data;
GSList *list;
- int index;
+ int ifindex;
DBG("interface %s domain %s server %s",
entry->interface, entry->domain, entry->server);
list = g_slist_append(NULL, entry);
- index = connman_inet_ifindex(entry->interface);
- if (index >= 0) {
+ ifindex = connman_inet_ifindex(entry->interface);
+ if (ifindex >= 0) {
struct connman_service *service;
- service = __connman_service_lookup_from_index(index);
+ service = __connman_service_lookup_from_index(ifindex);
if (service != NULL)
__connman_service_nameserver_remove(service,
entry->server, TRUE);
@@ -263,7 +263,7 @@ static gboolean resolver_expire_cb(gpointer user_data)
static gboolean resolver_refresh_cb(gpointer user_data)
{
struct entry_data *entry = user_data;
- int index;
+ int ifindex;
unsigned int interval;
struct connman_service *service = NULL;
@@ -279,9 +279,9 @@ static gboolean resolver_refresh_cb(gpointer user_data)
entry->timeout = g_timeout_add_seconds(interval,
resolver_expire_cb, entry);
- index = connman_inet_ifindex(entry->interface);
- if (index >= 0) {
- service = __connman_service_lookup_from_index(index);
+ ifindex = connman_inet_ifindex(entry->interface);
+ if (ifindex >= 0) {
+ service = __connman_service_lookup_from_index(ifindex);
if (service != NULL) {
/*
* Send Router Solicitation to refresh RDNSS entries
@@ -289,7 +289,7 @@ static gboolean resolver_refresh_cb(gpointer user_data)
*/
__connman_refresh_rs_ipv6(
__connman_service_get_network(service),
- index);
+ ifindex);
}
}
return FALSE;
@@ -318,7 +318,7 @@ static int append_resolver(const char *interface, const
char *domain,
entry->flags = flags;
entry->lifetime = lifetime;
if (lifetime) {
- int index;
+ int ifindex;
interval = lifetime * RESOLVER_LIFETIME_REFRESH_THRESHOLD;
DBG("RDNSS start interface %s domain %s "
@@ -332,10 +332,10 @@ static int append_resolver(const char *interface, const
char *domain,
* We update the service only for those nameservers
* that are automagically added via netlink (lifetime > 0)
*/
- index = connman_inet_ifindex(interface);
- if (server != NULL && index >= 0) {
+ ifindex = connman_inet_ifindex(interface);
+ if (server != NULL && ifindex >= 0) {
struct connman_service *service;
- service = __connman_service_lookup_from_index(index);
+ service = __connman_service_lookup_from_index(ifindex);
if (service != NULL)
__connman_service_nameserver_append(service,
server, TRUE);
--
1.7.9.5
_______________________________________________
connman mailing list
[email protected]
http://lists.connman.net/listinfo/connman
