Merge pull request #2103 from marcosps/forward_not_used

network.c: Remove ip_forward_set and callers
This commit is contained in:
Christian Brauner 2018-01-23 11:31:53 +01:00 committed by GitHub
commit b28e282611
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 32 deletions

View File

@ -1368,32 +1368,6 @@ static int proc_sys_net_write(const char *path, const char *value)
return err;
}
static int ip_forward_set(const char *ifname, int family, int flag)
{
int rc;
char path[MAXPATHLEN];
if (family != AF_INET && family != AF_INET6)
return -EINVAL;
rc = snprintf(path, MAXPATHLEN, "/proc/sys/net/%s/conf/%s/forwarding",
family == AF_INET ? "ipv4" : "ipv6", ifname);
if (rc < 0 || (size_t)rc >= MAXPATHLEN)
return -E2BIG;
return proc_sys_net_write(path, flag ? "1" : "0");
}
int lxc_ip_forward_on(const char *ifname, int family)
{
return ip_forward_set(ifname, family, 1);
}
int lxc_ip_forward_off(const char *ifname, int family)
{
return ip_forward_set(ifname, family, 0);
}
static int neigh_proxy_set(const char *ifname, int family, int flag)
{
int ret;

View File

@ -207,12 +207,6 @@ extern int lxc_macvlan_create(const char *master, const char *name, int mode);
extern int lxc_vlan_create(const char *master, const char *name,
unsigned short vid);
/* Activate forwarding.*/
extern int lxc_ip_forward_on(const char *name, int family);
/* Disable forwarding. */
extern int lxc_ip_forward_off(const char *name, int family);
/* Set ip address. */
extern int lxc_ipv6_addr_add(int ifindex, struct in6_addr *addr,
struct in6_addr *mcast,