---
src/ippool.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/ippool.c b/src/ippool.c
index 52446ce..98b926f 100644
--- a/src/ippool.c
+++ b/src/ippool.c
@@ -207,14 +207,14 @@ static uint32_t get_free_block(unsigned int size)
return 0;
}
-static struct address_info *lookup_info(int index, uint32_t start)
+static struct address_info *lookup_info(int ifindex, uint32_t start)
{
GSList *list;
for (list = allocated_blocks; list != NULL; list = list->next) {
struct address_info *info = list->data;
- if (info->index == index && info->start == start)
+ if (info->index == ifindex && info->start == start)
return info;
}
@@ -243,7 +243,7 @@ static connman_bool_t is_private_address(uint32_t address)
return FALSE;
}
-void __connman_ippool_newaddr(int index, const char *address,
+void __connman_ippool_newaddr(int ifindex, const char *address,
unsigned char prefixlen)
{
struct address_info *info, *it;
@@ -266,7 +266,7 @@ void __connman_ippool_newaddr(int index, const char
*address,
start = start & mask;
end = start | ~mask;
- info = lookup_info(index, start);
+ info = lookup_info(ifindex, start);
if (info != NULL)
goto update;
@@ -274,7 +274,7 @@ void __connman_ippool_newaddr(int index, const char
*address,
if (info == NULL)
return;
- info->index = index;
+ info->index = ifindex;
info->start = start;
info->end = end;
@@ -307,7 +307,7 @@ update:
}
}
-void __connman_ippool_deladdr(int index, const char *address,
+void __connman_ippool_deladdr(int ifindex, const char *address,
unsigned char prefixlen)
{
struct address_info *info;
@@ -324,7 +324,7 @@ void __connman_ippool_deladdr(int index, const char
*address,
mask = ~(0xffffffff >> prefixlen);
start = start & mask;
- info = lookup_info(index, start);
+ info = lookup_info(ifindex, start);
if (info == NULL) {
/* In theory this should never happen */
connman_error("Inconsistent IP pool management (start not
found)");
@@ -341,7 +341,7 @@ void __connman_ippool_deladdr(int index, const char
*address,
allocated_blocks = g_slist_remove(allocated_blocks, info);
}
-struct connman_ippool *__connman_ippool_create(int index,
+struct connman_ippool *__connman_ippool_create(int ifindex,
unsigned int start,
unsigned int range,
ippool_collision_cb_t collision_cb,
@@ -380,7 +380,7 @@ struct connman_ippool *__connman_ippool_create(int index,
last_block = block;
- info->index = index;
+ info->index = ifindex;
info->start = block;
info->end = block + range;
--
1.7.9.5
_______________________________________________
connman mailing list
connman@connman.net
http://lists.connman.net/listinfo/connman
