From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Mon, 18 Jun 2018 17:42:21 +0000 (-0400)
Subject: babeld: Use enum instead of #defines for kernel route type information
X-Git-Tag: frr-6.1-dev~74^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=e8c8f2e064c674d1c0935aaf04091c97e117c62f;p=matthieu%2Ffrr.git

babeld: Use enum instead of #defines for kernel route type information

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/babeld/kernel.c b/babeld/kernel.c
index 7e78b6dec7..ba2b58131c 100644
--- a/babeld/kernel.c
+++ b/babeld/kernel.c
@@ -73,9 +73,9 @@ kernel_interface_wireless(struct interface *interface)
 }
 
 int
-kernel_route(int operation, const unsigned char *pref, unsigned short plen,
-             const unsigned char *gate, int ifindex, unsigned int metric,
-             const unsigned char *newgate, int newifindex,
+kernel_route(enum babel_kernel_routes operation, const unsigned char *pref,
+	     unsigned short plen, const unsigned char *gate, int ifindex,
+	     unsigned int metric, const unsigned char *newgate, int newifindex,
              unsigned int newmetric)
 {
     int rc;
@@ -116,12 +116,9 @@ kernel_route(int operation, const unsigned char *pref, unsigned short plen,
                              newmetric);
             return rc;
             break;
-        default:
-            zlog_err("this should never happen (false value - kernel_route)");
-            assert(0);
-            exit(1);
-            break;
     }
+
+    return 0;
 }
 
 static int
diff --git a/babeld/kernel.h b/babeld/kernel.h
index eb1e793279..5b1437ef3e 100644
--- a/babeld/kernel.h
+++ b/babeld/kernel.h
@@ -29,17 +29,19 @@ THE SOFTWARE.
 
 #define KERNEL_INFINITY 0xFFFF
 
-#define ROUTE_FLUSH 0
-#define ROUTE_ADD 1
-#define ROUTE_MODIFY 2
+enum babel_kernel_routes {
+    ROUTE_FLUSH,
+    ROUTE_ADD,
+    ROUTE_MODIFY,
+};
 
 int kernel_interface_operational(struct interface *interface);
 int kernel_interface_mtu(struct interface *interface);
 int kernel_interface_wireless(struct interface *interface);
-int kernel_route(int operation, const unsigned char *dest, unsigned short plen,
-                 const unsigned char *gate, int ifindex, unsigned int metric,
-                 const unsigned char *newgate, int newifindex,
-                 unsigned int newmetric);
+int kernel_route(enum babel_kernel_routes operation, const unsigned char *dest,
+		 unsigned short plen, const unsigned char *gate, int ifindex,
+		 unsigned int metric, const unsigned char *newgate,
+		 int newifindex, unsigned int newmetric);
 int if_eui64(int ifindex, unsigned char *eui);
 int gettime(struct timeval *tv);
 int read_random_bytes(void *buf, size_t len);