Finished routing table function operations on macOS

Signed-off-by: Loren Eteval <[email protected]>
LorenEteval · Sep 6, 2023 · a807d0d · a807d0d
1 parent a688b0d
commit a807d0d
Showing 1 changed file with 32 additions and 8 deletions.
diff --git a/Furious/Utility/RoutingTable.py b/Furious/Utility/RoutingTable.py
@@ -12,7 +12,10 @@ class RoutingTable:
     Relations = list()
 
     DEFAULT_GATEWAY_WINDOWS = re.compile(
-        r'0\.0\.0\.0.*?0\.0\.0\.0.*?(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})'
+        r'0\.0\.0\.0.*?0\.0\.0\.0.*?(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})',
+    )
+    DEFAULT_GATEWAY_DARWIN = re.compile(
+        r'gateway:\s*(\S+)',
     )
 
     @staticmethod
@@ -35,8 +38,12 @@ def _add():
 
             if PLATFORM == 'Darwin':
                 try:
-                    # TODO: using networksetup
-                    pass
+                    runCommand(
+                        ['route', 'add', '-net', source, destination],
+                        stdout=subprocess.DEVNULL,
+                        stderr=subprocess.DEVNULL,
+                        check=True,
+                    )
                 except Exception:
                     # Any non-exit exceptions
 
@@ -79,8 +86,21 @@ def _get():
                     return []
 
             if PLATFORM == 'Darwin':
-                # TODO
-                pass
+                try:
+                    result = runCommand(
+                        'route get default'.split(),
+                        stdout=subprocess.PIPE,
+                        stderr=subprocess.PIPE,
+                        check=True,
+                    )
+
+                    return RoutingTable.DEFAULT_GATEWAY_DARWIN.findall(
+                        result.stdout.decode('utf-8', 'replace')
+                    )
+                except Exception:
+                    # Any non-exit exceptions
+
+                    return []
 
         defaultGateway = _get()
 
@@ -167,8 +187,12 @@ def _delete():
 
             if PLATFORM == 'Darwin':
                 try:
-                    # TODO: using networksetup
-                    pass
+                    runCommand(
+                        ['route', 'delete', '-net', source, destination],
+                        stdout=subprocess.DEVNULL,
+                        stderr=subprocess.DEVNULL,
+                        check=True,
+                    )
                 except Exception:
                     # Any non-exit exceptions
 
@@ -191,7 +215,7 @@ def deleteRelations(clear=True):
             if len(RoutingTable.Relations):
                 RoutingTable.delete('0.0.0.0', APPLICATION_TUN_GATEWAY_ADDRESS)
 
-        for source, destination in RoutingTable.Relations:
+        for source, destination in RoutingTable.Relations[::-1]:
             RoutingTable.delete(source, destination)
 
         if clear: