diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-10-19 10:45:05 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-10-19 10:45:05 +0200 |
| commit | a16ee44ac1c25145d3e938eff0ab3e66923e2513 (patch) | |
| tree | 5ca7970af596a9c91fa53d84ea1009d5a0303df4 /src/conf_mode/dhcp_server.py | |
| parent | 79bc826426385e5b40fbe58137d0a2d2831cf274 (diff) | |
| parent | 6f73338f0a652ca9b68a5778456f63d098f04522 (diff) | |
| download | vyos-1x-a16ee44ac1c25145d3e938eff0ab3e66923e2513.tar.gz vyos-1x-a16ee44ac1c25145d3e938eff0ab3e66923e2513.zip | |
Merge branch 'current' of github.com:vyos/vyos-1x into equuleus
* 'current' of github.com:vyos/vyos-1x:
T1749: support multiple ranges in the numeric validator.
dhcp-server: T1745: bugfix corner case on static-assignments
system-proxy: T1741 - Add system wide proxy setting
wireguard - remove endpoint check to enable roaming connections
system-proxy: T1741 - Add system wide proxy setting CLI implementation
Python/ifconfig: T1712: always start DHCP when configured
Python/ifconfig: T1557: get_status() must use admin state not operstate
bgp: T1490: fix migrator file permissions
snmp: T1737: add missing completion helpers
Revert "Python/ifconfig: T1712: wait when changing interface state"
snmpd: T1705 - High CPU usage by bgpd when snmp is active
Revert "snmpd: T1705 - High CPU usage by bgpd when snmp is active"
openvpn: T1548: clean out import statements
ssh.py: check if file exists before deleting it
[BGP] T1490: Added migration for obsoleted 'bgp scan-time' parameter
Diffstat (limited to 'src/conf_mode/dhcp_server.py')
| -rwxr-xr-x | src/conf_mode/dhcp_server.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/conf_mode/dhcp_server.py b/src/conf_mode/dhcp_server.py index f19bcb250..af803a696 100755 --- a/src/conf_mode/dhcp_server.py +++ b/src/conf_mode/dhcp_server.py @@ -303,7 +303,8 @@ def dhcp_slice_range(exclude_list, range_list): 'start': str(ip_address(e) + 1), 'stop': str(range_stop) } - output.append(r) + if not (ip_address(r['start']) > ip_address(r['stop'])): + output.append(r) else: # if we have no exclude in the whole range - we just take the range # as it is |