dhcp protocol update

.gitignore

@@ -20,3 +20,5 @@ benchmark.log
 venv
 .venv
 .nox*
+tests/*.db
+tests/*.json

Makefile

@@ -7,14 +7,20 @@ python ?= $(shell util/find_python.sh)
 platform := $(shell uname -s)
 releaseTag ?= $(shell git describe --tags --abbrev=0)
 releaseDescription := $(shell git tag -l -n1 ${releaseTag} | sed 's/[0-9. ]\+//')
+noxboot ?= ~/.venv-boot
 
 define nox
         {\
 		which nox 2>/dev/null || {\
-			${python} -m venv ~/.venv-boot/;\
-			. ~/.venv-boot/bin/activate;\
-			pip install --upgrade pip;\
-			pip install nox;\
+		    test -d ${noxboot} && \
+				{\
+					. ${noxboot}/bin/activate;\
+				} || {\
+					${python} -m venv ${noxboot};\
+					. ${noxboot}/bin/activate;\
+					pip install --upgrade pip;\
+					pip install nox;\
+				};\
 		};\
 		nox $(1) -- '${noxconfig}';\
 	}
@@ -46,6 +52,8 @@ clean:
 	@rm -rf lab/_build
 	@rm -rf docs/html
 	@rm -rf docs/man
+	@rm -f tests/*.db
+	@rm -f tests/*.json
 	@rm -rf dist build MANIFEST
 	@rm -f docs-build.log
 	@rm -rf pyroute2.egg-info

noxfile.py

@@ -37,6 +37,18 @@
 ]
 
 
+def load_global_config():
+    if sys.argv[-2] == '--' and len(sys.argv[-1]):
+        return json.loads(sys.argv[-1])
+    return {}
+
+
+global_config = load_global_config()
+if global_config.get('fast'):
+    nox.options.reuse_venv = 'yes'
+    nox.options.no_install = True
+
+
 def add_session_config(func):
     '''Decorator to load the session config.
 
@@ -55,12 +67,7 @@ def my_session_func(session, config):
     '''
 
     def wrapper(session):
-        if session.posargs and len(session.posargs[0]) > 0:
-            config = json.loads(session.posargs[0])
-        else:
-            config = {}
-        session.debug(f'session config: {config}')
-        return func(session, config)
+        return func(session, global_config)
 
     wrapper.__name__ = func.__name__
     wrapper.__doc__ = func.__doc__
@@ -151,14 +158,21 @@ def setup_venv_minimal(session, config):
     return tmpdir
 
 
-def setup_venv_common(session, flavour='dev'):
-    session.install('--upgrade', 'pip')
-    session.install('-r', f'requirements.{flavour}.txt')
-    session.install('.')
+def setup_venv_common(session, flavour='dev', config=None):
+    if config is None:
+        config = {}
+    if not config.get('fast'):
+        session.install('--upgrade', 'pip')
+        session.install('-r', f'requirements.{flavour}.txt')
+        session.install('.')
     return os.path.abspath(session.create_tmp())
 
 
-def setup_venv_dev(session):
+def setup_venv_dev(session, config=None):
+    if config is None:
+        config = {}
+    if config.get('fast'):
+        return os.getcwd()
     tmpdir = setup_venv_common(session)
     session.run('cp', '-a', 'tests', tmpdir, external=True)
     session.run('cp', '-a', 'examples', tmpdir, external=True)
@@ -185,8 +199,8 @@ def setup_venv_repo(session):
     return tmpdir
 
 
-def setup_venv_docs(session):
-    tmpdir = setup_venv_common(session, 'docs')
+def setup_venv_docs(session, config=None):
+    tmpdir = setup_venv_common(session, flavour='docs', config=config)
     session.run('cp', '-a', 'docs', tmpdir, external=True)
     session.run('cp', '-a', 'examples', tmpdir, external=True)
     [
@@ -209,9 +223,10 @@ def test_platform(session):
 
 
 @nox.session(python='python3.10')
-def docs(session):
+@add_session_config
+def docs(session, config):
     '''Generate project docs.'''
-    tmpdir = setup_venv_docs(session)
+    tmpdir = setup_venv_docs(session, config)
     cwd = os.path.abspath(os.getcwd())
     # man pages
     session.chdir(f'{tmpdir}/docs/')
@@ -232,9 +247,11 @@ def docs(session):
 
 
 @nox.session
-def linter(session):
+@add_session_config
+def linter(session, config):
     '''Run code checks and linters.'''
-    session.install('pre-commit')
+    if not config.get('fast'):
+        session.install('pre-commit')
     session.run('pre-commit', 'run', '-a')
 
 
@@ -262,36 +279,31 @@ def integration(session, config):
     session.run(*options('test_integration', config))
 
 
+def test_common(session, config, module):
+    setup_linux(session)
+    workspace = setup_venv_dev(session, config)
+    path = f'{workspace}/tests/mocklib'
+    if config.get('fast'):
+        path += f':{workspace}'
+        session.chdir('tests')
+    session.run(
+        *options(module, config),
+        env={'WORKSPACE': workspace, 'SKIPDB': 'postgres', 'PYTHONPATH': path},
+    )
+
+
 @nox.session(python=['python3.9', 'python3.10', 'python3.11', 'python3.12'])
 @add_session_config
 def linux(session, config):
     '''Run Linux functional tests. Requires root to run all the tests.'''
-    setup_linux(session)
-    workspace = setup_venv_dev(session)
-    session.run(
-        *options('test_linux', config),
-        env={
-            'WORKSPACE': workspace,
-            'SKIPDB': 'postgres',
-            'PYTHONPATH': f'{workspace}/tests/mocklib',
-        },
-    )
+    test_common(session, config, 'test_linux')
 
 
 @nox.session(python=['python3.10', 'python3.11', 'python3.12'])
 @add_session_config
 def core(session, config):
     '''Run Linux tests in asyncio.'''
-    setup_linux(session)
-    workspace = setup_venv_dev(session)
-    session.run(
-        *options('test_core', config),
-        env={
-            'WORKSPACE': workspace,
-            'SKIPDB': 'postgres',
-            'PYTHONPATH': f'{workspace}/tests/mocklib',
-        },
-    )
+    test_common(session, config, 'test_core')
 
 
 @nox.session

pyroute2/compat.py

@@ -0,0 +1,19 @@
+'''Compatibility with older but supported Python versions'''
+
+try:
+    from enum import StrEnum  # noqa: F401
+except ImportError:
+    from enum import Enum
+
+    class StrEnum(str, Enum):
+        '''Same as enum, but members are also strings.'''
+
+
+try:
+    from socket import ETHERTYPE_IP
+except ImportError:
+    # ETHERTYPE_* are new in python 3.12
+    ETHERTYPE_IP = 0x800
+
+
+__all__ = ('StrEnum', 'ETHERTYPE_IP')

pyroute2/dhcp/__init__.py

@@ -105,18 +105,7 @@ class array8(option):
 from pyroute2.common import basestring
 from pyroute2.protocols import msg
 
-BOOTREQUEST = 1
-BOOTREPLY = 2
-
-DHCPDISCOVER = 1
-DHCPOFFER = 2
-DHCPREQUEST = 3
-DHCPDECLINE = 4
-DHCPACK = 5
-DHCPNAK = 6
-DHCPRELEASE = 7
-DHCPINFORM = 8
-
+from .enums.dhcp import MessageType, Option
 
 if not hasattr(array, 'tobytes'):
     # Python2 and Python3 versions of array differ,
@@ -194,7 +183,7 @@ def decode(self):
                 isinstance(value, basestring)
                 and self.policy['format'] == 'string'
             ):
-                value = value[: value.find(b'\x00')]
+                value = value.lstrip(b"\x00")
             self.value = value
         else:
             # remember current offset as msg.decode() will advance it
@@ -216,8 +205,8 @@ class dhcpmsg(msg):
     _decode_map = {}
 
     def _register_options(self):
-        for option in self.options:
-            code, name, fmt = option[:3]
+        for code, fmt in self.options:
+            name = code.name.lower()
             self._decode_map[code] = self._encode_map[name] = {
                 'name': name,
                 'code': code,
@@ -232,10 +221,10 @@ def decode(self):
             code = struct.unpack('B', self.buf[self.offset : self.offset + 1])[
                 0
             ]
-            if code == 0:
+            if code == Option.PAD:
                 self.offset += 1
                 continue
-            if code == 255:
+            if code == Option.END:
                 return self
             # code is unknown -- bypass it
             if code not in self._decode_map:
@@ -262,19 +251,25 @@ def encode(self):
         self._register_options()
         # put message type
         options = self.get('options') or {
-            'message_type': DHCPDISCOVER,
-            'parameter_list': [1, 3, 6, 12, 15, 28],
+            'message_type': MessageType.DISCOVER,
+            'parameter_list': [1, 3, 6, 12, 15, 28],  # FIXME
         }
 
         self.buf += (
-            self.uint8(code=53, value=options['message_type']).encode().buf
+            self.uint8(code=Option.MESSAGE_TYPE, value=options['message_type'])
+            .encode()
+            .buf
         )
         self.buf += (
-            self.client_id({'type': 1, 'key': self['chaddr']}, code=61)
+            self.client_id(
+                {'type': 1, 'key': self['chaddr']}, code=Option.CLIENT_ID
+            )
             .encode()
             .buf
         )
-        self.buf += self.string(code=60, value='pyroute2').encode().buf
+        self.buf += (
+            self.string(code=Option.VENDOR_ID, value='pyroute2').encode().buf
+        )
 
         for name, value in options.items():
             if name in ('message_type', 'client_id', 'vendor_id'):
@@ -294,7 +289,7 @@ def encode(self):
                 )
             self.buf += option.encode().buf
 
-        self.buf += self.none(code=255).encode().buf
+        self.buf += self.none(code=Option.END).encode().buf
         return self
 
     class none(option):
@@ -321,3 +316,6 @@ class array8(option):
 
     class client_id(option):
         fields = (('type', 'uint8'), ('key', 'l2addr'))
+
+    class message_type(option):
+        policy = {'format': 'B', 'decode': MessageType}