Switchlink header file cleanup

switchlink/CMakeLists.txt

@@ -1,6 +1,6 @@
 # CMake build file for krnlmon/switchlink
 #
-# Copyright 2022-2023 Intel Corporation
+# Copyright 2022-2024 Intel Corporation
 # SPDX-License-Identifier: Apache 2.0
 
 include(FindGTest)
@@ -15,10 +15,11 @@ add_library(switchlink_o OBJECT
     switchlink_db_int.h
     switchlink.h
     switchlink_globals.c
-    switchlink_handle.h
+    switchlink_globals.h
+    switchlink_handlers.h
     switchlink_int.h
     switchlink_link.c
-    switchlink_link.h
+    switchlink_link_types.h
     switchlink_main.c
     switchlink_main.h
     switchlink_neigh.c

switchlink/sai/switchlink_handle_ecmp.c

@@ -1,6 +1,7 @@
 /*
  * Copyright 2013-present Barefoot Networks, Inc.
- * Copyright 2022-2023 Intel Corporation.
+ * Copyright 2022-2024 Intel Corporation.
+ * SPDX-License-Identifier: Apache 2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
  * limitations under the License.
  */
 
-#include "switchlink/switchlink_handle.h"
+#include "switchlink/switchlink_handlers.h"
 #include "switchlink_init_sai.h"
 
 static sai_next_hop_group_api_t* sai_nhop_group_api = NULL;

switchlink/sai/switchlink_handle_lag.c

@@ -1,5 +1,6 @@
 /*
- * Copyright 2023 Intel Corporation.
+ * Copyright 2023-2024 Intel Corporation.
+ * SPDX-License-Identifier: Apache 2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

switchlink/sai/switchlink_handle_link.c

@@ -1,6 +1,7 @@
 /*
  * Copyright 2013-present Barefoot Networks, Inc.
- * Copyright 2022-2023 Intel Corporation.
+ * Copyright 2022-2024 Intel Corporation.
+ * SPDX-License-Identifier: Apache 2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
  * limitations under the License.
  */
 
-#include "switchlink/switchlink_handle.h"
+#include "switchlink/switchlink_handlers.h"
 #include "switchlink_init_sai.h"
 
 static sai_virtual_router_api_t* sai_vrf_api = NULL;

switchlink/sai/switchlink_handle_neigh.c

@@ -1,6 +1,7 @@
 /*
  * Copyright 2013-present Barefoot Networks, Inc.
- * Copyright 2022-2023 Intel Corporation.
+ * Copyright 2022-2024 Intel Corporation.
+ * SPDX-License-Identifier: Apache 2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,11 +16,13 @@
  * limitations under the License.
  */
 
-#include "switchlink/switchlink_handle.h"
+#include "switchlink/switchlink_globals.h"
+#include "switchlink/switchlink_handlers.h"
 #include "switchlink_init_sai.h"
 
 static sai_neighbor_api_t* sai_neigh_api = NULL;
 static sai_fdb_api_t* sai_fdb_api = NULL;
+
 /*
  * Routine Description:
  *    Initialize Neighbor SAI API
@@ -71,7 +74,7 @@ sai_status_t sai_init_fdb_api() {
  */
 
 bool validate_delete_nexthop(uint32_t using_by,
-                             switchlink_nhop_using_by_e type) {
+                             enum switchlink_nhop_using_by type) {
   return (using_by & ~(type)) ? false : true;
 }
 

switchlink/sai/switchlink_handle_nexthop.c

@@ -1,6 +1,7 @@
 /*
  * Copyright 2013-present Barefoot Networks, Inc.
- * Copyright 2022-2023 Intel Corporation.
+ * Copyright 2022-2024 Intel Corporation.
+ * SPDX-License-Identifier: Apache 2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
  * limitations under the License.
  */
 
-#include "switchlink/switchlink_handle.h"
+#include "switchlink/switchlink_handlers.h"
 #include "switchlink_init_sai.h"
 
 static sai_next_hop_api_t* sai_nhop_api = NULL;

switchlink/sai/switchlink_handle_route.c

@@ -1,6 +1,7 @@
 /*
  * Copyright 2013-present Barefoot Networks, Inc.
- * Copyright 2022-2023 Intel Corporation.
+ * Copyright 2022-2024 Intel Corporation.
+ * SPDX-License-Identifier: Apache 2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +16,8 @@
  * limitations under the License.
  */
 
-#include "switchlink/switchlink_handle.h"
+#include "switchlink/switchlink_globals.h"
+#include "switchlink/switchlink_handlers.h"
 #include "switchlink_init_sai.h"
 
 static sai_route_api_t* sai_route_api = NULL;

switchlink/sai/switchlink_handle_tunnel.c

@@ -1,6 +1,7 @@
 /*
  * Copyright 2013-present Barefoot Networks, Inc.
- * Copyright 2022-2023 Intel Corporation.
+ * Copyright 2022-2024 Intel Corporation.
+ * SPDX-License-Identifier: Apache 2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
  * limitations under the License.
  */
 
-#include "switchlink/switchlink_handle.h"
+#include "switchlink/switchlink_handlers.h"
 #include "switchlink_init_sai.h"
 
 static sai_tunnel_api_t* sai_tunnel_intf_api = NULL;

switchlink/sai/switchlink_init_sai.h

@@ -95,6 +95,6 @@ int switchlink_create_vrf(switchlink_handle_t* vrf_h);
 
 // General utility function
 bool validate_delete_nexthop(uint32_t using_by,
-                             switchlink_nhop_using_by_e type);
+                             enum switchlink_nhop_using_by type);
 
 #endif /* __SWITCHLINK_INIT_SAI_H__ */

