osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Rename enterprises to enterprises.tsv and ship it. 

Rename "enterprises" to "enterprises.tsv" so that its format is a bit more
obvious and so that double-clicking the file might do something useful.

Add it to the Windows packages.

Change-Id: I5ef54a04ce1b4926aa4535e756e04b3e2a56d463
Reviewed-on: https://code.wireshark.org/review/22616
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Gerald Combs 2017-07-13 13:03:13 -07:00 committed by Anders Broman
parent b992e69c19
commit 76efb096d4
9 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1576,7 +1576,7 @@ set(INSTALL_FILES
cfilters
colorfilters
dfilters
enterprises
enterprises.tsv
ipmap.html
manuf
pdml2html.xsl

2
Makefile.am
View File

@ -55,7 +55,7 @@ EXTRA_PROGRAMS = wireshark-gtk wireshark tshark tfshark capinfos captype \
# Wireshark configuration files are put in $(pkgdatadir).
#
dist_pkgdata_DATA = COPYING manuf services cfilters colorfilters dfilters \
smi_modules ipmap.html pdml2html.xsl enterprises
smi_modules ipmap.html pdml2html.xsl enterprises.tsv
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = wireshark.pc

2
docbook/release-notes.asciidoc
View File

@ -35,7 +35,7 @@ since version 2.4.0:
This puts the display expressions in their own file. Wireshark still
supports preference files that contain the old preferences, but new
preference files will be written without the old fields.
* Support for user-editable "enterprises" file in the personal config dir (overriding system file).
* SMI private enterprise numbers are now read from the "enterprises.tsv" configuration file.
* QUIC dissector is rename to G(oogle) QUIC (quic => gquic)
//=== Removed Dissectors

0
enterprises → enterprises.tsv
View File

Can't render this file because it is too large.

2
epan/addr_resolv.c
View File

@ -118,7 +118,7 @@
#define ENAME_SERVICES "services"
#define ENAME_VLANS "vlans"
#define ENAME_SS7PCS "ss7pcs"
#define ENAME_ENTERPRISES "enterprises"
#define ENAME_ENTERPRISES "enterprises.tsv"
#define HASHETHSIZE 2048
#define HASHHOSTSIZE 2048

1
packaging/nsis/uninstall.nsi
View File

@ -318,6 +318,7 @@ SectionIn 1 2
Delete "$INSTDIR\cfilters"
Delete "$INSTDIR\colorfilters"
Delete "$INSTDIR\dfilters"
Delete "$INSTDIR\enterprises.tsv"
Delete "$INSTDIR\init.lua"
Delete "$INSTDIR\console.lua"
Delete "$INSTDIR\dtd_gen.lua"

3
packaging/nsis/wireshark.nsi
View File

@ -487,6 +487,9 @@ File "${STAGING_DIR}\colorfilters"
;IfFileExists dfilters dont_overwrite_dfilters
File "${STAGING_DIR}\dfilters"
;dont_overwrite_dfilters:
;IfFileExists enterprises.tsv dont_overwrite_enterprises_tsv
File "${STAGING_DIR}\enterprises.tsv"
;dont_overwrite_dfilters:
;IfFileExists smi_modules dont_overwrite_smi_modules
File "${STAGING_DIR}\smi_modules"
;dont_overwrite_smi_modules:

4
packaging/wix/ComponentGroups.wxi
View File

@ -117,6 +117,9 @@
<Component Id="cmpDfilters" Guid="*">
<File Id="filDfilters" KeyPath="yes" Source="$(var.Staging.Dir)\dfilters" />
</Component>
<Component Id="cmpEnterprisesTsv" Guid="*">
<File Id="filEnterprisesTsv" KeyPath="yes" Source="$(var.Staging.Dir)\enterprises.tsv" />
</Component>
<Component Id="cmpSmi_modules" Guid="*">
<File Id="filSmi_modules" KeyPath="yes" Source="$(var.Staging.Dir)\smi_modules" />
</Component>
@ -127,6 +130,7 @@
<ComponentRef Id="cmpCfilters" />
<ComponentRef Id="cmpColorfilters" />
<ComponentRef Id="cmpDfilters" />
<ComponentRef Id="cmpEnterprisesTsv" />
<ComponentRef Id="cmpSmi_modules" />
</ComponentGroup>
</Fragment>

2
tools/make-sminmpec.pl
View File

@ -89,7 +89,7 @@ for(@in_lines) {
die "\"End of Document\" not found. Truncated source file?" unless ($end_of_document);
open OUT, "> enterprises";
open OUT, "> enterprises.tsv";
print OUT <<"_SMINMPEC";
#