Changeset 1252

Timestamp:

12/19/06 13:53:54 (6 years ago)

Author:

mglb1

Message:

Remove silly assumption in the DHCP code that assumed every link that DHCP
was configured on as a /24.

File:

• ccsd/private/modules/ccs_dhcp.py (modified) (1 diff)

ccsd/private/modules/ccs_dhcp.py

@@ -140 +140 @@
             raise dhcp_error("DHCP already enabled on interface!")
         
-        # Try and setup a default pool from 129 -> 253
         link = getInterfaceLink(self._session_id, interface_id)
-        pool_max = link._maxIP(True)
-        pool_min = link._minIP(True, 128)
+        length = cidrToLength(link["network_address"])
+        if length == 24:
+            # Try and setup a default pool from 129 -> 253
+            pool_max = link._maxIP(True)
+            pool_min = link._minIP(True, 128)
+        else:
+            # Try and setup a default pool using the whole range
+            pool_max = link._maxIP(True)
+            pool_min = link._minIP(True)
         # Check all IPs in the pool are free
         ip = ipnum(pool_min)