switchlink/switchlink.h

@@ -1,6 +1,7 @@
 /*
  * Copyright 2013-present Barefoot Networks, Inc.
- * Copyright 2022-2023 Intel Corporation.
+ * Copyright 2022-2024 Intel Corporation.
+ * SPDX-License-Identifier: Apache 2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,15 +27,12 @@
 #define switchlink_malloc(x, c) malloc((x) * (c))
 #define switchlink_free(x) free(x)
 
-#define SWITCHLINK_LOG_ERR 1
-#define SWITCHLINK_LOG_WARN 2
-#define SWITCHLINK_LOG_INFO 3
-#define SWITCHLINK_LOG_DEBUG 4
-
 #define SWITCH_LINK_INVALID_HANDLE 0x0
 
 typedef uint64_t switchlink_handle_t;
+
 typedef uint8_t switchlink_mac_addr_t[6];
+
 typedef struct switchlink_ip_addr_ {
   uint8_t family;
   uint8_t prefix_len;
@@ -44,24 +42,10 @@ typedef struct switchlink_ip_addr_ {
   } ip;
 } switchlink_ip_addr_t;
 
-extern uint8_t g_log_level;
-extern switchlink_handle_t g_default_vrf_h;
-extern switchlink_handle_t g_default_bridge_h;
-extern switchlink_handle_t g_cpu_rx_nhop_h;
-
-struct nl_sock* switchlink_get_nl_sock(void);
-
-typedef enum switchlink_entry_type {
-  SWITCHLINK_FDB_NONE = 0,
-  SWITCHLINK_FDB_ADD = 1,
-  SWITCHLINK_FDB_DEL = 2,
-  SWITCHLINK_FDB_MAX = 3,
-} switchlink_entry_type_e;
-
-typedef enum switchlink_nhop_using_by {
+enum switchlink_nhop_using_by {
   SWITCHLINK_NHOP_FROM_NONE = 0,
   SWITCHLINK_NHOP_FROM_NEIGHBOR = 1 << 0,
   SWITCHLINK_NHOP_FROM_ROUTE = 1 << 1,
-} switchlink_nhop_using_by_e;
+};
 
 #endif /* __SWITCHLINK_H__ */

switchlink/switchlink_address.c

@@ -1,7 +1,6 @@
 /*
  * Copyright 2013-present Barefoot Networks, Inc.
- * Copyright 2022-2023 Intel Corporation.
- *
+ * Copyright 2022-2024 Intel Corporation.
  * SPDX-License-Identifier: Apache 2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,9 +18,9 @@
 
 #include <netlink/msg.h>
 
-#include "switchlink_handle.h"
+#include "switchlink_globals.h"
+#include "switchlink_handlers.h"
 #include "switchlink_int.h"
-#include "switchlink_route.h"
 
 /*
  * Routine Description:

switchlink/switchlink_address_test.cc

@@ -1,3 +1,6 @@
+// Copyright 2023-2024 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+
 #include <arpa/inet.h>
 #include <linux/if_arp.h>
 #include <memory.h>
@@ -8,9 +11,9 @@
 #include "gtest/gtest.h"
 
 extern "C" {
-#include "switchlink/switchlink_handle.h"
-#include "switchlink/switchlink_int.h"
-#include "switchlink/switchlink_route.h"
+#include "switchlink_handlers.h"
+#include "switchlink_int.h"
+#include "switchlink_route.h"
 }
 
 using namespace std;

switchlink/switchlink_db.c

@@ -1,6 +1,7 @@
 /*
  * Copyright 2013-present Barefoot Networks, Inc.
- * Copyright 2022-2023 Intel Corporation.
+ * Copyright 2022-2024 Intel Corporation.
+ * SPDX-License-Identifier: Apache 2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,9 +26,7 @@
 #include "switchlink.h"
 #include "switchlink_db_int.h"
 #include "switchlink_int.h"
-#include "switchlink_link.h"
-#include "switchlink_neigh.h"
-#include "switchlink_route.h"
+#include "switchlink_link_types.h"
 #include "xxHash/xxhash.h"
 
 #define SWITCHLINK_MAC_KEY_LEN 14

switchlink/switchlink_db.h

@@ -1,6 +1,7 @@
 /*
  * Copyright 2013-present Barefoot Networks, Inc.
- * Copyright 2022-2023 Intel Corporation.
+ * Copyright 2022-2024 Intel Corporation.
+ * SPDX-License-Identifier: Apache 2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +22,7 @@
 #include <stdbool.h>
 
 #include "switchlink.h"
-#include "switchlink_link.h"
+#include "switchlink_link_types.h"
 
 #define SWITCHLINK_INTERFACE_NAME_LEN_MAX 32
 #define SWITCHLINK_ECMP_NUM_MEMBERS_MAX 16

switchlink/switchlink_globals.c

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache 2.0
  */
 
