Merge pull request #2009 from pi-hole/tweak/api_network_info

Add netlink implementation
pi-hole · Jul 23, 2024 · 1381fd0 · 1381fd0
2 parents 3b85e10 + f07d902
commit 1381fd0
Show file tree

Hide file tree

Showing 15 changed files with 2,400 additions and 339 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -8,7 +8,9 @@
         "jetmartin.bats",
         "ms-vscode.cpptools",
         "ms-vscode.cmake-tools",
-        "eamodio.gitlens"
+        "eamodio.gitlens",
+        "github.copilot",
+        "ms-python.python"
       ]
     }
   },

diff --git a/.github/.codespellignore b/.github/.codespellignore
@@ -9,3 +9,5 @@ punycode
 bitap
 mmapped
 dnsmasq
+iif
+prefered
diff --git a/src/api/api.c b/src/api/api.c
@@ -90,6 +90,7 @@ static struct {
 	{ "/api/config",                            "/{element}",                 api_config,                            { API_PARSE_JSON, 0                         }, true,  HTTP_GET },
 	{ "/api/config",                            "/{element}/{value}",         api_config,                            { API_PARSE_JSON, 0                         }, true,  HTTP_DELETE | HTTP_PUT },
 	{ "/api/network/gateway",                   "",                           api_network_gateway,                   { API_PARSE_JSON, 0                         }, true,  HTTP_GET },
+	{ "/api/network/routes",                    "",                           api_network_routes,                    { API_PARSE_JSON, 0                         }, true,  HTTP_GET },
 	{ "/api/network/interfaces",                "",                           api_network_interfaces,                { API_PARSE_JSON, 0                         }, true,  HTTP_GET },
 	{ "/api/network/devices",                   "",                           api_network_devices,                   { API_PARSE_JSON, 0                         }, true,  HTTP_GET },
 	{ "/api/network/devices",                   "/{device_id}",               api_network_devices,                   { API_PARSE_JSON, 0                         }, true,  HTTP_DELETE },

diff --git a/src/api/api.h b/src/api/api.h
@@ -80,6 +80,7 @@ int api_logs(struct ftl_conn *api);
 
 // Network methods
 int api_network_gateway(struct ftl_conn *api);
+int api_network_routes(struct ftl_conn *api);
 int api_network_interfaces(struct ftl_conn *api);
 int api_network_devices(struct ftl_conn *api);
 int api_client_suggestions(struct ftl_conn *api);

diff --git a/src/api/docs/content/specs/main.yaml b/src/api/docs/content/specs/main.yaml
@@ -241,6 +241,9 @@ paths:
   /network/gateway:
     $ref: 'network.yaml#/components/paths/gateway'
 
+  /network/routes:
+    $ref: 'network.yaml#/components/paths/routes'
+
   /network/interfaces:
     $ref: 'network.yaml#/components/paths/interfaces'
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,3 +9,5 @@ punycode @@
     bitap
     mmapped
     dnsmasq
+    iif
+    prefered