From: Christian Brauner Date: Thu, 26 Aug 2021 19:39:38 +0000 (+0200) Subject: tree-wide: s/ipv{4,6}_list/ipv{4,6}_addresses/g X-Git-Tag: lxc-5.0.0~100^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05a54a64de0d05410afb0870c24fb20da68709a4;p=thirdparty%2Flxc.git tree-wide: s/ipv{4,6}_list/ipv{4,6}_addresses/g Signed-off-by: Christian Brauner --- diff --git a/src/lxc/confile.c b/src/lxc/confile.c index 919991d86..482d91987 100644 --- a/src/lxc/confile.c +++ b/src/lxc/confile.c @@ -851,7 +851,7 @@ static int set_config_net_ipv4_address(const char *key, const char *value, inetdev->bcast.s_addr |= htonl(INADDR_BROADCAST >> shift); } - list_add_tail(&inetdev->head, &netdev->ipv4_list); + list_add_tail(&inetdev->head, &netdev->ipv4_addresses); move_ptr(inetdev); return 0; @@ -992,7 +992,7 @@ static int set_config_net_ipv6_address(const char *key, const char *value, if (!ret || ret < 0) return log_error_errno(-EINVAL, EINVAL, "Invalid ipv6 address \"%s\"", valdup); - list_add_tail(&inet6dev->head, &netdev->ipv6_list); + list_add_tail(&inet6dev->head, &netdev->ipv6_addresses); move_ptr(inet6dev); return 0; @@ -5721,7 +5721,7 @@ static int clr_config_net_ipv4_address(const char *key, if (!netdev) return ret_errno(EINVAL); - list_for_each_entry_safe(inetdev, ninetdev, &netdev->ipv4_list, head) { + list_for_each_entry_safe(inetdev, ninetdev, &netdev->ipv4_addresses, head) { list_del(&inetdev->head); free(inetdev); } @@ -5772,7 +5772,7 @@ static int clr_config_net_ipv6_address(const char *key, if (!netdev) return ret_errno(EINVAL); - list_for_each_entry_safe(inet6dev, ninet6dev, &netdev->ipv6_list, head) { + list_for_each_entry_safe(inet6dev, ninet6dev, &netdev->ipv6_addresses, head) { list_del(&inet6dev->head); free(inet6dev); } @@ -6303,9 +6303,9 @@ static int get_config_net_ipv4_address(const char *key, char *retv, int inlen, else memset(retv, 0, inlen); - listlen = list_len(&netdev->ipv4_list); + listlen = list_len(&netdev->ipv4_addresses); - list_for_each_entry(inetdev, &netdev->ipv4_list, head) { + list_for_each_entry(inetdev, &netdev->ipv4_addresses, head) { if (!inet_ntop(AF_INET, &inetdev->addr, buf, sizeof(buf))) return -errno; strprint(retv, inlen, "%s/%u%s", buf, inetdev->prefix, @@ -6396,8 +6396,8 @@ static int get_config_net_ipv6_address(const char *key, char *retv, int inlen, else memset(retv, 0, inlen); - listlen = list_len(&netdev->ipv6_list); - list_for_each_entry(inet6dev, &netdev->ipv6_list, head) { + listlen = list_len(&netdev->ipv6_addresses); + list_for_each_entry(inet6dev, &netdev->ipv6_addresses, head) { if (!inet_ntop(AF_INET6, &inet6dev->addr, buf, sizeof(buf))) return -errno; strprint(retv, inlen, "%s/%u%s", buf, inet6dev->prefix, diff --git a/src/lxc/confile_utils.c b/src/lxc/confile_utils.c index ca96407bf..4fca889c8 100644 --- a/src/lxc/confile_utils.c +++ b/src/lxc/confile_utils.c @@ -168,8 +168,8 @@ static struct lxc_netdev *lxc_network_add(struct list_head *head, int idx, bool if (!netdev) return ret_set_errno(NULL, ENOMEM); - INIT_LIST_HEAD(&netdev->ipv4_list); - INIT_LIST_HEAD(&netdev->ipv6_list); + INIT_LIST_HEAD(&netdev->ipv4_addresses); + INIT_LIST_HEAD(&netdev->ipv6_addresses); /* give network a unique index */ netdev->idx = idx; @@ -343,7 +343,7 @@ void lxc_log_configured_netdevs(const struct lxc_conf *conf) TRACE("ipv4 gateway: %s", bufinet4); } - list_for_each_entry(inet4dev, &netdev->ipv4_list, head) { + list_for_each_entry(inet4dev, &netdev->ipv4_addresses, head) { inet_ntop(AF_INET, &inet4dev->addr, bufinet4, sizeof(bufinet4)); TRACE("ipv4 addr: %s", bufinet4); @@ -361,7 +361,7 @@ void lxc_log_configured_netdevs(const struct lxc_conf *conf) TRACE("ipv6 gateway: %s", bufinet6); } - list_for_each_entry(inet6dev, &netdev->ipv6_list, head) { + list_for_each_entry(inet6dev, &netdev->ipv6_addresses, head) { inet_ntop(AF_INET6, &inet6dev->addr, bufinet6, sizeof(bufinet6)); TRACE("ipv6 addr: %s", bufinet6); @@ -411,13 +411,13 @@ void lxc_clear_netdev(struct lxc_netdev *netdev) free_disarm(netdev->mtu); free_disarm(netdev->ipv4_gateway); - list_for_each_entry_safe(inetdev, ninetdev, &netdev->ipv4_list, head) { + list_for_each_entry_safe(inetdev, ninetdev, &netdev->ipv4_addresses, head) { list_del(&inetdev->head); free(inetdev); } free_disarm(netdev->ipv6_gateway); - list_for_each_entry_safe(inet6dev, ninet6dev, &netdev->ipv6_list, head) { + list_for_each_entry_safe(inet6dev, ninet6dev, &netdev->ipv6_addresses, head) { list_del(&inet6dev->head); free(inet6dev); } @@ -444,8 +444,8 @@ void lxc_clear_netdev(struct lxc_netdev *netdev) head = netdev->head; memset(netdev, 0, sizeof(struct lxc_netdev)); netdev->head = head; - INIT_LIST_HEAD(&netdev->ipv4_list); - INIT_LIST_HEAD(&netdev->ipv6_list); + INIT_LIST_HEAD(&netdev->ipv4_addresses); + INIT_LIST_HEAD(&netdev->ipv6_addresses); netdev->type = -1; netdev->idx = idx; } diff --git a/src/lxc/network.c b/src/lxc/network.c index 83a8a09c6..1f120fdda 100644 --- a/src/lxc/network.c +++ b/src/lxc/network.c @@ -226,7 +226,7 @@ static int setup_ipv4_addr_routes(struct lxc_netdev *netdev) return ret_errno(EINVAL); ifindex = netdev->priv.veth_attr.ifindex; - list_for_each_entry(inetdev, &netdev->ipv4_list, head) { + list_for_each_entry(inetdev, &netdev->ipv4_addresses, head) { err = lxc_ipv4_dest_add(ifindex, &inetdev->addr, 32); if (err) return log_error_errno(-1, err, "Failed to setup ipv4 address route for network device with eifindex %d", ifindex); @@ -245,7 +245,7 @@ static int setup_ipv6_addr_routes(struct lxc_netdev *netdev) return ret_errno(EINVAL); ifindex = netdev->priv.veth_attr.ifindex; - list_for_each_entry(inet6dev, &netdev->ipv6_list, head) { + list_for_each_entry(inet6dev, &netdev->ipv6_addresses, head) { err = lxc_ipv6_dest_add(ifindex, &inet6dev->addr, 128); if (err) @@ -3234,14 +3234,14 @@ static int lxc_setup_l2proxy(struct lxc_netdev *netdev) { /* If IPv4 addresses are specified, then check that sysctl is configured correctly. */ - if (!list_empty(&netdev->ipv4_list)) { + if (!list_empty(&netdev->ipv4_addresses)) { /* Check for net.ipv4.conf.[link].forwarding=1 */ if (lxc_is_ip_forwarding_enabled(netdev->link, AF_INET) < 0) return log_error_errno(-1, EINVAL, "Requires sysctl net.ipv4.conf.%s.forwarding=1", netdev->link); } /* If IPv6 addresses are specified, then check that sysctl is configured correctly. */ - if (!list_empty(&netdev->ipv6_list)) { + if (!list_empty(&netdev->ipv6_addresses)) { /* Check for net.ipv6.conf.[link].proxy_ndp=1 */ if (lxc_is_ip_neigh_proxy_enabled(netdev->link, AF_INET6) < 0) return log_error_errno(-1, EINVAL, "Requires sysctl net.ipv6.conf.%s.proxy_ndp=1", netdev->link); @@ -3263,7 +3263,7 @@ static int lxc_setup_l2proxy(struct lxc_netdev *netdev) { return log_error_errno(-1, EINVAL, "Failed to retrieve ifindex for \"%s\" routing cleanup", loop_device); } - list_for_each_entry(inet4dev, &netdev->ipv4_list, head) { + list_for_each_entry(inet4dev, &netdev->ipv4_addresses, head) { if (!inet_ntop(AF_INET, &inet4dev->addr, bufinet4, sizeof(bufinet4))) return ret_set_errno(-1, -errno); @@ -3278,7 +3278,7 @@ static int lxc_setup_l2proxy(struct lxc_netdev *netdev) { } } - list_for_each_entry(inet6dev, &netdev->ipv6_list, head) { + list_for_each_entry(inet6dev, &netdev->ipv6_addresses, head) { if (!inet_ntop(AF_INET6, &inet6dev->addr, bufinet6, sizeof(bufinet6))) return ret_set_errno(-1, -errno); @@ -3381,12 +3381,12 @@ static int lxc_delete_l2proxy(struct lxc_netdev *netdev) } } - list_for_each_entry(inet4dev, &netdev->ipv4_list, head) { + list_for_each_entry(inet4dev, &netdev->ipv4_addresses, head) { if (lxc_delete_ipv4_l2proxy(&inet4dev->addr, netdev->link, lo_ifindex) < 0) err++; } - list_for_each_entry(inet6dev, &netdev->ipv6_list, head) { + list_for_each_entry(inet6dev, &netdev->ipv6_addresses, head) { if (lxc_delete_ipv6_l2proxy(&inet6dev->addr, netdev->link, lo_ifindex) < 0) err++; } @@ -3817,7 +3817,7 @@ static int setup_ipv4_addr(struct lxc_netdev *netdev) int err; struct lxc_inetdev *inet4dev; - list_for_each_entry(inet4dev, &netdev->ipv4_list, head) { + list_for_each_entry(inet4dev, &netdev->ipv4_addresses, head) { err = lxc_ipv4_addr_add(ifindex, &inet4dev->addr, &inet4dev->bcast, inet4dev->prefix); if (err) @@ -3833,7 +3833,7 @@ static int setup_ipv6_addr(struct lxc_netdev *netdev) struct lxc_inet6dev *inet6dev; int ifindex = netdev->ifindex; - list_for_each_entry(inet6dev, &netdev->ipv6_list, head) { + list_for_each_entry(inet6dev, &netdev->ipv6_addresses, head) { err = lxc_ipv6_addr_add(ifindex, &inet6dev->addr, &inet6dev->mcast, &inet6dev->acast, inet6dev->prefix); @@ -3878,7 +3878,7 @@ static int lxc_network_setup_in_child_namespaces_common(struct lxc_netdev *netde if (!(netdev->flags & IFF_UP)) return log_error(-1, "Cannot add ipv4 gateway for network device \"%s\" when not bringing up the interface", netdev->name); - if (list_empty(&netdev->ipv4_list)) + if (list_empty(&netdev->ipv4_addresses)) return log_error(-1, "Cannot add ipv4 gateway for network device \"%s\" when not assigning an address", netdev->name); /* Setup device route if ipv4_gateway_dev is enabled */ @@ -3915,7 +3915,7 @@ static int lxc_network_setup_in_child_namespaces_common(struct lxc_netdev *netde if (!(netdev->flags & IFF_UP)) return log_error(-1, "Cannot add ipv6 gateway for network device \"%s\" when not bringing up the interface", netdev->name); - if (list_empty(&netdev->ipv6_list) && !IN6_IS_ADDR_LINKLOCAL(netdev->ipv6_gateway)) + if (list_empty(&netdev->ipv6_addresses) && !IN6_IS_ADDR_LINKLOCAL(netdev->ipv6_gateway)) return log_error(-1, "Cannot add ipv6 gateway for network device \"%s\" when not assigning an address", netdev->name); /* Setup device route if ipv6_gateway_dev is enabled */ diff --git a/src/lxc/network.h b/src/lxc/network.h index ad6830aa2..5532618c0 100644 --- a/src/lxc/network.h +++ b/src/lxc/network.h @@ -173,8 +173,8 @@ struct lxc_netdev { char *hwaddr; char *mtu; union netdev_p priv; - struct list_head ipv4_list; - struct list_head ipv6_list; + struct list_head ipv4_addresses; + struct list_head ipv6_addresses; bool ipv4_gateway_auto; bool ipv4_gateway_dev; struct in_addr *ipv4_gateway;