diff options
| author | Christian Poessinger <christian@poessinger.com> | 2018-11-02 16:14:22 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2018-11-02 16:16:09 +0100 |
| commit | de658a01c1dfc8164862509fcee0784f92814efd (patch) | |
| tree | 5ff47ebae700ace68577358c18af2a6e24fc286b /src/conf_mode/dhcpv6_relay.py | |
| parent | 50186e6d7f33b4cc5300eba6b9381e2a2528d8b4 (diff) | |
| download | vyos-1x-de658a01c1dfc8164862509fcee0784f92814efd.tar.gz vyos-1x-de658a01c1dfc8164862509fcee0784f92814efd.zip | |
T939: Remove possibility to specify DHCP relay port
(cherry picked from commit c4c183a16fe2ddc612ed947fc5513c87f30c7c27)
Diffstat (limited to 'src/conf_mode/dhcpv6_relay.py')
| -rwxr-xr-x | src/conf_mode/dhcpv6_relay.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/conf_mode/dhcpv6_relay.py b/src/conf_mode/dhcpv6_relay.py index 959bf0496..86e3f8265 100755 --- a/src/conf_mode/dhcpv6_relay.py +++ b/src/conf_mode/dhcpv6_relay.py @@ -31,13 +31,12 @@ config_tmpl = """ # Defaults for isc-dhcpv6-relay initscript sourced by /etc/init.d/isc-dhcpv6-relay -OPTIONS="-6 -l {{ listen_addr | join('-l ') }} {% if port -%} -p {{ port }}{%- endif %} {{ options | join(' ') }} -u {{ upstream_addr | join('-u ') }}" +OPTIONS="-6 -l {{ listen_addr | join('-l ') }} {{ options | join(' ') }} -u {{ upstream_addr | join('-u ') }}" """ default_config_data = { 'listen_addr': [], 'upstream_addr': [], - 'port': '', 'options': [], } @@ -65,11 +64,6 @@ def get_config(): server = addr + '%' + intf relay['upstream_addr'].append(server) - # 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('listen-port'): - relay['port'] = conf.return_value('listen-port') - # Maximum hop count. When forwarding packets, dhcrelay discards packets # which have reached a hop count of COUNT. Default is 10. Maximum is 255. if conf.exists('max-hop-count'): |