---
src/dhcpv6.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index 574b19e..9df2698 100644
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -160,7 +160,7 @@ static gchar *convert_to_hex(unsigned char *buf, int len)
*/
static int set_duid(struct connman_service *service,
struct connman_network *network,
- GDHCPClient *dhcp_client, int index)
+ GDHCPClient *dhcp_client, int ifindex)
{
GKeyFile *keyfile;
const char *ident;
@@ -195,9 +195,9 @@ static int set_duid(struct connman_service *service,
duid_len = hex_duid_len / 2;
} else {
int ret;
- int type = __connman_ipconfig_get_type_from_index(index);
+ int type = __connman_ipconfig_get_type_from_index(ifindex);
- ret = g_dhcpv6_create_duid(G_DHCPV6_DUID_LLT, index, type,
+ ret = g_dhcpv6_create_duid(G_DHCPV6_DUID_LLT, ifindex, type,
&duid, &duid_len);
if (ret < 0) {
g_key_file_free(keyfile);
@@ -338,13 +338,13 @@ static int dhcpv6_info_request(struct connman_dhcpv6
*dhcp)
struct connman_service *service;
GDHCPClient *dhcp_client;
GDHCPClientError error;
- int index, ret;
+ int ifindex, ret;
DBG("dhcp %p", dhcp);
- index = connman_network_get_index(dhcp->network);
+ ifindex = connman_network_get_index(dhcp->network);
- dhcp_client = g_dhcp_client_new(G_DHCP_IPV6, index, &error);
+ dhcp_client = g_dhcp_client_new(G_DHCP_IPV6, ifindex, &error);
if (error != G_DHCP_CLIENT_ERROR_NONE) {
clear_timer(dhcp);
return -EINVAL;
@@ -360,7 +360,7 @@ static int dhcpv6_info_request(struct connman_dhcpv6 *dhcp)
return -EINVAL;
}
- ret = set_duid(service, dhcp->network, dhcp_client, index);
+ ret = set_duid(service, dhcp->network, dhcp_client, ifindex);
if (ret < 0) {
clear_timer(dhcp);
g_dhcp_client_unref(dhcp_client);
@@ -1093,13 +1093,13 @@ static int dhcpv6_solicitation(struct connman_dhcpv6
*dhcp)
struct connman_ipconfig *ipconfig_ipv6;
GDHCPClient *dhcp_client;
GDHCPClientError error;
- int index, ret;
+ int ifindex, ret;
DBG("dhcp %p", dhcp);
- index = connman_network_get_index(dhcp->network);
+ ifindex = connman_network_get_index(dhcp->network);
- dhcp_client = g_dhcp_client_new(G_DHCP_IPV6, index, &error);
+ dhcp_client = g_dhcp_client_new(G_DHCP_IPV6, ifindex, &error);
if (error != G_DHCP_CLIENT_ERROR_NONE) {
clear_timer(dhcp);
return -EINVAL;
@@ -1115,7 +1115,7 @@ static int dhcpv6_solicitation(struct connman_dhcpv6
*dhcp)
return -EINVAL;
}
- ret = set_duid(service, dhcp->network, dhcp_client, index);
+ ret = set_duid(service, dhcp->network, dhcp_client, ifindex);
if (ret < 0) {
clear_timer(dhcp);
g_dhcp_client_unref(dhcp_client);
@@ -1133,7 +1133,7 @@ static int dhcpv6_solicitation(struct connman_dhcpv6
*dhcp)
ipconfig_ipv6 = __connman_service_get_ip6config(service);
dhcp->use_ta = __connman_ipconfig_ipv6_privacy_enabled(ipconfig_ipv6);
- g_dhcpv6_client_set_ia(dhcp_client, index,
+ g_dhcpv6_client_set_ia(dhcp_client, ifindex,
dhcp->use_ta == TRUE ? G_DHCPV6_IA_TA : G_DHCPV6_IA_NA,
NULL, NULL, FALSE);
--
1.7.9.5
_______________________________________________
connman mailing list
[email protected]
http://lists.connman.net/listinfo/connman
