summaryrefslogtreecommitdiff
path: root/src/conf_mode/dhcp_relay.py
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2018-11-02 16:14:22 +0100
committerChristian Poessinger <christian@poessinger.com>2018-11-02 16:14:22 +0100
commitc4c183a16fe2ddc612ed947fc5513c87f30c7c27 (patch)
tree06ea4c7101f70bc6e5aa9e2852d349abdf6120fb /src/conf_mode/dhcp_relay.py
parent8caefb64553d6158b259b9713931c457e64625d1 (diff)
downloadvyos-1x-c4c183a16fe2ddc612ed947fc5513c87f30c7c27.tar.gz
vyos-1x-c4c183a16fe2ddc612ed947fc5513c87f30c7c27.zip
T939: Remove possibility to specify DHCP relay port
Diffstat (limited to 'src/conf_mode/dhcp_relay.py')
-rwxr-xr-xsrc/conf_mode/dhcp_relay.py8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/conf_mode/dhcp_relay.py b/src/conf_mode/dhcp_relay.py
index 61b494b7e..1b2abed9e 100755
--- a/src/conf_mode/dhcp_relay.py
+++ b/src/conf_mode/dhcp_relay.py
@@ -43,14 +43,13 @@ SERVERS="{{ server | join(' ') }}"
INTERFACES="{{ interface | join(' ') }}"
# Additional options that are passed to the DHCP relay daemon?
-OPTIONS="-4 {% if port -%} -p {{ port }}{%- endif %} {{ options | join(' ') }}"
+OPTIONS="-4 {{ options | join(' ') }}"
"""
default_config_data = {
'interface': [],
'server': [],
'options': [],
- 'port': '',
'hop_count': '10',
'relay_agent_packets': 'forward'
}
@@ -86,11 +85,6 @@ def get_config():
size = '-A ' + conf.return_value('max-size')
relay['options'].append(size)
- # Listen and transmit on port <xy>. This is mostly useful for debugging
- # purposes. Default is port 67 for DHCPv4/BOOTP, or port 547 for DHCPv6.
- if conf.exists('port'):
- relay['port'] = conf.return_value('port')
-
# Control the handling of incoming DHCPv4 packets which already contain
# relay agent options. If such a packet does not have giaddr set in its
# header, the DHCP standard requires that the packet be discarded. However,