[libvirt] [PATCH 3/4] bridge_driver.c: more uses of SYSCTL_PATH

[Laine Stump]

On 03/03/2017 10:00 AM, Cédric Bosdonnat wrote:
> Replace a few occurences of /proc/sys by the corresponding macro
> defined a few lines after: SYSCTL_PATH
> ---
>  src/network/bridge_driver.c | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
> index c5ec2823d..3f6561055 100644
> --- a/src/network/bridge_driver.c
> +++ b/src/network/bridge_driver.c
> @@ -85,6 +85,8 @@
>   */
>  #define VIR_NETWORK_DHCP_LEASE_FILE_SIZE_MAX (32 * 1024 * 1024)
>  
> +#define SYSCTL_PATH "/proc/sys"
> +
>  VIR_LOG_INIT("network.bridge_driver");
>  
>  static virNetworkDriverStatePtr network_driver;
> @@ -2080,15 +2082,14 @@ networkEnableIPForwarding(bool enableIPv4, bool enableIPv6)
>                             &enabled, sizeof(enabled));
>  #else
>      if (enableIPv4)
> -        ret = virFileWriteStr("/proc/sys/net/ipv4/ip_forward", "1\n", 0);
> +        ret = virFileWriteStr(SYSCTL_PATH "/net/ipv4/ip_forward", "1\n", 0);
>      if (enableIPv6 && ret == 0)
> -        ret = virFileWriteStr("/proc/sys/net/ipv6/conf/all/forwarding", "1\n", 0);
> +        ret = virFileWriteStr(SYSCTL_PATH "/net/ipv6/conf/all/forwarding", "1\n", 0);
> +
>  #endif
>      return ret;
>  }
>  
> -#define SYSCTL_PATH "/proc/sys"
> -
>  static int
>  networkSetIPv6Sysctls(virNetworkObjPtr network)
>  {


Sure. ACK.