upstream/opnsense-core
1
0
Fork 0
mirror of https://github.com/opnsense/core.git synced 2026-02-18 18:18:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

contrib: move the dhcp iana files to new home

Browse source
This commit is contained in:
Franco Fichtner 2025-05-13 10:58:07 +02:00
parent aaa9e49fd0
commit f2665d8fe0
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
src/opnsense/scripts/dns/iana-dhcpv4-options.csv → contrib/iana/dhcpv4-options.csv
View file

0
src/opnsense/scripts/dns/iana-dhcpv6-parameters-2.csv → contrib/iana/dhcpv6-parameters-2.csv
View file

4
plist
View file

@ -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

6
src/opnsense/scripts/dns/dnsmasq_dhcp_options.py
View file

@ -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']: