Mirrors
/
aredn
mirror of https://github.com/aredn/aredn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support DHCP Options without values (#1735)

This commit is contained in:
Tim Wilkinson 2024-12-01 18:40:00 -08:00 committed by GitHub
parent 726300dcd9
commit 2e438ddcf3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
files/app/main/status/e/dhcp.ut
View File

@ -195,7 +195,7 @@ const dhcpOptionTypes = {
"42": ["ntp-server", "ips"], "42": ["ntp-server", "ips"],
"44": ["netbios-ns", "ips"], "44": ["netbios-ns", "ips"],
"45": ["netbios-dd", "ips"], "45": ["netbios-dd", "ips"],
"46": ["netbios-nodetype", "^[1248]$", "1, 2, 4 or 8"], "46": ["netbios-nodetype", "[1248]", "1, 2, 4 or 8"],
"47": ["netbios-scope", "dns"], "47": ["netbios-scope", "dns"],
"48": ["x-windows-fs", "ips"], "48": ["x-windows-fs", "ips"],
"49": ["x-windows-dm", "ips"], "49": ["x-windows-dm", "ips"],
@ -212,17 +212,17 @@ const dhcpOptionTypes = {
"71": ["nntp-server", "ips"], "71": ["nntp-server", "ips"],
"74": ["irc-server", "ips"], "74": ["irc-server", "ips"],
"77": ["user-class", "text"], "77": ["user-class", "text"],
"80": ["rapid-commit", "flag"], "80": ["rapid-commit", "none"],
"93": ["client-arch", "uint16"], "93": ["client-arch", "uint16"],
"94": ["client-interface-id", "^1(?:,(?:\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){2}$", "1,0...255,0...255"], "94": ["client-interface-id", "1(?:,(?:\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){2}", "1,0...255,0...255"],
"97": ["client-machine-id", "^0,(?:[0-9A-Fa-f]{2}:?\\b){16}$", "0,xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx"], "97": ["client-machine-id", "0,(?:[0-9A-Fa-f]{2}:?\\b){16}", "0,xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx"],
"100": ["posix-timezone", "^[A-Za-z]{3,}[+\\-]?(?:2[0-4]?|[01]?\\d)(?::[0-5]\\d){0,2}(?:[A-Za-z]{3,}(?:[+\\-]?(?:2[0-4]?|[01]?\\d)(?::[0-5]\\d){0,2})?(?:,(?:J(?:[1-9]|[1-9]\\d|[12]\\d{2}|3[0-5]\\d|36[0-5])|(?:\\d|[1-9]\\d|[12]\\d{2}|3[0-5]\\d|36[0-5])|(?:M(?:[1-9]|1[0-2])\\.[1-5]\\.[0-6]))(?:\\/(?:(?:-[1-9]|-?[1-9]\\d|-?1[0-5]\\d|-?16[0-7]|\\d))(?::[0-5]\\d){0,2})?){0,2})?$", "POSIX timezone"], "100": ["posix-timezone", "[A-Za-z]{3,}[+\\-]?(?:2[0-4]?|[01]?\\d)(?::[0-5]\\d){0,2}(?:[A-Za-z]{3,}(?:[+\\-]?(?:2[0-4]?|[01]?\\d)(?::[0-5]\\d){0,2})?(?:,(?:J(?:[1-9]|[1-9]\\d|[12]\\d{2}|3[0-5]\\d|36[0-5])|(?:\\d|[1-9]\\d|[12]\\d{2}|3[0-5]\\d|36[0-5])|(?:M(?:[1-9]|1[0-2])\\.[1-5]\\.[0-6]))(?:\\/(?:(?:-[1-9]|-?[1-9]\\d|-?1[0-5]\\d|-?16[0-7]|\\d))(?::[0-5]\\d){0,2})?){0,2})?", "POSIX timezone"],
"101": ["tzdb-timezone", "^(?:(?:[A-Za-z_\\-]+\\/[A-Za-z_\\-]+(?:\\/[A-Za-z_\\-]+)?)|(?:Etc\\/[A-Za-z0-9+\\-]+(?:\\/[A-Za-z0-9]+)?|(?:CET|CST6CDT|EET|EST|EST5EDT|MET|MST|MST7MDT|PST8PDT|HST)))$", "TZ Identifier"], "101": ["tzdb-timezone", "(?:(?:[A-Za-z_\\-]+\\/[A-Za-z_\\-]+(?:\\/[A-Za-z_\\-]+)?)|(?:Etc\\/[A-Za-z0-9+\\-]+(?:\\/[A-Za-z0-9]+)?|(?:CET|CST6CDT|EET|EST|EST5EDT|MET|MST|MST7MDT|PST8PDT|HST)))", "TZ Identifier"],
"108": ["ipv6-only", "uint32"], "108": ["ipv6-only", "uint32"],
"119": ["domain-search", "text"], "119": ["domain-search", "text"],
"120": ["sip-server", "^(?:0,(?:(?:(?!-))(?:(?:xn--)?[A-Za-z0-9][A-Za-z0-9\\-]{0,61}[A-Za-z0-9]{0,1}\\.)*(?:xn--)?(?:[A-Za-z0-9\\-]{1,61}|[A-Za-z0-9\\-]{1,30}\\.[A-Za-z]{2,}),?\\b)+)|(?:1,(?:(?:(?:25[0-5]|(?:2[0-4]|1\\d|[1-9]|)\\d)\\.?\\b){4},?\\b)+)$", "0,DNS Names or 1,IP Addresses"], "120": ["sip-server", "(?:0,(?:(?:(?!-))(?:(?:xn--)?[A-Za-z0-9][A-Za-z0-9\\-]{0,61}[A-Za-z0-9]{0,1}\\.)*(?:xn--)?(?:[A-Za-z0-9\\-]{1,61}|[A-Za-z0-9\\-]{1,30}\\.[A-Za-z]{2,}),?\\b)+)|(?:1,(?:(?:(?:25[0-5]|(?:2[0-4]|1\\d|[1-9]|)\\d)\\.?\\b){4},?\\b)+)", "0,DNS Names or 1,IP Addresses"],
"121": ["classless-static-route", "^(?:(?:(?:(?:25[0-5]|(?:2[0-4]|1[0-9]|[1-9]|)[0-9])\\.?\\b){4}\\/(?:[1-9]|[12]\\d|3[0-2]),(?:(?:25[0-5]|(?:2[0-4]|1[0-9]|[1-9]|)[0-9])\\.?\\b){4}),?\\b)+$", "IP Address/CIDR,IP Address[,...]"], "121": ["classless-static-route", "(?:(?:(?:(?:25[0-5]|(?:2[0-4]|1[0-9]|[1-9]|)[0-9])\\.?\\b){4}\\/(?:[1-9]|[12]\\d|3[0-2]),(?:(?:25[0-5]|(?:2[0-4]|1[0-9]|[1-9]|)[0-9])\\.?\\b){4}),?\\b)+", "IP Address/CIDR,IP Address[,...]"],
"125": ["vendor-id-encap", "^vi-encap:\\d+,(?:\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5]),(?:\"[^\"]*\"|(?:[0-9A-Fa-f]{2}:?\\b)+|(?:(?:25[0-5]|(?:2[0-4]|1\\d|[1-9]|)\\d)\\.?\\b){4}|-?\\d+)$", "vi-encap:int,0...255,data"], // https://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2010q4/004454.html "125": ["vendor-id-encap", "vi-encap:\\d+,(?:\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5]),(?:\"[^\"]*\"|(?:[0-9A-Fa-f]{2}:?\\b)+|(?:(?:25[0-5]|(?:2[0-4]|1\\d|[1-9]|)\\d)\\.?\\b){4}|-?\\d+)", "vi-encap:int,0...255,data"], // https://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2010q4/004454.html
"150": ["tftp-server-address", "ip"], "150": ["tftp-server-address", "ip"],
"255": ["server-ip-address", "ip"] "255": ["server-ip-address", "ip"]
}; };
@ -612,12 +612,13 @@ const dhcpOptionTypes = {
const dhcpOptionTypes = {%print(dhcpOptionTypes);%}; const dhcpOptionTypes = {%print(dhcpOptionTypes);%};
const dhcpOptionTypesPatterns = { const dhcpOptionTypesPatterns = {
"?": [".*",], "?": [".*",],
ip: ["^(?:(?:25[0-5]|(?:2[0-4]|1\\d|[1-9]|)\\d)\\.?\\b){4}$", "IP Address"], ip: ["(?:(?:25[0-5]|(?:2[0-4]|1\\d|[1-9]|)\\d)\\.?\\b){4}", "IP Address"],
ips: ["^(?:(?:(?:25[0-5]|(?:2[0-4]|1\\d|[1-9]|)\\d)\\.?\\b){4},?\\b)+$", "IP Addresses"], ips: ["(?:(?:(?:25[0-5]|(?:2[0-4]|1\\d|[1-9]|)\\d)\\.?\\b){4},?\\b)+", "IP Addresses"],
ipips: ["^(?:(?:(?:(?:(?:25[0-5]|(?:2[0-4]|1[0-9]|[1-9]|)[0-9])\\.?\\b){4}),?\\b){2})+$", "IP,IP pairs"], ipips: ["(?:(?:(?:(?:(?:25[0-5]|(?:2[0-4]|1[0-9]|[1-9]|)[0-9])\\.?\\b){4}),?\\b){2})+", "IP,IP pairs"],
mask: ["^(?:(?:1(?:28|92)|2(?:24|4[08]|5[24]))(?:\\.0){3})|(?:255\\.(?:(?:(?:0|1(?:28|92)|2(?:24|4[08]|5[24]))(?:\\.0){2})|(?:255\\.(?:(?:(?:0|1(?:28|92)|2(?:24|4[08]|5[24]))\\.0)|255\\.(?:0|1(?:28|92)|2(?:24|4[08]|5[24]))))))$", "Network mask"], mask: ["(?:(?:1(?:28|92)|2(?:24|4[08]|5[24]))(?:\\.0){3})|(?:255\\.(?:(?:(?:0|1(?:28|92)|2(?:24|4[08]|5[24]))(?:\\.0){2})|(?:255\\.(?:(?:(?:0|1(?:28|92)|2(?:24|4[08]|5[24]))\\.0)|255\\.(?:0|1(?:28|92)|2(?:24|4[08]|5[24]))))))", "Network mask"],
mac: ["^(?:[0-9a-fA-F]{2}:?\\b){6}$", "xx:xx:xx:xx:xx:xx"], mac: ["(?:[0-9a-fA-F]{2}:?\\b){6}", "xx:xx:xx:xx:xx:xx"],
flag: ["^[01]$", "0 or 1"], flag: ["[01]", "0 or 1"],
none: ["(hidden)", "None"],
text: [".+", "Text..."], text: [".+", "Text..."],
uint16: ["(number)", "0...65535", 0, 65535], uint16: ["(number)", "0...65535", 0, 65535],
int32: ["(number)", "Integer", -2147483648, 2147483647], int32: ["(number)", "Integer", -2147483648, 2147483647],
@ -627,7 +628,7 @@ const dhcpOptionTypes = {
"68...65535": ["(number)", "68...65535", 68, 65535], "68...65535": ["(number)", "68...65535", 68, 65535],
"576...65535": ["(number)", "576...65535", 576, 65535], "576...65535": ["(number)", "576...65535", 576, 65535],
"time": ["\\d+[sSmMhHdDwW]?", "Time (s, m, h, d, w)"], "time": ["\\d+[sSmMhHdDwW]?", "Time (s, m, h, d, w)"],
dns: ["^(?:(?!-))(?:(?:xn--)?[A-Za-z0-9][A-Za-z0-9\\-]{0,61}[A-Za-z0-9]{0,1}\\.)*(?:xn--)?(?:[A-Za-z0-9\\-]{1,61}|[A-Za-z0-9\\-]{1,30}\\.[A-Za-z]{2,})$", "Host DNS name"] dns: ["(?:(?!-))(?:(?:xn--)?[A-Za-z0-9][A-Za-z0-9\\-]{0,61}[A-Za-z0-9]{0,1}\\.)*(?:xn--)?(?:[A-Za-z0-9\\-]{1,61}|[A-Za-z0-9\\-]{1,30}\\.[A-Za-z]{2,})", "Host DNS name"]
}; };
function refreshOptions() function refreshOptions()
{ {
@ -645,20 +646,28 @@ const dhcpOptionTypes = {
const pat = dhcpOptionTypesPatterns[types[1]]; const pat = dhcpOptionTypesPatterns[types[1]];
value.disabled = false; value.disabled = false;
if (pat) { if (pat) {
value.type = "text";
value.pattern = "";
value.min = "";
value.max = "";
value.placeholder = pat[1];
value.required = true;
value.style.visibility = null;
switch (pat[0]) { switch (pat[0]) {
case "(number)": case "(number)":
value.type = "number"; value.type = "number";
value.min = pat[2]; value.min = pat[2];
value.max = pat[3]; value.max = pat[3];
break; break;
case "(hidden)":
value.style.visibility = "hidden";
value.value = "";
value.required = false;
break;
default: default:
value.type = "text";
value.pattern = pat[0]; value.pattern = pat[0];
value.min = "";
value.max = "";
break; break;
} }
value.placeholder = pat[1];
} }
else { else {
value.pattern = types[1]; value.pattern = types[1];

2
files/usr/local/bin/node-setup
View File

@ -814,7 +814,9 @@ local function option_item(tag, option)
table.insert(parts, "tag:" .. tag) table.insert(parts, "tag:" .. tag)
end end
table.insert(parts, option.num) table.insert(parts, option.num)
if option.val ~= "" then
table.insert(parts, option.val) table.insert(parts, option.val)
end
return table.concat(parts, ",") return table.concat(parts, ",")
end end