diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-06-03 01:02:51 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-06-03 01:02:51 +0200 |
| commit | cfe907ab6eba7c304451f9588cc3b484fe72fe52 (patch) | |
| tree | 922f91d14ade693c5c178bd2e38485ad0713aac7 /src/network/networkd-link.c | |
| parent | 495968cf4e50b0380478833747c4279e19a33856 (diff) | |
| parent | 3ed7e9c735219456a9b6561f9ece617fec1a7aa1 (diff) | |
Merge pull request #41 from mischief/ipforwarding
networkd: create "kernel" setting for IPForwarding
Diffstat (limited to 'src/network/networkd-link.c')
| -rw-r--r-- | src/network/networkd-link.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index f039a2d687..b30fd7ae89 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -1481,6 +1481,9 @@ static int link_set_ipv4_forward(Link *link) { const char *p = NULL; int r; + if (link->network->ip_forward == ADDRESS_FAMILY_KERNEL) + return 0; + p = strjoina("/proc/sys/net/ipv4/conf/", link->ifname, "/forwarding"); r = write_string_file_no_create(p, one_zero(link_ipv4_forward_enabled(link))); if (r < 0) @@ -1497,6 +1500,9 @@ static int link_set_ipv6_forward(Link *link) { if (!socket_ipv6_is_supported()) return 0; + if (link->network->ip_forward == ADDRESS_FAMILY_KERNEL) + return 0; + p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/forwarding"); r = write_string_file_no_create(p, one_zero(link_ipv6_forward_enabled(link))); if (r < 0) |