---
gdhcp/client.c | 26 +++++++++++++-------------
gdhcp/common.c | 14 +++++++-------
gdhcp/server.c | 4 ++--
3 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/gdhcp/client.c b/gdhcp/client.c
index 7e8e494..5327dce 100644
--- a/gdhcp/client.c
+++ b/gdhcp/client.c
@@ -535,7 +535,7 @@ static gboolean send_announce_packet(gpointer dhcp_data)
return TRUE;
}
-static void get_interface_mac_address(int index, uint8_t *mac_address)
+static void get_interface_mac_address(int ifindex, uint8_t *mac_address)
{
struct ifreq ifr;
int sk, err;
@@ -547,7 +547,7 @@ static void get_interface_mac_address(int index, uint8_t
*mac_address)
}
memset(&ifr, 0, sizeof(ifr));
- ifr.ifr_ifindex = index;
+ ifr.ifr_ifindex = ifindex;
err = ioctl(sk, SIOCGIFNAME, &ifr);
if (err < 0) {
@@ -567,7 +567,7 @@ done:
close(sk);
}
-int g_dhcpv6_create_duid(GDHCPDuidType duid_type, int index, int type,
+int g_dhcpv6_create_duid(GDHCPDuidType duid_type, int ifindex, int type,
unsigned char **duid, int *duid_len)
{
time_t duid_time;
@@ -581,7 +581,7 @@ int g_dhcpv6_create_duid(GDHCPDuidType duid_type, int
index, int type,
(*duid)[0] = 0;
(*duid)[1] = 1;
- get_interface_mac_address(index, &(*duid)[2 + 2 + 4]);
+ get_interface_mac_address(ifindex, &(*duid)[2 + 2 + 4]);
(*duid)[2] = 0;
(*duid)[3] = type;
duid_time = time(NULL) - DUID_TIME_EPOCH;
@@ -600,7 +600,7 @@ int g_dhcpv6_create_duid(GDHCPDuidType duid_type, int
index, int type,
(*duid)[0] = 0;
(*duid)[1] = 3;
- get_interface_mac_address(index, &(*duid)[2 + 2]);
+ get_interface_mac_address(ifindex, &(*duid)[2 + 2]);
(*duid)[2] = 0;
(*duid)[3] = type;
break;
@@ -631,12 +631,12 @@ uint32_t g_dhcpv6_client_get_iaid(GDHCPClient
*dhcp_client)
return dhcp_client->iaid;
}
-void g_dhcpv6_client_create_iaid(GDHCPClient *dhcp_client, int index,
+void g_dhcpv6_client_create_iaid(GDHCPClient *dhcp_client, int ifindex,
unsigned char *iaid)
{
uint8_t buf[6];
- get_interface_mac_address(index, buf);
+ get_interface_mac_address(ifindex, buf);
memcpy(iaid, &buf[2], 4);
dhcp_client->iaid = iaid[0] << 24 |
@@ -682,13 +682,13 @@ static uint8_t *create_iaaddr(GDHCPClient *dhcp_client,
uint8_t *buf,
return buf;
}
-static void put_iaid(GDHCPClient *dhcp_client, int index, uint8_t *buf)
+static void put_iaid(GDHCPClient *dhcp_client, int ifindex, uint8_t *buf)
{
uint32_t iaid;
iaid = g_dhcpv6_client_get_iaid(dhcp_client);
if (iaid == 0) {
- g_dhcpv6_client_create_iaid(dhcp_client, index, buf);
+ g_dhcpv6_client_create_iaid(dhcp_client, ifindex, buf);
return;
}
@@ -698,14 +698,14 @@ static void put_iaid(GDHCPClient *dhcp_client, int index,
uint8_t *buf)
buf[3] = iaid;
}
-int g_dhcpv6_client_set_ia(GDHCPClient *dhcp_client, int index,
+int g_dhcpv6_client_set_ia(GDHCPClient *dhcp_client, int ifindex,
int code, uint32_t *T1, uint32_t *T2,
gboolean add_iaaddr)
{
if (code == G_DHCPV6_IA_TA) {
uint8_t ia_options[4];
- put_iaid(dhcp_client, index, ia_options);
+ put_iaid(dhcp_client, ifindex, ia_options);
g_dhcp_client_set_request(dhcp_client, G_DHCPV6_IA_TA);
g_dhcpv6_client_set_send(dhcp_client, G_DHCPV6_IA_TA,
@@ -719,7 +719,7 @@ int g_dhcpv6_client_set_ia(GDHCPClient *dhcp_client, int
index,
#define IAADDR_LEN (16+4+4)
uint8_t ia_options[4+4+4+2+2+IAADDR_LEN];
- put_iaid(dhcp_client, index, ia_options);
+ put_iaid(dhcp_client, ifindex, ia_options);
if (T1 != NULL) {
ia_options[4] = *T1 >> 24;
@@ -745,7 +745,7 @@ int g_dhcpv6_client_set_ia(GDHCPClient *dhcp_client, int
index,
} else {
uint8_t ia_options[4+4+4];
- put_iaid(dhcp_client, index, ia_options);
+ put_iaid(dhcp_client, ifindex, ia_options);
memset(&ia_options[4], 0x00, 4); /* T1 (4 bytes) */
memset(&ia_options[8], 0x00, 4); /* T2 (4 bytes) */
diff --git a/gdhcp/common.c b/gdhcp/common.c
index 8d5c284..11ad0ee 100644
--- a/gdhcp/common.c
+++ b/gdhcp/common.c
@@ -428,7 +428,7 @@ struct in6_pktinfo {
unsigned int ipi6_ifindex; /* send/recv interface index */
};
-int dhcpv6_send_packet(int index, struct dhcpv6_packet *dhcp_pkt, int len)
+int dhcpv6_send_packet(int ifindex, struct dhcpv6_packet *dhcp_pkt, int len)
{
struct msghdr m;
struct iovec v;
@@ -476,7 +476,7 @@ int dhcpv6_send_packet(int index, struct dhcpv6_packet
*dhcp_pkt, int len)
pktinfo = (struct in6_pktinfo *)CMSG_DATA(cmsg);
memset(pktinfo, 0, sizeof(*pktinfo));
- pktinfo->ipi6_ifindex = index;
+ pktinfo->ipi6_ifindex = ifindex;
m.msg_controllen = cmsg->cmsg_len;
ret = sendmsg(fd, &m, 0);
@@ -644,12 +644,12 @@ int dhcp_l3_socket(int port, const char *interface, int
family)
return fd;
}
-char *get_interface_name(int index)
+char *get_interface_name(int ifindex)
{
struct ifreq ifr;
int sk, err;
- if (index < 0)
+ if (ifindex < 0)
return NULL;
sk = socket(PF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
@@ -659,7 +659,7 @@ char *get_interface_name(int index)
}
memset(&ifr, 0, sizeof(ifr));
- ifr.ifr_ifindex = index;
+ ifr.ifr_ifindex = ifindex;
err = ioctl(sk, SIOCGIFNAME, &ifr);
if (err < 0) {
@@ -673,7 +673,7 @@ char *get_interface_name(int index)
return g_strdup(ifr.ifr_name);
}
-gboolean interface_is_up(int index)
+gboolean interface_is_up(int ifindex)
{
int sk, err;
struct ifreq ifr;
@@ -686,7 +686,7 @@ gboolean interface_is_up(int index)
}
memset(&ifr, 0, sizeof(ifr));
- ifr.ifr_ifindex = index;
+ ifr.ifr_ifindex = ifindex;
err = ioctl(sk, SIOCGIFNAME, &ifr);
if (err < 0) {
diff --git a/gdhcp/server.c b/gdhcp/server.c
index a342985..85699ad 100644
--- a/gdhcp/server.c
+++ b/gdhcp/server.c
@@ -310,7 +310,7 @@ static void destroy_lease_table(GDHCPServer *dhcp_server)
dhcp_server->lease_list = NULL;
}
-static uint32_t get_interface_address(int index)
+static uint32_t get_interface_address(int ifindex)
{
struct ifreq ifr;
int sk, err;
@@ -324,7 +324,7 @@ static uint32_t get_interface_address(int index)
}
memset(&ifr, 0, sizeof(ifr));
- ifr.ifr_ifindex = index;
+ ifr.ifr_ifindex = ifindex;
err = ioctl(sk, SIOCGIFNAME, &ifr);
if (err < 0) {
--
1.7.9.5
_______________________________________________
connman mailing list
connman@connman.net
http://lists.connman.net/listinfo/connman
