fix network byte order

jackhart · Jun 3, 2023 · a9f6a78 · a9f6a78
1 parent 2928da8
commit a9f6a78
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 7 deletions.
diff --git a/Taskfile.yml b/Taskfile.yml
@@ -26,6 +26,12 @@ tasks:
     status:
       - '[ -n "$(find ./venv/lib/*/site-packages -type d -name "pygmp-*.dist-info" -print -quit)" ]'
 
+  test:
+    desc: Run pytests.
+    deps: [ install ]
+    cmds:
+      - sudo {{.USER_WORKING_DIR}}/venv/bin/python3 -m pytest -s {{.CLI_ARGS}}
+
   setup-network:
     desc: Setup the network namespaces for testing.
     cmds:

diff --git a/pygmp/daemons/simple.py b/pygmp/daemons/simple.py
@@ -39,7 +39,7 @@
 
 
 def main(sock, args, app):
-    config = load_config("/home/jack/Documents/projects/pygmp/tests/simple.ini")  # TODO - cleanup
+    config = load_config("/home/jack/Documents/projects/pygmp/tests/simple_confs/basic1.ini")  # TODO - move
     kernel.flush(sock)
     kernel.disable_pim(sock)
     kernel.enable_mrt(sock)
@@ -205,7 +205,7 @@ def add(self, mroute: MRoute):
         if str(mroute.source) == ANY_ADDR:
             vifi = self.vif_manager.vifi(mroute.from_)
             if self._dynamic_mroutes.get(vifi):
-                self._dynamic_mroutes[vifi][self._dynamic_mroutes[vifi].index(mroute)] = mroute
+                self._dynamic_mroutes[vifi][self._dynamic_mroutes[vifi].index(mroute)] = mroute # FIXME throws ValueError
             else:
                 self._dynamic_mroutes[vifi] = [mroute]
         else:

diff --git a/pygmp/utils.py b/pygmp/utils.py
@@ -22,6 +22,7 @@
 from __future__ import annotations
 import hashlib
 import socket
+import sys
 from ipaddress import ip_address, IPv4Address, IPv6Address
 
 
@@ -49,6 +50,7 @@ def host_hex_to_ip(hex_val: str) -> IPv4Address | IPv6Address:
     """Convert a hex string in network byte order (big-endian) to IP address object."""
     # Convert hex string to bytes
     net_order = bytes.fromhex(hex_val)
+    net_order = net_order if sys.byteorder == 'big' else net_order[::-1]
 
     if len(net_order) == 4:  # IPv4 address
         return ip_address(socket.inet_ntop(socket.AF_INET, net_order))

diff --git a/tests/simple.ini → tests/simple_confs/basic1.ini b/tests/simple.ini → tests/simple_confs/basic1.ini
@@ -11,4 +11,3 @@ from = a1
 source = 192.168.2.1
 group = 224.0.1.0
 to = a2,a3=2
-
diff --git a/tests/test_simple.py b/tests/test_simple.py
@@ -1,5 +1,5 @@
 import pytest
-
+from pathlib import Path
 from pygmp import kernel
 from pygmp.daemons import config, simple
 
@@ -10,9 +10,9 @@ def igmp_sock():
         yield sock
 
 
-@pytest.fixture
-def example_config():  # FIXME
-    return config.load_config("/home/jack/Documents/projects/pygmp/tests/simple.ini")
+@pytest.fixture(params=list(Path("/home/jack/Documents/projects/pygmp/tests/simple_confs").glob("*.ini")))
+def example_config(request):  # FIXME
+    return config.load_config(str(request.param))
 
 
 @pytest.fixture
@@ -67,6 +67,7 @@ def test_vifmanager_vifi(vif_manager):
         vif_manager.vifi("a4")
 
 
+
 def test_mfcmanager_init(mfc_manager):
     assert len(mfc_manager.static_mfc()) == 1
     assert len(mfc_manager.dynamic_mfc()) == 1
@@ -84,3 +85,8 @@ def test_mfcmanager_remove(mfc_manager, example_config):
     mfc_manager.remove(example_config.mroute[1])
     assert len(mfc_manager.static_mfc()) == 0
     assert len(mfc_manager.dynamic_mfc()) == 0
+
+
+def test_print(mfc_manager, example_config):
+    print(mfc_manager.static_mfc())
+    print(mfc_manager.dynamic_mfc())