Merge pull request #41 from do3cc/add_dhcp_features

Add dhcp features

README.md

@@ -100,7 +100,15 @@ wifi.update_wifi_settings(new_settings)
 
 print(wifi.wifi_settings)
 
-# And/or DHCPSettings
+# And/or Make all dhcp adresses static:
+
+dhcp = DHCPSettings(modem)
+lan_table = LanTable(modem)
+for client in (*lan_table.get_lan(), *lan_table.get_wifi()):
+    dhcp.add_static_lease(
+        lease_ip=client["IPv4Addr"].split("/")[0], lease_mac=client["MACAddr"]
+    )
+
 
 # If you want to go back to 'normal':
 # modem.reboot() # or

compal/__init__.py

@@ -1,6 +1,7 @@
 """
 Client for the Compal CH7465LG/Ziggo Connect box cable modem
 """
+
 import inspect
 import io
 import itertools
@@ -11,8 +12,8 @@
 from collections import OrderedDict
 from datetime import timedelta
 from enum import Enum
-from xml.dom import minidom
 from hashlib import sha256
+from xml.dom import minidom
 
 import requests
 from lxml import etree
@@ -25,9 +26,9 @@
     GuestNetworkEnabling,
     GuestNetworkProperties,
     GuestNetworkSettings,
-    NatMode,
     IPv6FilterRule,
     IPv6FilterRuleProto,
+    NatMode,
     PortForward,
     Proto,
     RadioSettings,
@@ -681,19 +682,23 @@ def condGetOrDefault(direction, val, defaultValueIn, defaultValueOut):
                     int(
                         FilterIpRange.all
                         if src_addr == "::"
-                        else FilterIpRange.range
-                        if src_prefix != 128
-                        else FilterIpRange.single
+                        else (
+                            FilterIpRange.range
+                            if src_prefix != 128
+                            else FilterIpRange.single
+                        )
                     ),
                 ),
                 (
                     "dsIpRange",
                     int(
                         FilterIpRange.all
                         if dst_addr == "::"
-                        else FilterIpRange.range
-                        if dst_prefix != 128
-                        else FilterIpRange.single
+                        else (
+                            FilterIpRange.range
+                            if dst_prefix != 128
+                            else FilterIpRange.single
+                        )
                     ),
                 ),
                 ("PortRange", "2"),  # manual port selection
@@ -1283,6 +1288,7 @@ class DHCPSettings:
 
     def __init__(self, modem):
         self.modem = modem
+        self.parser = etree.XMLParser(recover=True)
 
     def add_static_lease(self, lease_ip, lease_mac):
         """
@@ -1293,6 +1299,27 @@ def add_static_lease(self, lease_ip, lease_mac):
             {"data": "ADD,{ip},{mac};".format(ip=lease_ip, mac=lease_mac)},
         )
 
+    def del_static_lease(self, lease_ip, lease_mac):
+        """
+        Delete a static DHCP lease
+        """
+        return self.modem.xml_setter(
+            SetFunction.STATIC_DHCP_LEASE,
+            {"data": "DEL,{ip},{mac};".format(ip=lease_ip, mac=lease_mac)},
+        )
+
+    def get_static_leases(self):
+        """
+        Get all static leases
+        """
+        xml_content = self.modem.xml_getter(GetFunction.BASICDHCP, {}).content
+        tree = etree.fromstring(xml_content, parser=self.parser)
+        for host in tree.findall("ReserveIpadrr"):
+            yield {
+                "lease_ip": host.find("LeasedIP").text,
+                "lease_mac": host.find("MacAddress").text,
+            }
+
     def set_upnp_status(self, enabled):
         """
         Ensure that UPnP is set to the given value

compal/models.py

@@ -1,7 +1,8 @@
 """Objects used by CH7465LG"""
+
 from dataclasses import dataclass
 from enum import IntEnum
-from typing import Optional, List
+from typing import List, Optional
 
 
 @dataclass

setup.py

@@ -1,4 +1,5 @@
 """ Set up script """
+
 import os
 
 from setuptools import find_packages, setup