---
src/inet.c | 216 ++++++++++++++++++++++++++++++------------------------------
1 file changed, 108 insertions(+), 108 deletions(-)
diff --git a/src/inet.c b/src/inet.c
index c28c3e4..1874979 100644
--- a/src/inet.c
+++ b/src/inet.c
@@ -73,7 +73,7 @@ int __connman_inet_rtnl_addattr_l(struct nlmsghdr *n, size_t
max_length,
}
int __connman_inet_modify_address(int cmd, int flags,
- int index, int family,
+ int ifindex, int family,
const char *address,
const char *peer,
unsigned char prefixlen,
@@ -92,7 +92,7 @@ int __connman_inet_modify_address(int cmd, int flags,
int sk, err;
DBG("cmd %#x flags %#x index %d family %d address %s peer %s "
- "prefixlen %hhu broadcast %s", cmd, flags, index, family,
+ "prefixlen %hhu broadcast %s", cmd, flags, ifindex, family,
address, peer, prefixlen, broadcast);
if (address == NULL)
@@ -114,7 +114,7 @@ int __connman_inet_modify_address(int cmd, int flags,
ifaddrmsg->ifa_prefixlen = prefixlen;
ifaddrmsg->ifa_flags = IFA_F_PERMANENT;
ifaddrmsg->ifa_scope = RT_SCOPE_UNIVERSE;
- ifaddrmsg->ifa_index = index;
+ ifaddrmsg->ifa_index = ifindex;
if (family == AF_INET) {
if (inet_pton(AF_INET, address, &ipv4_addr) < 1)
@@ -212,12 +212,12 @@ int connman_inet_ifindex(const char *name)
return ifr.ifr_ifindex;
}
-char *connman_inet_ifname(int index)
+char *connman_inet_ifname(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);
@@ -225,7 +225,7 @@ char *connman_inet_ifname(int index)
return NULL;
memset(&ifr, 0, sizeof(ifr));
- ifr.ifr_ifindex = index;
+ ifr.ifr_ifindex = ifindex;
err = ioctl(sk, SIOCGIFNAME, &ifr);
@@ -237,7 +237,7 @@ char *connman_inet_ifname(int index)
return strdup(ifr.ifr_name);
}
-short int connman_inet_ifflags(int index)
+short int connman_inet_ifflags(int ifindex)
{
struct ifreq ifr;
int sk, err;
@@ -247,7 +247,7 @@ short int connman_inet_ifflags(int index)
return -errno;
memset(&ifr, 0, sizeof(ifr));
- ifr.ifr_ifindex = index;
+ ifr.ifr_ifindex = ifindex;
if (ioctl(sk, SIOCGIFNAME, &ifr) < 0) {
err = -errno;
@@ -267,7 +267,7 @@ done:
return err;
}
-int connman_inet_ifup(int index)
+int connman_inet_ifup(int ifindex)
{
struct ifreq ifr;
int sk, err;
@@ -277,7 +277,7 @@ int connman_inet_ifup(int index)
return -errno;
memset(&ifr, 0, sizeof(ifr));
- ifr.ifr_ifindex = index;
+ ifr.ifr_ifindex = ifindex;
if (ioctl(sk, SIOCGIFNAME, &ifr) < 0) {
err = -errno;
@@ -309,7 +309,7 @@ done:
return err;
}
-int connman_inet_ifdown(int index)
+int connman_inet_ifdown(int ifindex)
{
struct ifreq ifr;
int sk, err;
@@ -319,7 +319,7 @@ int connman_inet_ifdown(int index)
return -errno;
memset(&ifr, 0, sizeof(ifr));
- ifr.ifr_ifindex = index;
+ ifr.ifr_ifindex = ifindex;
if (ioctl(sk, SIOCGIFNAME, &ifr) < 0) {
err = -errno;
@@ -349,14 +349,14 @@ done:
return err;
}
-static char *index2addr(int index)
+static char *index2addr(int ifindex)
{
struct ifreq ifr;
struct ether_addr eth;
char *str;
int sk, err;
- if (index < 0)
+ if (ifindex < 0)
return NULL;
sk = socket(PF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
@@ -364,7 +364,7 @@ static char *index2addr(int index)
return NULL;
memset(&ifr, 0, sizeof(ifr));
- ifr.ifr_ifindex = index;
+ ifr.ifr_ifindex = ifindex;
err = ioctl(sk, SIOCGIFNAME, &ifr);
@@ -392,14 +392,14 @@ static char *index2addr(int index)
return str;
}
-static char *index2ident(int index, const char *prefix)
+static char *index2ident(int ifindex, const char *prefix)
{
struct ifreq ifr;
struct ether_addr eth;
char *str;
int sk, err, len;
- if (index < 0)
+ if (ifindex < 0)
return NULL;
sk = socket(PF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
@@ -407,7 +407,7 @@ static char *index2ident(int index, const char *prefix)
return NULL;
memset(&ifr, 0, sizeof(ifr));
- ifr.ifr_ifindex = index;
+ ifr.ifr_ifindex = ifindex;
err = ioctl(sk, SIOCGIFNAME, &ifr);
@@ -438,7 +438,7 @@ static char *index2ident(int index, const char *prefix)
return str;
}
-connman_bool_t connman_inet_is_cfg80211(int index)
+connman_bool_t connman_inet_is_cfg80211(int ifindex)
{
connman_bool_t result = FALSE;
char phy80211_path[PATH_MAX];
@@ -451,7 +451,7 @@ connman_bool_t connman_inet_is_cfg80211(int index)
return FALSE;
memset(&ifr, 0, sizeof(ifr));
- ifr.ifr_ifindex = index;
+ ifr.ifr_ifindex = ifindex;
if (ioctl(sk, SIOCGIFNAME, &ifr) < 0)
goto done;
@@ -468,17 +468,17 @@ done:
return result;
}
-struct connman_device *connman_inet_create_device(int index)
+struct connman_device *connman_inet_create_device(int ifindex)
{
enum connman_device_type type;
struct connman_device *device;
char *devname, *ident = NULL;
char *addr = NULL, *name = NULL;
- if (index < 0)
+ if (ifindex < 0)
return NULL;
- devname = connman_inet_ifname(index);
+ devname = connman_inet_ifname(ifindex);
if (devname == NULL)
return NULL;
@@ -488,7 +488,7 @@ struct connman_device *connman_inet_create_device(int index)
return NULL;
}
- type = __connman_rtnl_get_device_type(index);
+ type = __connman_rtnl_get_device_type(ifindex);
switch (type) {
case CONNMAN_DEVICE_TYPE_UNKNOWN:
@@ -499,8 +499,8 @@ struct connman_device *connman_inet_create_device(int index)
case CONNMAN_DEVICE_TYPE_GADGET:
case CONNMAN_DEVICE_TYPE_WIFI:
case CONNMAN_DEVICE_TYPE_WIMAX:
- name = index2ident(index, "");
- addr = index2addr(index);
+ name = index2ident(ifindex, "");
+ addr = index2addr(ifindex);
break;
case CONNMAN_DEVICE_TYPE_BLUETOOTH:
case CONNMAN_DEVICE_TYPE_CELLULAR:
@@ -521,20 +521,20 @@ struct connman_device *connman_inet_create_device(int
index)
break;
case CONNMAN_DEVICE_TYPE_ETHERNET:
case CONNMAN_DEVICE_TYPE_GADGET:
- ident = index2ident(index, NULL);
+ ident = index2ident(ifindex, NULL);
break;
case CONNMAN_DEVICE_TYPE_WIFI:
case CONNMAN_DEVICE_TYPE_WIMAX:
- ident = index2ident(index, NULL);
+ ident = index2ident(ifindex, NULL);
break;
case CONNMAN_DEVICE_TYPE_BLUETOOTH:
break;
case CONNMAN_DEVICE_TYPE_CELLULAR:
- ident = index2ident(index, NULL);
+ ident = index2ident(ifindex, NULL);
break;
}
- connman_device_set_index(device, index);
+ connman_device_set_index(device, ifindex);
connman_device_set_interface(device, devname);
if (ident != NULL) {
@@ -558,7 +558,7 @@ struct in6_ifreq {
unsigned int ifr6_ifindex;
};
-int connman_inet_set_ipv6_address(int index,
+int connman_inet_set_ipv6_address(int ifindex,
struct connman_ipaddress *ipaddress)
{
int err;
@@ -571,10 +571,10 @@ int connman_inet_set_ipv6_address(int index,
prefix_len = ipaddress->prefixlen;
address = ipaddress->local;
- DBG("index %d address %s prefix_len %d", index, address, prefix_len);
+ DBG("index %d address %s prefix_len %d", ifindex, address, prefix_len);
err = __connman_inet_modify_address(RTM_NEWADDR,
- NLM_F_REPLACE | NLM_F_ACK, index, AF_INET6,
+ NLM_F_REPLACE | NLM_F_ACK, ifindex, AF_INET6,
address, NULL, prefix_len, NULL);
if (err < 0) {
connman_error("%s: %s", __func__, strerror(-err));
@@ -584,7 +584,7 @@ int connman_inet_set_ipv6_address(int index,
return 0;
}
-int connman_inet_set_address(int index, struct connman_ipaddress *ipaddress)
+int connman_inet_set_address(int ifindex, struct connman_ipaddress *ipaddress)
{
int err;
unsigned char prefix_len;
@@ -598,10 +598,10 @@ int connman_inet_set_address(int index, struct
connman_ipaddress *ipaddress)
broadcast = ipaddress->broadcast;
peer = ipaddress->peer;
- DBG("index %d address %s prefix_len %d", index, address, prefix_len);
+ DBG("index %d address %s prefix_len %d", ifindex, address, prefix_len);
err = __connman_inet_modify_address(RTM_NEWADDR,
- NLM_F_REPLACE | NLM_F_ACK, index, AF_INET,
+ NLM_F_REPLACE | NLM_F_ACK, ifindex, AF_INET,
address, peer, prefix_len, broadcast);
if (err < 0) {
connman_error("%s: %s", __func__, strerror(-err));
@@ -611,14 +611,14 @@ int connman_inet_set_address(int index, struct
connman_ipaddress *ipaddress)
return 0;
}
-int connman_inet_clear_ipv6_address(int index, const char *address,
+int connman_inet_clear_ipv6_address(int ifindex, const char *address,
int prefix_len)
{
int err;
- DBG("index %d address %s prefix_len %d", index, address, prefix_len);
+ DBG("index %d address %s prefix_len %d", ifindex, address, prefix_len);
- err = __connman_inet_modify_address(RTM_DELADDR, 0, index, AF_INET6,
+ err = __connman_inet_modify_address(RTM_DELADDR, 0, ifindex, AF_INET6,
address, NULL, prefix_len, NULL);
if (err < 0) {
connman_error("%s: %s", __func__, strerror(-err));
@@ -628,7 +628,7 @@ int connman_inet_clear_ipv6_address(int index, const char
*address,
return 0;
}
-int connman_inet_clear_address(int index, struct connman_ipaddress *ipaddress)
+int connman_inet_clear_address(int ifindex, struct connman_ipaddress
*ipaddress)
{
int err;
unsigned char prefix_len;
@@ -639,9 +639,9 @@ int connman_inet_clear_address(int index, struct
connman_ipaddress *ipaddress)
broadcast = ipaddress->broadcast;
peer = ipaddress->peer;
- DBG("index %d address %s prefix_len %d", index, address, prefix_len);
+ DBG("index %d address %s prefix_len %d", ifindex, address, prefix_len);
- err = __connman_inet_modify_address(RTM_DELADDR, 0, index, AF_INET,
+ err = __connman_inet_modify_address(RTM_DELADDR, 0, ifindex, AF_INET,
address, peer, prefix_len, broadcast);
if (err < 0) {
connman_error("%s: %s", __func__, strerror(-err));
@@ -651,18 +651,18 @@ int connman_inet_clear_address(int index, struct
connman_ipaddress *ipaddress)
return 0;
}
-int connman_inet_add_host_route(int index, const char *host,
+int connman_inet_add_host_route(int ifindex, const char *host,
const char *gateway)
{
- return connman_inet_add_network_route(index, host, gateway, NULL);
+ return connman_inet_add_network_route(ifindex, host, gateway, NULL);
}
-int connman_inet_del_host_route(int index, const char *host)
+int connman_inet_del_host_route(int ifindex, const char *host)
{
- return connman_inet_del_network_route(index, host);
+ return connman_inet_del_network_route(ifindex, host);
}
-int connman_inet_add_network_route(int index, const char *host,
+int connman_inet_add_network_route(int ifindex, const char *host,
const char *gateway,
const char *netmask)
{
@@ -671,7 +671,7 @@ int connman_inet_add_network_route(int index, const char
*host,
struct sockaddr_in addr;
int sk, err;
- DBG("index %d host %s gateway %s netmask %s", index,
+ DBG("index %d host %s gateway %s netmask %s", ifindex,
host, gateway, netmask);
sk = socket(PF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
@@ -679,7 +679,7 @@ int connman_inet_add_network_route(int index, const char
*host,
return -1;
memset(&ifr, 0, sizeof(ifr));
- ifr.ifr_ifindex = index;
+ ifr.ifr_ifindex = ifindex;
if (ioctl(sk, SIOCGIFNAME, &ifr) < 0) {
close(sk);
@@ -729,21 +729,21 @@ int connman_inet_add_network_route(int index, const char
*host,
return err;
}
-int connman_inet_del_network_route(int index, const char *host)
+int connman_inet_del_network_route(int ifindex, const char *host)
{
struct ifreq ifr;
struct rtentry rt;
struct sockaddr_in addr;
int sk, err;
- DBG("index %d host %s", index, host);
+ DBG("index %d host %s", ifindex, host);
sk = socket(PF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
if (sk < 0)
return -1;
memset(&ifr, 0, sizeof(ifr));
- ifr.ifr_ifindex = index;
+ ifr.ifr_ifindex = ifindex;
if (ioctl(sk, SIOCGIFNAME, &ifr) < 0) {
close(sk);
@@ -772,13 +772,13 @@ int connman_inet_del_network_route(int index, const char
*host)
return err;
}
-int connman_inet_del_ipv6_network_route(int index, const char *host,
+int connman_inet_del_ipv6_network_route(int ifindex, const char *host,
unsigned char prefix_len)
{
struct in6_rtmsg rt;
int sk, err;
- DBG("index %d host %s", index, host);
+ DBG("index %d host %s", ifindex, host);
if (host == NULL)
return -EINVAL;
@@ -794,7 +794,7 @@ int connman_inet_del_ipv6_network_route(int index, const
char *host,
rt.rtmsg_flags = RTF_UP | RTF_HOST;
rt.rtmsg_metric = 1;
- rt.rtmsg_ifindex = index;
+ rt.rtmsg_ifindex = ifindex;
sk = socket(AF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, 0);
if (sk < 0) {
@@ -812,19 +812,19 @@ out:
return err;
}
-int connman_inet_del_ipv6_host_route(int index, const char *host)
+int connman_inet_del_ipv6_host_route(int ifindex, const char *host)
{
- return connman_inet_del_ipv6_network_route(index, host, 128);
+ return connman_inet_del_ipv6_network_route(ifindex, host, 128);
}
-int connman_inet_add_ipv6_network_route(int index, const char *host,
+int connman_inet_add_ipv6_network_route(int ifindex, const char *host,
const char *gateway,
unsigned char prefix_len)
{
struct in6_rtmsg rt;
int sk, err;
- DBG("index %d host %s gateway %s", index, host, gateway);
+ DBG("index %d host %s gateway %s", ifindex, host, gateway);
if (host == NULL)
return -EINVAL;
@@ -845,7 +845,7 @@ int connman_inet_add_ipv6_network_route(int index, const
char *host,
}
rt.rtmsg_metric = 1;
- rt.rtmsg_ifindex = index;
+ rt.rtmsg_ifindex = ifindex;
sk = socket(AF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, 0);
if (sk < 0) {
@@ -863,18 +863,18 @@ out:
return err;
}
-int connman_inet_add_ipv6_host_route(int index, const char *host,
+int connman_inet_add_ipv6_host_route(int ifindex, const char *host,
const char *gateway)
{
- return connman_inet_add_ipv6_network_route(index, host, gateway, 128);
+ return connman_inet_add_ipv6_network_route(ifindex, host, gateway, 128);
}
-int connman_inet_set_ipv6_gateway_address(int index, const char *gateway)
+int connman_inet_set_ipv6_gateway_address(int ifindex, const char *gateway)
{
struct in6_rtmsg rt;
int sk, err;
- DBG("index %d gateway %s", index, gateway);
+ DBG("index %d gateway %s", ifindex, gateway);
if (gateway == NULL)
return -EINVAL;
@@ -888,7 +888,7 @@ int connman_inet_set_ipv6_gateway_address(int index, const
char *gateway)
rt.rtmsg_flags = RTF_UP | RTF_GATEWAY;
rt.rtmsg_metric = 1;
rt.rtmsg_dst_len = 0;
- rt.rtmsg_ifindex = index;
+ rt.rtmsg_ifindex = ifindex;
sk = socket(AF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, 0);
if (sk < 0) {
@@ -906,12 +906,12 @@ out:
return err;
}
-int connman_inet_clear_ipv6_gateway_address(int index, const char *gateway)
+int connman_inet_clear_ipv6_gateway_address(int ifindex, const char *gateway)
{
struct in6_rtmsg rt;
int sk, err;
- DBG("index %d gateway %s", index, gateway);
+ DBG("index %d gateway %s", ifindex, gateway);
if (gateway == NULL)
return -EINVAL;
@@ -925,7 +925,7 @@ int connman_inet_clear_ipv6_gateway_address(int index,
const char *gateway)
rt.rtmsg_flags = RTF_UP | RTF_GATEWAY;
rt.rtmsg_metric = 1;
rt.rtmsg_dst_len = 0;
- rt.rtmsg_ifindex = index;
+ rt.rtmsg_ifindex = ifindex;
sk = socket(AF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, 0);
if (sk < 0) {
@@ -943,21 +943,21 @@ out:
return err;
}
-int connman_inet_set_gateway_address(int index, const char *gateway)
+int connman_inet_set_gateway_address(int ifindex, const char *gateway)
{
struct ifreq ifr;
struct rtentry rt;
struct sockaddr_in addr;
int sk, err;
- DBG("index %d gateway %s", index, gateway);
+ DBG("index %d gateway %s", ifindex, gateway);
sk = socket(PF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
if (sk < 0)
return -1;
memset(&ifr, 0, sizeof(ifr));
- ifr.ifr_ifindex = index;
+ ifr.ifr_ifindex = ifindex;
if (ioctl(sk, SIOCGIFNAME, &ifr) < 0) {
close(sk);
@@ -994,21 +994,21 @@ int connman_inet_set_gateway_address(int index, const
char *gateway)
return err;
}
-int connman_inet_set_gateway_interface(int index)
+int connman_inet_set_gateway_interface(int ifindex)
{
struct ifreq ifr;
struct rtentry rt;
struct sockaddr_in addr;
int sk, err;
- DBG("index %d", index);
+ DBG("index %d", ifindex);
sk = socket(PF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
if (sk < 0)
return -1;
memset(&ifr, 0, sizeof(ifr));
- ifr.ifr_ifindex = index;
+ ifr.ifr_ifindex = ifindex;
if (ioctl(sk, SIOCGIFNAME, &ifr) < 0) {
close(sk);
@@ -1039,7 +1039,7 @@ int connman_inet_set_gateway_interface(int index)
return err;
}
-int connman_inet_set_ipv6_gateway_interface(int index)
+int connman_inet_set_ipv6_gateway_interface(int ifindex)
{
struct ifreq ifr;
struct rtentry rt;
@@ -1047,14 +1047,14 @@ int connman_inet_set_ipv6_gateway_interface(int index)
const struct in6_addr any = IN6ADDR_ANY_INIT;
int sk, err;
- DBG("index %d", index);
+ DBG("index %d", ifindex);
sk = socket(PF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, 0);
if (sk < 0)
return -1;
memset(&ifr, 0, sizeof(ifr));
- ifr.ifr_ifindex = index;
+ ifr.ifr_ifindex = ifindex;
if (ioctl(sk, SIOCGIFNAME, &ifr) < 0) {
close(sk);
@@ -1085,21 +1085,21 @@ int connman_inet_set_ipv6_gateway_interface(int index)
return err;
}
-int connman_inet_clear_gateway_address(int index, const char *gateway)
+int connman_inet_clear_gateway_address(int ifindex, const char *gateway)
{
struct ifreq ifr;
struct rtentry rt;
struct sockaddr_in addr;
int sk, err;
- DBG("index %d gateway %s", index, gateway);
+ DBG("index %d gateway %s", ifindex, gateway);
sk = socket(PF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
if (sk < 0)
return -1;
memset(&ifr, 0, sizeof(ifr));
- ifr.ifr_ifindex = index;
+ ifr.ifr_ifindex = ifindex;
if (ioctl(sk, SIOCGIFNAME, &ifr) < 0) {
close(sk);
@@ -1136,21 +1136,21 @@ int connman_inet_clear_gateway_address(int index, const
char *gateway)
return err;
}
-int connman_inet_clear_gateway_interface(int index)
+int connman_inet_clear_gateway_interface(int ifindex)
{
struct ifreq ifr;
struct rtentry rt;
struct sockaddr_in addr;
int sk, err;
- DBG("index %d", index);
+ DBG("index %d", ifindex);
sk = socket(PF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
if (sk < 0)
return -1;
memset(&ifr, 0, sizeof(ifr));
- ifr.ifr_ifindex = index;
+ ifr.ifr_ifindex = ifindex;
if (ioctl(sk, SIOCGIFNAME, &ifr) < 0) {
close(sk);
@@ -1181,7 +1181,7 @@ int connman_inet_clear_gateway_interface(int index)
return err;
}
-int connman_inet_clear_ipv6_gateway_interface(int index)
+int connman_inet_clear_ipv6_gateway_interface(int ifindex)
{
struct ifreq ifr;
struct rtentry rt;
@@ -1189,14 +1189,14 @@ int connman_inet_clear_ipv6_gateway_interface(int index)
const struct in6_addr any = IN6ADDR_ANY_INIT;
int sk, err;
- DBG("index %d", index);
+ DBG("index %d", ifindex);
sk = socket(PF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, 0);
if (sk < 0)
return -1;
memset(&ifr, 0, sizeof(ifr));
- ifr.ifr_ifindex = index;
+ ifr.ifr_ifindex = ifindex;
if (ioctl(sk, SIOCGIFNAME, &ifr) < 0) {
close(sk);
@@ -1227,7 +1227,7 @@ int connman_inet_clear_ipv6_gateway_interface(int index)
return err;
}
-connman_bool_t connman_inet_compare_subnet(int index, const char *host)
+connman_bool_t connman_inet_compare_subnet(int ifindex, const char *host)
{
struct ifreq ifr;
struct in_addr _host_addr;
@@ -1249,7 +1249,7 @@ connman_bool_t connman_inet_compare_subnet(int index,
const char *host)
return FALSE;
memset(&ifr, 0, sizeof(ifr));
- ifr.ifr_ifindex = index;
+ ifr.ifr_ifindex = ifindex;
if (ioctl(sk, SIOCGIFNAME, &ifr) < 0) {
close(sk);
@@ -1277,7 +1277,7 @@ connman_bool_t connman_inet_compare_subnet(int index,
const char *host)
return ((if_addr & netmask_addr) == (host_addr & netmask_addr));
}
-int connman_inet_remove_from_bridge(int index, const char *bridge)
+int connman_inet_remove_from_bridge(int ifindex, const char *bridge)
{
struct ifreq ifr;
int sk, err;
@@ -1291,7 +1291,7 @@ int connman_inet_remove_from_bridge(int index, const char
*bridge)
memset(&ifr, 0, sizeof(ifr));
strncpy(ifr.ifr_name, bridge, IFNAMSIZ - 1);
- ifr.ifr_ifindex = index;
+ ifr.ifr_ifindex = ifindex;
err = ioctl(sk, SIOCBRDELIF, &ifr);
@@ -1306,7 +1306,7 @@ int connman_inet_remove_from_bridge(int index, const char
*bridge)
return 0;
}
-int connman_inet_add_to_bridge(int index, const char *bridge)
+int connman_inet_add_to_bridge(int ifindex, const char *bridge)
{
struct ifreq ifr;
int sk, err;
@@ -1320,7 +1320,7 @@ int connman_inet_add_to_bridge(int index, const char
*bridge)
memset(&ifr, 0, sizeof(ifr));
strncpy(ifr.ifr_name, bridge, IFNAMSIZ - 1);
- ifr.ifr_ifindex = index;
+ ifr.ifr_ifindex = ifindex;
err = ioctl(sk, SIOCBRADDIF, &ifr);
@@ -1335,7 +1335,7 @@ int connman_inet_add_to_bridge(int index, const char
*bridge)
return 0;
}
-int connman_inet_set_mtu(int index, int mtu)
+int connman_inet_set_mtu(int ifindex, int mtu)
{
struct ifreq ifr;
int sk, err;
@@ -1345,7 +1345,7 @@ int connman_inet_set_mtu(int index, int mtu)
return sk;
memset(&ifr, 0, sizeof(ifr));
- ifr.ifr_ifindex = index;
+ ifr.ifr_ifindex = ifindex;
err = ioctl(sk, SIOCGIFNAME, &ifr);
if (err == 0) {
@@ -1360,7 +1360,7 @@ int connman_inet_set_mtu(int index, int mtu)
int connman_inet_setup_tunnel(char *tunnel, int mtu)
{
struct ifreq ifr;
- int sk, err, index;
+ int sk, err, ifindex;
__u32 mask;
__u32 flags;
@@ -1371,9 +1371,9 @@ int connman_inet_setup_tunnel(char *tunnel, int mtu)
if (sk < 0)
return sk;
- index = if_nametoindex(tunnel);
+ ifindex = if_nametoindex(tunnel);
- err = connman_inet_set_mtu(index, mtu);
+ err = connman_inet_set_mtu(ifindex, mtu);
if (err < 0)
return err;
else if (err)
@@ -1698,7 +1698,7 @@ static int if_mc_group(int sock, int ifindex, const
struct in6_addr *mc_addr,
return setsockopt(sock, IPPROTO_IPV6, cmd, &mreq, sizeof(mreq));
}
-int __connman_inet_ipv6_send_rs(int index, int timeout,
+int __connman_inet_ipv6_send_rs(int ifindex, int timeout,
__connman_inet_rs_cb_t callback, void *user_data)
{
struct rs_cb_data *data;
@@ -1731,8 +1731,8 @@ int __connman_inet_ipv6_send_rs(int index, int timeout,
sizeof(struct icmp6_filter));
ipv6_addr_solict_mult(&dst, &solicit);
- if_mc_group(sk, index, &in6addr_all_nodes_mc, IPV6_JOIN_GROUP);
- if_mc_group(sk, index, &solicit, IPV6_JOIN_GROUP);
+ if_mc_group(sk, ifindex, &in6addr_all_nodes_mc, IPV6_JOIN_GROUP);
+ if_mc_group(sk, ifindex, &solicit, IPV6_JOIN_GROUP);
data->channel = g_io_channel_unix_new(sk);
g_io_channel_set_close_on_unref(data->channel, TRUE);
@@ -1744,7 +1744,7 @@ int __connman_inet_ipv6_send_rs(int index, int timeout,
G_IO_IN | G_IO_NVAL | G_IO_HUP | G_IO_ERR,
icmpv6_event, data);
- ndisc_send_unspec(ND_ROUTER_SOLICIT, index, &dst);
+ ndisc_send_unspec(ND_ROUTER_SOLICIT, ifindex, &dst);
return 0;
}
@@ -1799,7 +1799,7 @@ GSList *__connman_inet_ipv6_get_prefixes(struct
nd_router_advert *hdr,
return prefixes;
}
-static int get_dest_addr(int family, int index, char *buf, int len)
+static int get_dest_addr(int family, int ifindex, char *buf, int len)
{
struct ifreq ifr;
void *addr;
@@ -1810,7 +1810,7 @@ static int get_dest_addr(int family, int index, char
*buf, int len)
return -errno;
memset(&ifr, 0, sizeof(ifr));
- ifr.ifr_ifindex = index;
+ ifr.ifr_ifindex = ifindex;
if (ioctl(sk, SIOCGIFNAME, &ifr) < 0) {
DBG("SIOCGIFNAME (%d/%s)", errno, strerror(errno));
@@ -1830,7 +1830,7 @@ static int get_dest_addr(int family, int index, char
*buf, int len)
return -errno;
}
- DBG("index %d %s", index, ifr.ifr_name);
+ DBG("index %d %s", ifindex, ifr.ifr_name);
if (ioctl(sk, SIOCGIFDSTADDR, &ifr) < 0) {
connman_error("Get destination address failed (%s)",
@@ -1861,12 +1861,12 @@ static int get_dest_addr(int family, int index, char
*buf, int len)
return 0;
}
-int connman_inet_get_dest_addr(int index, char **dest)
+int connman_inet_get_dest_addr(int ifindex, char **dest)
{
char addr[INET_ADDRSTRLEN];
int ret;
- ret = get_dest_addr(PF_INET, index, addr, INET_ADDRSTRLEN);
+ ret = get_dest_addr(PF_INET, ifindex, addr, INET_ADDRSTRLEN);
if (ret < 0)
return ret;
@@ -1877,12 +1877,12 @@ int connman_inet_get_dest_addr(int index, char **dest)
return 0;
}
-int connman_inet_ipv6_get_dest_addr(int index, char **dest)
+int connman_inet_ipv6_get_dest_addr(int ifindex, char **dest)
{
char addr[INET6_ADDRSTRLEN];
int ret;
- ret = get_dest_addr(PF_INET6, index, addr, INET6_ADDRSTRLEN);
+ ret = get_dest_addr(PF_INET6, ifindex, addr, INET6_ADDRSTRLEN);
if (ret < 0)
return ret;
--
1.7.9.5
_______________________________________________
connman mailing list
[email protected]
http://lists.connman.net/listinfo/connman