-#include "switchlink.h"
+#include "switchlink_globals.h"
 
 switchlink_handle_t g_default_vrf_h = 0;
 switchlink_handle_t g_default_bridge_h = 0;

switchlink/switchlink_globals.h

@@ -0,0 +1,16 @@
+/*
+ * Copyright 2013-present Barefoot Networks, Inc.
+ * Copyright 2022-2024 Intel Corporation.
+ * SPDX-License-Identifier: Apache 2.0
+ */
+
+#ifndef __SWITCHLINK_GLOBALS_H__
+#define __SWITCHLINK_GLOBALS_H__
+
+#include "switchlink.h"
+
+extern switchlink_handle_t g_default_vrf_h;
+extern switchlink_handle_t g_default_bridge_h;
+extern switchlink_handle_t g_cpu_rx_nhop_h;
+
+#endif /* __SWITCHLINK_GLOBALS_H__ */

switchlink/switchlink_handle.h → switchlink/switchlink_handlers.h

@@ -1,6 +1,6 @@
 /*
  * Copyright 2013-present Barefoot Networks, Inc.
- * Copyright 2022-2023 Intel Corporation.
+ * Copyright 2022-2024 Intel Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#ifndef __SWITCHLINK_HANDLE_H__
-#define __SWITCHLINK_HANDLE_H__
+#ifndef __SWITCHLINK_HANDLERS_H__
+#define __SWITCHLINK_HANDLERS_H__
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -81,6 +81,6 @@ extern int switchlink_create_vrf(switchlink_handle_t* vrf_h);
 
 // General utility function
 extern bool validate_delete_nexthop(uint32_t using_by,
-                                    switchlink_nhop_using_by_e type);
+                                    enum switchlink_nhop_using_by type);
 
-#endif /* __SWITCHLINK_HANDLE_H__ */
+#endif /* __SWITCHLINK_HANDLERS_H__ */

switchlink/switchlink_link.c

@@ -1,7 +1,6 @@
 /*
  * Copyright 2013-present Barefoot Networks, Inc.
- * Copyright 2022-2023 Intel Corporation.
- *
+ * Copyright 2022-2024 Intel Corporation.
  * SPDX-License-Identifier: Apache 2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,8 +16,6 @@
  * limitations under the License.
  */
 
-#include "switchlink_link.h"
-
 #include <fcntl.h>
 #include <linux/errno.h>
 #include <linux/ethtool.h>
@@ -33,8 +30,10 @@
 #include <unistd.h>
 
 #include "switchlink.h"
-#include "switchlink_handle.h"
+#include "switchlink_globals.h"
+#include "switchlink_handlers.h"
 #include "switchlink_int.h"
+#include "switchlink_link_types.h"
 #include "switchlink_utils.h"
 
 #if defined(ES2K_TARGET)

switchlink/switchlink_link_test.cc

@@ -1,4 +1,4 @@
-// Copyright 2023 Intel Corporation
+// Copyright 2023-2024 Intel Corporation
 // SPDX-License-Identifier: Apache-2.0
 
 #include <linux/if_arp.h>
@@ -10,9 +10,10 @@
 #include "gtest/gtest.h"
 
 extern "C" {
-#include "switchlink/switchlink_handle.h"
-#include "switchlink/switchlink_int.h"
-#include "switchlink/switchlink_link.h"
+#include "switchlink_globals.h"
+#include "switchlink_handlers.h"
+#include "switchlink_int.h"
+#include "switchlink_link_types.h"
 }
 
 #define IPV4_ADDR(a, b, c, d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d))