aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/nsis
diff options
context:
space:
mode:
authorJoão Valverde <j@v6e.pt>2023-07-09 19:56:59 +0100
committerJoão Valverde <j@v6e.pt>2023-07-25 16:23:26 +0000
commitb4a421cf8206dc9a675fbc58500d1a625869e77a (patch)
tree6f27314ae8820dc47fb47bee937f607eeb5ef88c /packaging/nsis
parent7e08afb4786242e836455cd9807f95c4eafdc277 (diff)
Replace "manuf" files with static arrays
To reduce startup external file parsing replce the manuf file with static arrays compiled into the binary. Add 3 tables for MA-L, MA-M and MA-S. Add a fourth table to direct a 24-bit MAC prefix (OUI) to one of these tables. Adapt the make-manuf.py script to generate the static C data instead of the text file. The arrays are sorted and a binary search is performed to map an OUI (24bit/28bit/36bit) to a short and long name.
Diffstat (limited to 'packaging/nsis')
-rw-r--r--packaging/nsis/logray.nsi1
-rw-r--r--packaging/nsis/wireshark.nsi1
2 files changed, 0 insertions, 2 deletions
diff --git a/packaging/nsis/logray.nsi b/packaging/nsis/logray.nsi
index 596b13a037..111fe9d7c1 100644
--- a/packaging/nsis/logray.nsi
+++ b/packaging/nsis/logray.nsi
@@ -451,7 +451,6 @@ File "${STAGING_DIR}\COPYING.txt"
File "${STAGING_DIR}\NEWS.txt"
File "${STAGING_DIR}\README.txt"
File "${STAGING_DIR}\README.windows.txt"
-File "${STAGING_DIR}\manuf"
File "${STAGING_DIR}\wka"
File "${STAGING_DIR}\pdml2html.xsl"
File "${STAGING_DIR}\ws.css"
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 9c7590b661..faa0239acb 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -541,7 +541,6 @@ File "${STAGING_DIR}\COPYING.txt"
File "${STAGING_DIR}\NEWS.txt"
File "${STAGING_DIR}\README.txt"
File "${STAGING_DIR}\README.windows.txt"
-File "${STAGING_DIR}\manuf"
File "${STAGING_DIR}\wka"
File "${STAGING_DIR}\pdml2html.xsl"
File "${STAGING_DIR}\ws.css"