diff --git a/src/opnsense/scripts/dns/iana-dhcpv4-options.csv b/contrib/iana/dhcpv4-options.csv similarity index 100% rename from src/opnsense/scripts/dns/iana-dhcpv4-options.csv rename to contrib/iana/dhcpv4-options.csv diff --git a/src/opnsense/scripts/dns/iana-dhcpv6-parameters-2.csv b/contrib/iana/dhcpv6-parameters-2.csv similarity index 100% rename from src/opnsense/scripts/dns/iana-dhcpv6-parameters-2.csv rename to contrib/iana/dhcpv6-parameters-2.csv diff --git a/plist b/plist index c1b8ef2fec..fd80688102 100644 --- a/plist +++ b/plist @@ -162,6 +162,8 @@ /usr/local/libexec/opnsense-auth /usr/local/opnsense/contrib/IXR/IXR_Library.php /usr/local/opnsense/contrib/base32/Base32.php +/usr/local/opnsense/contrib/iana/dhcpv4-options.csv +/usr/local/opnsense/contrib/iana/dhcpv6-parameters-2.csv /usr/local/opnsense/contrib/iana/tzdata-iso3166.tab /usr/local/opnsense/contrib/iana/tzdata-zone.tab /usr/local/opnsense/contrib/mobile-broadband-provider-info/serviceproviders.xml @@ -1076,8 +1078,6 @@ /usr/local/opnsense/scripts/dhcp/prefixes.sh /usr/local/opnsense/scripts/dhcp/unbound_watcher.py /usr/local/opnsense/scripts/dns/dnsmasq_dhcp_options.py -/usr/local/opnsense/scripts/dns/iana-dhcpv4-options.csv -/usr/local/opnsense/scripts/dns/iana-dhcpv6-parameters-2.csv /usr/local/opnsense/scripts/dns/query_dns.py /usr/local/opnsense/scripts/filter/delete_table.py /usr/local/opnsense/scripts/filter/download_geoip.py diff --git a/src/opnsense/scripts/dns/dnsmasq_dhcp_options.py b/src/opnsense/scripts/dns/dnsmasq_dhcp_options.py index 63b9ec8c1b..016344f5ac 100755 --- a/src/opnsense/scripts/dns/dnsmasq_dhcp_options.py +++ b/src/opnsense/scripts/dns/dnsmasq_dhcp_options.py @@ -33,8 +33,8 @@ import subprocess import argparse option_src = { - 'dhcp': 'iana-dhcpv4-options.csv', # https://www.iana.org/assignments/bootp-dhcp-parameters/ - 'dhcp6': 'iana-dhcpv6-parameters-2.csv' # https://www.iana.org/assignments/dhcpv6-parameters/ + 'dhcp': 'iana/dhcpv4-options.csv', # https://www.iana.org/assignments/bootp-dhcp-parameters/ + 'dhcp6': 'iana/dhcpv6-parameters-2.csv' # https://www.iana.org/assignments/dhcpv6-parameters/ } parser = argparse.ArgumentParser() @@ -43,7 +43,7 @@ args = parser.parse_args() result = {} # load iana specified per proto family, names will be overlayed when dnsmasq specifies them -with open(os.path.dirname(__file__) + '/' + option_src[args.mode], 'r') as csvfile: +with open('/usr/local/opnsense/contrib/' + option_src[args.mode], 'r') as csvfile: for r in csv.reader(csvfile, delimiter=',', quotechar='"'): r_range = [int(x) for x in r[0].split('-') if x.isdigit()] if len(r) > 2 and len(r_range) > 0 and r[1].lower() not in ['unassigned', 'removed/unassigned', 'pad', 'end']: