Merge pull request #8643 from icosahedral/master

[mirror_frr.git] / zebra / ipforward_proc.c

diff --git a/zebra/ipforward_proc.c b/zebra/ipforward_proc.c
index feafbb27cfcddabb0f2279c3d92a8fcfec8c7012..4bd160ddbca6e741b0c3ff8e40a457c254d02fa8 100644 (file)
--- a/zebra/ipforward_proc.c
+++ b/zebra/ipforward_proc.c
@@ -25,19 +25,16 @@
 
 #include "log.h"
 #include "privs.h"
-#include "lib_errors.h"
 
 #include "zebra/ipforward.h"
 
 extern struct zebra_privs_t zserv_privs;
 
-char proc_net_snmp[] = "/proc/net/snmp";
+static const char proc_net_snmp[] = "/proc/net/snmp";
 
 static void dropline(FILE *fp)
 {
-       int c;
-
-       while ((c = getc(fp)) != '\n')
+       while (getc(fp) != '\n')
                ;
 }
 
@@ -71,33 +68,25 @@ int ipforward(void)
 }
 
 /* char proc_ipv4_forwarding[] = "/proc/sys/net/ipv4/conf/all/forwarding"; */
-char proc_ipv4_forwarding[] = "/proc/sys/net/ipv4/ip_forward";
+static const char proc_ipv4_forwarding[] = "/proc/sys/net/ipv4/ip_forward";
 
 int ipforward_on(void)
 {
        FILE *fp;
 
-       if (zserv_privs.change(ZPRIVS_RAISE))
-               zlog_ferr(LIB_ERR_PRIVILEGES, "Can't raise privileges, %s",
-                         safe_strerror(errno));
+       frr_with_privs(&zserv_privs) {
 
-       fp = fopen(proc_ipv4_forwarding, "w");
+               fp = fopen(proc_ipv4_forwarding, "w");
 
-       if (fp == NULL) {
-               if (zserv_privs.change(ZPRIVS_LOWER))
-                       zlog_ferr(LIB_ERR_PRIVILEGES,
-                                 "Can't lower privileges, %s",
-                                 safe_strerror(errno));
-               return -1;
-       }
+               if (fp == NULL) {
+                       return -1;
+               }
 
-       fprintf(fp, "1\n");
+               fprintf(fp, "1\n");
 
-       fclose(fp);
+               fclose(fp);
 
-       if (zserv_privs.change(ZPRIVS_LOWER))
-               zlog_ferr(LIB_ERR_PRIVILEGES, "Can't lower privileges, %s",
-                         safe_strerror(errno));
+       }
 
        return ipforward();
 }
@@ -106,32 +95,25 @@ int ipforward_off(void)
 {
        FILE *fp;
 
-       if (zserv_privs.change(ZPRIVS_RAISE))
-               zlog_ferr(LIB_ERR_PRIVILEGES, "Can't raise privileges, %s",
-                         safe_strerror(errno));
+       frr_with_privs(&zserv_privs) {
 
-       fp = fopen(proc_ipv4_forwarding, "w");
+               fp = fopen(proc_ipv4_forwarding, "w");
 
-       if (fp == NULL) {
-               if (zserv_privs.change(ZPRIVS_LOWER))
-                       zlog_ferr(LIB_ERR_PRIVILEGES,
-                                 "Can't lower privileges, %s",
-                                 safe_strerror(errno));
-               return -1;
-       }
+               if (fp == NULL) {
+                       return -1;
+               }
 
-       fprintf(fp, "0\n");
+               fprintf(fp, "0\n");
 
-       fclose(fp);
+               fclose(fp);
 
-       if (zserv_privs.change(ZPRIVS_LOWER))
-               zlog_ferr(LIB_ERR_PRIVILEGES, "Can't lower privileges, %s",
-                         safe_strerror(errno));
+       }
 
        return ipforward();
 }
 
-char proc_ipv6_forwarding[] = "/proc/sys/net/ipv6/conf/all/forwarding";
+static const char proc_ipv6_forwarding[] =
+       "/proc/sys/net/ipv6/conf/all/forwarding";
 
 int ipforward_ipv6(void)
 {
@@ -160,27 +142,19 @@ int ipforward_ipv6_on(void)
 {
        FILE *fp;
 
-       if (zserv_privs.change(ZPRIVS_RAISE))
-               zlog_ferr(LIB_ERR_PRIVILEGES, "Can't raise privileges, %s",
-                         safe_strerror(errno));
+       frr_with_privs(&zserv_privs) {
 
-       fp = fopen(proc_ipv6_forwarding, "w");
+               fp = fopen(proc_ipv6_forwarding, "w");
 
-       if (fp == NULL) {
-               if (zserv_privs.change(ZPRIVS_LOWER))
-                       zlog_ferr(LIB_ERR_PRIVILEGES,
-                                 "Can't lower privileges, %s",
-                                 safe_strerror(errno));
-               return -1;
-       }
+               if (fp == NULL) {
+                       return -1;
+               }
 
-       fprintf(fp, "1\n");
+               fprintf(fp, "1\n");
 
-       fclose(fp);
+               fclose(fp);
 
-       if (zserv_privs.change(ZPRIVS_LOWER))
-               zlog_ferr(LIB_ERR_PRIVILEGES, "Can't lower privileges, %s",
-                         safe_strerror(errno));
+       }
 
        return ipforward_ipv6();
 }
@@ -190,27 +164,19 @@ int ipforward_ipv6_off(void)
 {
        FILE *fp;
 
-       if (zserv_privs.change(ZPRIVS_RAISE))
-               zlog_ferr(LIB_ERR_PRIVILEGES, "Can't raise privileges, %s",
-                         safe_strerror(errno));
+       frr_with_privs(&zserv_privs) {
 
-       fp = fopen(proc_ipv6_forwarding, "w");
+               fp = fopen(proc_ipv6_forwarding, "w");
 
-       if (fp == NULL) {
-               if (zserv_privs.change(ZPRIVS_LOWER))
-                       zlog_ferr(LIB_ERR_PRIVILEGES,
-                                 "Can't lower privileges, %s",
-                                 safe_strerror(errno));
-               return -1;
-       }
+               if (fp == NULL) {
+                       return -1;
+               }
 
-       fprintf(fp, "0\n");
+               fprintf(fp, "0\n");
 
-       fclose(fp);
+               fclose(fp);
 
-       if (zserv_privs.change(ZPRIVS_LOWER))
-               zlog_ferr(LIB_ERR_PRIVILEGES, "Can't lower privileges, %s",
-                         safe_strerror(errno));
+       }
 
        return ipforward_ipv6();
 }