summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2017-06-24 14:25:41 +0100
committerJoão Valverde <j@v6e.pt>2017-06-26 22:40:50 +0000
commit7466880e8a09aa7a9bb797b70fa44bca397881d9 (patch)
tree1634c5d6e433a4803ecd5543a4cb6420e7c886d7 /debian
parent3071f9dd7409bd5b0432dd8f1bebbeeee1b6c755 (diff)
downloadwireshark-7466880e8a09aa7a9bb797b70fa44bca397881d9.tar.gz
Parse enterprise-numbers at run time
"enterprise-numbers" is converted to tab-separated values and renamed "enterprises". Unused fields are stripped. PENs are stored in a hash table loaded at run-time. User "enterprises" file is loaded from the personal config dir. Misc make-sminmpec.pl improvements and fixes. Note: names of type "Entity (formerly ...)" have the formerly part commented out for a cleaner output. Change-Id: I60c533afbe3e399077fbf432088064471ad3e1e2 Reviewed-on: https://code.wireshark.org/review/22246 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'debian')
-rw-r--r--debian/libwireshark0.lintian-overrides23
-rw-r--r--debian/libwireshark0.symbols5
2 files changed, 4 insertions, 24 deletions
diff --git a/debian/libwireshark0.lintian-overrides b/debian/libwireshark0.lintian-overrides
index 7216ed28c6..2555e0edaf 100644
--- a/debian/libwireshark0.lintian-overrides
+++ b/debian/libwireshark0.lintian-overrides
@@ -1,25 +1,2 @@
-# Typo directly on IANA enterprise-numbers (epan/enterprise-numbers)
-libwireshark0: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.0.0.0 Communcation Communication
-libwireshark0: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.0.0.0 Sofware Software
-libwireshark0: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.0.0.0 Prefered Preferred
-libwireshark0: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.0.0.0 Millenium Millennium
-libwireshark0: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.0.0.0 Absolut Absolute
-libwireshark0: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.0.0.0 INFOMATION INFORMATION
-libwireshark0: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.0.0.0 Grammer Grammar
-libwireshark0: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.0.0.0 limted limited
-libwireshark0: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.0.0.0 Ressources Resources
-libwireshark0: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.0.0.0 Sytems Systems
-libwireshark0: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.0.0.0 Softwares Software
-libwireshark0: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.0.0.0 VERION VERSION
-libwireshark0: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.0.0.0 Goverment Government
-libwireshark0: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.0.0.0 DEVELOPPEMENT DEVELOPMENT
-libwireshark0: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.0.0.0 Embeded Embedded
-libwireshark0: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.0.0.0 Informations Information
-libwireshark0: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.0.0.0 Developement Development
-libwireshark0: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.0.0.0 FUNCION FUNCTION
-libwireshark0: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.0.0.0 Comit Commit
-libwireshark0: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.0.0.0 Nam Name
-libwireshark0: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.0.0.0 serie series
-
# from file-elf.c
libwireshark0: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.0.0.0 Synopsys Synopsis
diff --git a/debian/libwireshark0.symbols b/debian/libwireshark0.symbols
index 69466eb6ec..a5cbacccfd 100644
--- a/debian/libwireshark0.symbols
+++ b/debian/libwireshark0.symbols
@@ -479,6 +479,9 @@ libwireshark.so.0 libwireshark0 #MINVER#
elem_tv_short@Base 1.9.1
elem_v@Base 1.9.1
elem_v_short@Base 1.9.1
+ enterprises_base_custom@Base 2.5.0
+ enterprises_lookup@Base 2.5.0
+ enterprises_lookup_format@Base 2.5.0
eo_ct2ext@Base 2.3.0
eo_free_entry@Base 2.3.0
eo_iterate_tables@Base 2.3.0
@@ -1373,7 +1376,6 @@ libwireshark.so.0 libwireshark0 #MINVER#
signed_time_secs_to_str@Base 2.1.0
smb2_cmd_vals_ext@Base 1.9.1
smb_cmd_vals_ext@Base 1.9.1
- sminmpec_values_ext@Base 1.9.1
srt_table_dissector_init@Base 1.99.8
srt_table_get_filter@Base 1.99.8
srt_table_get_tap_string@Base 1.99.8
@@ -1528,6 +1530,7 @@ libwireshark.so.0 libwireshark0 #MINVER#
try_capture_dissector@Base 2.1.0
try_bytesprefix_to_str@Base 2.3.0
try_bytesval_to_str@Base 2.3.0
+ try_enterprises_lookup@Base 2.5.0
try_rval_to_str@Base 1.9.1
try_rval_to_str_idx@Base 1.9.1
try_rval64_to_str@Base 2.3.0