---
src/ipconfig.c | 100 ++++++++++++++++++++++++++++----------------------------
1 file changed, 50 insertions(+), 50 deletions(-)
diff --git a/src/ipconfig.c b/src/ipconfig.c
index 5e34ac0..84d943c 100644
--- a/src/ipconfig.c
+++ b/src/ipconfig.c
@@ -618,7 +618,7 @@ static void update_stats(struct connman_ipdevice *ipdevice,
ipdevice->rx_dropped, ipdevice->tx_dropped);
}
-void __connman_ipconfig_newlink(int index, unsigned short type,
+void __connman_ipconfig_newlink(int ifindex, unsigned short type,
unsigned int flags, const char *address,
unsigned short mtu,
struct rtnl_link_stats *stats)
@@ -629,12 +629,12 @@ void __connman_ipconfig_newlink(int index, unsigned short
type,
gboolean up = FALSE, down = FALSE;
gboolean lower_up = FALSE, lower_down = FALSE;
- DBG("index %d", index);
+ DBG("index %d", ifindex);
if (type == ARPHRD_LOOPBACK)
return;
- ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(index));
+ ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(ifindex));
if (ipdevice != NULL)
goto update;
@@ -642,8 +642,8 @@ void __connman_ipconfig_newlink(int index, unsigned short
type,
if (ipdevice == NULL)
return;
- ipdevice->index = index;
- ipdevice->ifname = connman_inet_ifname(index);
+ ipdevice->index = ifindex;
+ ipdevice->ifname = connman_inet_ifname(ifindex);
ipdevice->type = type;
ipdevice->ipv6_enabled = get_ipv6_state(ipdevice->ifname);
@@ -651,10 +651,10 @@ void __connman_ipconfig_newlink(int index, unsigned short
type,
ipdevice->address = g_strdup(address);
- g_hash_table_insert(ipdevice_hash, GINT_TO_POINTER(index), ipdevice);
+ g_hash_table_insert(ipdevice_hash, GINT_TO_POINTER(ifindex), ipdevice);
connman_info("%s {create} index %d type %d <%s>", ipdevice->ifname,
- index, type, type2str(type));
+ ifindex, type, type2str(type));
update:
ipdevice->mtu = mtu;
@@ -706,7 +706,7 @@ update:
list = g_list_next(list)) {
struct connman_ipconfig *ipconfig = list->data;
- if (index != ipconfig->index)
+ if (ifindex != ipconfig->index)
continue;
if (ipconfig->ops == NULL)
@@ -729,14 +729,14 @@ update:
__connman_ipconfig_lower_down(ipdevice);
}
-void __connman_ipconfig_dellink(int index, struct rtnl_link_stats *stats)
+void __connman_ipconfig_dellink(int ifindex, struct rtnl_link_stats *stats)
{
struct connman_ipdevice *ipdevice;
GList *list;
- DBG("index %d", index);
+ DBG("index %d", ifindex);
- ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(index));
+ ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(ifindex));
if (ipdevice == NULL)
return;
@@ -746,7 +746,7 @@ void __connman_ipconfig_dellink(int index, struct
rtnl_link_stats *stats)
list = g_list_next(list)) {
struct connman_ipconfig *ipconfig = list->data;
- if (index != ipconfig->index)
+ if (ifindex != ipconfig->index)
continue;
ipconfig->index = -1;
@@ -762,7 +762,7 @@ void __connman_ipconfig_dellink(int index, struct
rtnl_link_stats *stats)
__connman_ipconfig_lower_down(ipdevice);
- g_hash_table_remove(ipdevice_hash, GINT_TO_POINTER(index));
+ g_hash_table_remove(ipdevice_hash, GINT_TO_POINTER(ifindex));
}
static inline gint check_duplicate_address(gconstpointer a, gconstpointer b)
@@ -776,7 +776,7 @@ static inline gint check_duplicate_address(gconstpointer a,
gconstpointer b)
return g_strcmp0(addr1->local, addr2->local);
}
-void __connman_ipconfig_newaddr(int index, int family, const char *label,
+void __connman_ipconfig_newaddr(int ifindex, int family, const char *label,
unsigned char prefixlen, const char *address)
{
struct connman_ipdevice *ipdevice;
@@ -784,9 +784,9 @@ void __connman_ipconfig_newaddr(int index, int family,
const char *label,
enum connman_ipconfig_type type;
GList *list;
- DBG("index %d", index);
+ DBG("index %d", ifindex);
- ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(index));
+ ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(ifindex));
if (ipdevice == NULL)
return;
@@ -817,7 +817,7 @@ void __connman_ipconfig_newaddr(int index, int family,
const char *label,
ipdevice->ifname, address, prefixlen, label, family);
if (type == CONNMAN_IPCONFIG_TYPE_IPV4)
- __connman_ippool_newaddr(index, address, prefixlen);
+ __connman_ippool_newaddr(ifindex, address, prefixlen);
if (ipdevice->config_ipv4 != NULL && family == AF_INET)
connman_ipaddress_copy(ipdevice->config_ipv4->system,
@@ -836,7 +836,7 @@ void __connman_ipconfig_newaddr(int index, int family,
const char *label,
list = g_list_next(list)) {
struct connman_ipconfig *ipconfig = list->data;
- if (index != ipconfig->index)
+ if (ifindex != ipconfig->index)
continue;
if (type != ipconfig->type)
@@ -850,7 +850,7 @@ void __connman_ipconfig_newaddr(int index, int family,
const char *label,
}
}
-void __connman_ipconfig_deladdr(int index, int family, const char *label,
+void __connman_ipconfig_deladdr(int ifindex, int family, const char *label,
unsigned char prefixlen, const char *address)
{
struct connman_ipdevice *ipdevice;
@@ -858,9 +858,9 @@ void __connman_ipconfig_deladdr(int index, int family,
const char *label,
enum connman_ipconfig_type type;
GList *list;
- DBG("index %d", index);
+ DBG("index %d", ifindex);
- ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(index));
+ ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(ifindex));
if (ipdevice == NULL)
return;
@@ -879,7 +879,7 @@ void __connman_ipconfig_deladdr(int index, int family,
const char *label,
ipaddress);
if (type == CONNMAN_IPCONFIG_TYPE_IPV4)
- __connman_ippool_deladdr(index, address, prefixlen);
+ __connman_ippool_deladdr(ifindex, address, prefixlen);
connman_ipaddress_clear(ipaddress);
g_free(ipaddress);
@@ -897,7 +897,7 @@ void __connman_ipconfig_deladdr(int index, int family,
const char *label,
list = g_list_next(list)) {
struct connman_ipconfig *ipconfig = list->data;
- if (index != ipconfig->index)
+ if (ifindex != ipconfig->index)
continue;
if (type != ipconfig->type)
@@ -911,14 +911,14 @@ void __connman_ipconfig_deladdr(int index, int family,
const char *label,
}
}
-void __connman_ipconfig_newroute(int index, int family, unsigned char scope,
+void __connman_ipconfig_newroute(int ifindex, int family, unsigned char scope,
const char *dst, const char *gateway)
{
struct connman_ipdevice *ipdevice;
- DBG("index %d", index);
+ DBG("index %d", ifindex);
- ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(index));
+ ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(ifindex));
if (ipdevice == NULL)
return;
@@ -956,7 +956,7 @@ void __connman_ipconfig_newroute(int index, int family,
unsigned char scope,
config_list = g_list_next(config_list))
{
struct connman_ipconfig *ipconfig = config_list->data;
- if (index != ipconfig->index)
+ if (ifindex != ipconfig->index)
continue;
if (type != ipconfig->type)
@@ -975,14 +975,14 @@ void __connman_ipconfig_newroute(int index, int family,
unsigned char scope,
scope, scope2str(scope));
}
-void __connman_ipconfig_delroute(int index, int family, unsigned char scope,
+void __connman_ipconfig_delroute(int ifindex, int family, unsigned char scope,
const char *dst, const char *gateway)
{
struct connman_ipdevice *ipdevice;
- DBG("index %d", index);
+ DBG("index %d", ifindex);
- ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(index));
+ ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(ifindex));
if (ipdevice == NULL)
return;
@@ -1018,7 +1018,7 @@ void __connman_ipconfig_delroute(int index, int family,
unsigned char scope,
config_list = g_list_next(config_list))
{
struct connman_ipconfig *ipconfig = config_list->data;
- if (index != ipconfig->index)
+ if (ifindex != ipconfig->index)
continue;
if (type != ipconfig->type)
@@ -1037,7 +1037,7 @@ void __connman_ipconfig_delroute(int index, int family,
unsigned char scope,
scope, scope2str(scope));
}
-void __connman_ipconfig_foreach(void (*function) (int index, void *user_data),
+void __connman_ipconfig_foreach(void (*function) (int ifindex, void
*user_data),
void *user_data)
{
GList *list, *keys;
@@ -1047,9 +1047,9 @@ void __connman_ipconfig_foreach(void (*function) (int
index, void *user_data),
return;
for (list = g_list_first(keys); list; list = g_list_next(list)) {
- int index = GPOINTER_TO_INT(list->data);
+ int ifindex = GPOINTER_TO_INT(list->data);
- function(index, user_data);
+ function(ifindex, user_data);
}
g_list_free(keys);
@@ -1061,34 +1061,34 @@ enum connman_ipconfig_type
__connman_ipconfig_get_config_type(
return ipconfig ? ipconfig->type : CONNMAN_IPCONFIG_TYPE_UNKNOWN;
}
-unsigned short __connman_ipconfig_get_type_from_index(int index)
+unsigned short __connman_ipconfig_get_type_from_index(int ifindex)
{
struct connman_ipdevice *ipdevice;
- ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(index));
+ ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(ifindex));
if (ipdevice == NULL)
return ARPHRD_VOID;
return ipdevice->type;
}
-unsigned int __connman_ipconfig_get_flags_from_index(int index)
+unsigned int __connman_ipconfig_get_flags_from_index(int ifindex)
{
struct connman_ipdevice *ipdevice;
- ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(index));
+ ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(ifindex));
if (ipdevice == NULL)
return 0;
return ipdevice->flags;
}
-const char *__connman_ipconfig_get_gateway_from_index(int index,
+const char *__connman_ipconfig_get_gateway_from_index(int ifindex,
enum connman_ipconfig_type type)
{
struct connman_ipdevice *ipdevice;
- ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(index));
+ ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(ifindex));
if (ipdevice == NULL)
return NULL;
@@ -1113,9 +1113,9 @@ const char *__connman_ipconfig_get_gateway_from_index(int
index,
return NULL;
}
-void __connman_ipconfig_set_index(struct connman_ipconfig *ipconfig, int index)
+void __connman_ipconfig_set_index(struct connman_ipconfig *ipconfig, int
ifindex)
{
- ipconfig->index = index;
+ ipconfig->index = ifindex;
}
const char *__connman_ipconfig_get_local(struct connman_ipconfig *ipconfig)
@@ -1242,12 +1242,12 @@ void __connman_ipconfig_set_prefixlen(struct
connman_ipconfig *ipconfig, unsigne
ipconfig->address->prefixlen = prefixlen;
}
-static struct connman_ipconfig *create_ipv6config(int index)
+static struct connman_ipconfig *create_ipv6config(int ifindex)
{
struct connman_ipconfig *ipv6config;
struct connman_ipdevice *ipdevice;
- DBG("index %d", index);
+ DBG("index %d", ifindex);
ipv6config = g_try_new0(struct connman_ipconfig, 1);
if (ipv6config == NULL)
@@ -1255,12 +1255,12 @@ static struct connman_ipconfig *create_ipv6config(int
index)
ipv6config->refcount = 1;
- ipv6config->index = index;
+ ipv6config->index = ifindex;
ipv6config->enabled = FALSE;
ipv6config->type = CONNMAN_IPCONFIG_TYPE_IPV6;
ipv6config->method = CONNMAN_IPCONFIG_METHOD_AUTO;
- ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(index));
+ ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(ifindex));
if (ipdevice != NULL)
ipv6config->ipv6_privacy_config = ipdevice->ipv6_privacy;
@@ -1284,15 +1284,15 @@ static struct connman_ipconfig *create_ipv6config(int
index)
*
* Returns: a newly-allocated #connman_ipconfig structure
*/
-struct connman_ipconfig *__connman_ipconfig_create(int index,
+struct connman_ipconfig *__connman_ipconfig_create(int ifindex,
enum connman_ipconfig_type type)
{
struct connman_ipconfig *ipconfig;
if (type == CONNMAN_IPCONFIG_TYPE_IPV6)
- return create_ipv6config(index);
+ return create_ipv6config(ifindex);
- DBG("index %d", index);
+ DBG("index %d", ifindex);
ipconfig = g_try_new0(struct connman_ipconfig, 1);
if (ipconfig == NULL)
@@ -1300,7 +1300,7 @@ struct connman_ipconfig *__connman_ipconfig_create(int
index,
ipconfig->refcount = 1;
- ipconfig->index = index;
+ ipconfig->index = ifindex;
ipconfig->enabled = FALSE;
ipconfig->type = CONNMAN_IPCONFIG_TYPE_IPV4;
--
1.7.9.5
_______________________________________________
connman mailing list
[email protected]
http://lists.connman.net/listinfo/connman
