Merge pull request #1157 from RaspAP/feature/routing-table

Implement routing table raw output
RaspAP · Apr 24, 2022 · 5cbe9eb · 5cbe9eb
2 parents 658a300 + f0d1fe9
commit 5cbe9eb
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 0 deletions.
diff --git a/includes/internetRoute.php b/includes/internetRoute.php
@@ -55,3 +55,14 @@ function getRouteInfo($checkAccess)
     return $rInfo;
 }
 
+/*
+ * Fetches raw output of ip route
+ *
+ * @return string
+ */
+function getRouteInfoRaw()
+{
+    exec('ip route list', $routes);
+    return $routes;
+}
+
diff --git a/includes/networking.php b/includes/networking.php
@@ -14,13 +14,15 @@ function DisplayNetworkingConfig()
 
     exec("ls /sys/class/net | grep -v lo", $interfaces);
     $routeInfo = getRouteInfo(true);
+    $routeInfoRaw = getRouteInfoRaw();
     $arrHostapdConf = parse_ini_file(RASPI_CONFIG.'/hostapd.ini');
     $bridgedEnabled = $arrHostapdConf['BridgedEnable'];
 
     echo renderTemplate("networking", compact(
         "status",
         "interfaces",
         "routeInfo",
+        "routeInfoRaw",
         "bridgedEnabled")
     );
 }
diff --git a/locale/en_US/LC_MESSAGES/messages.mo b/locale/en_US/LC_MESSAGES/messages.mo
diff --git a/locale/en_US/LC_MESSAGES/messages.po b/locale/en_US/LC_MESSAGES/messages.po
@@ -679,6 +679,12 @@ msgstr "Error saving network configuration to file"
 msgid "Unable to detect interface"
 msgstr "Unable to detect interface"
 
+msgid "Routing table"
+msgstr "Routing table"
+
+msgid "raw output"
+msgstr "raw output"
+
 #: includes/system.php
 msgid "System Information"
 msgstr "System Information"

diff --git a/templates/networking.php b/templates/networking.php
@@ -55,6 +55,29 @@
                 </div>
               </div>
             </div>
+
+            <h4 class="mt-3"><?php echo _("Routing table"); ?></h4>
+            <div class="card h-100 w-100">
+              <div class="card-header"><?php echo _("raw output") ?></div>
+              <div class="card-body">
+                <div class="row">
+                  <div class="col-sm-12">
+                    <div class="table-responsive">
+                      <table class="table">
+                        <tbody>
+                          <?php foreach($routeInfoRaw as $route): ?>
+                            <tr>
+                              <pre class="unstyled"><?php echo $route; ?></pre>
+                            </tr>
+                          <?php endforeach ?>
+                        </tbody>
+                      </table>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+
             <h4 class="mt-3"><?php echo _("Current settings") ?></h4>
             <div class="row">
               <?php if (!$bridgedEnabled) : // No interface details when bridged ?>