forked from osmocom/wireshark
Be less aggressive about rebuilding sminmpec.c.
Instead of forcing developers to generate sminmpec.c (which will have different results depending on the presence or absence of a working Internet connection) add sminmpec.c back to the repository. I'll add it to the weekly update-numbers script so that it will be updated at the same time as manuf, services, enterprise-numbers, and usb.c. Change the Autotools, CMake, and Nmake sminmpec.c target name to "update-sminmpec". Remove the mtime check from make-sminmpec.pl. Update enterprise-numbers and sminmpec.c while we're here. Tested with an in-tree Autotools build and an out-of-tree CMake build. Change-Id: Iecc332ce2731e3e98ab0205a56c78807e599a026 Reviewed-on: https://code.wireshark.org/review/1516 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This commit is contained in:
parent
e5cfd9e13a
commit
3f247a5cee
|
@ -39,7 +39,6 @@ epan/packet-ncp2222.c
|
||||||
epan/register-cache.pkl
|
epan/register-cache.pkl
|
||||||
epan/register.c
|
epan/register.c
|
||||||
epan/register_wslua.c
|
epan/register_wslua.c
|
||||||
epan/sminmpec.c
|
|
||||||
epan/taps.txt
|
epan/taps.txt
|
||||||
epan/taps_wslua.c
|
epan/taps_wslua.c
|
||||||
epan/uat_load.c
|
epan/uat_load.c
|
||||||
|
|
|
@ -1481,13 +1481,10 @@ set(WMEM_FILES
|
||||||
)
|
)
|
||||||
source_group(wmem FILES ${WMEM_FILES})
|
source_group(wmem FILES ${WMEM_FILES})
|
||||||
|
|
||||||
ADD_CUSTOM_COMMAND(
|
ADD_CUSTOM_TARGET(
|
||||||
OUTPUT
|
update-sminmpec ALL
|
||||||
sminmpec.c
|
|
||||||
COMMAND ${PERL_EXECUTABLE}
|
COMMAND ${PERL_EXECUTABLE}
|
||||||
${CMAKE_SOURCE_DIR}/tools/make-sminmpec.pl
|
${CMAKE_SOURCE_DIR}/tools/make-sminmpec.pl
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/enterprise-numbers
|
|
||||||
sminmpec.c
|
|
||||||
DEPENDS
|
DEPENDS
|
||||||
enterprise-numbers
|
enterprise-numbers
|
||||||
${CMAKE_SOURCE_DIR}/tools/make-sminmpec.pl
|
${CMAKE_SOURCE_DIR}/tools/make-sminmpec.pl
|
||||||
|
|
|
@ -128,8 +128,7 @@ DISTCLEANFILES = \
|
||||||
MAINTAINERCLEANFILES = \
|
MAINTAINERCLEANFILES = \
|
||||||
$(LIBWIRESHARK_GENERATED_C_FILES) \
|
$(LIBWIRESHARK_GENERATED_C_FILES) \
|
||||||
$(LIBWIRESHARK_GENERATED_HEADER_FILES) \
|
$(LIBWIRESHARK_GENERATED_HEADER_FILES) \
|
||||||
Makefile.in \
|
Makefile.in
|
||||||
sminmpec.c
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Add the object files for missing routines, if any.
|
# Add the object files for missing routines, if any.
|
||||||
|
@ -194,8 +193,8 @@ dtd_grammar.c : $(LEMON)/lemon$(EXEEXT) $(srcdir)/$(LEMON)/lempar.c $(srcdir)/dt
|
||||||
|
|
||||||
tvbtest.o exntest.o oids_test.o: exceptions.h
|
tvbtest.o exntest.o oids_test.o: exceptions.h
|
||||||
|
|
||||||
sminmpec.c: enterprise-numbers ../tools/make-sminmpec.pl
|
update-sminmpec:
|
||||||
$(PERL) $(srcdir)/../tools/make-sminmpec.pl $(srcdir)/enterprise-numbers sminmpec.c
|
$(PERL) $(srcdir)/../tools/make-sminmpec.pl
|
||||||
|
|
||||||
ps.c: print.ps $(top_srcdir)/tools/rdps.py
|
ps.c: print.ps $(top_srcdir)/tools/rdps.py
|
||||||
$(PYTHON) $(top_srcdir)/tools/rdps.py $(srcdir)/print.ps ps.c
|
$(PYTHON) $(top_srcdir)/tools/rdps.py $(srcdir)/print.ps ps.c
|
||||||
|
|
|
@ -169,7 +169,7 @@ distclean-local: clean-local
|
||||||
$(NODIST_LIBWIRESHARK_GENERATED_HEADER_FILES) \
|
$(NODIST_LIBWIRESHARK_GENERATED_HEADER_FILES) \
|
||||||
$(LIBWIRESHARK_GENERATED_C_FILES) \
|
$(LIBWIRESHARK_GENERATED_C_FILES) \
|
||||||
$(LIBWIRESHARK_GENERATED_HEADER_FILES) \
|
$(LIBWIRESHARK_GENERATED_HEADER_FILES) \
|
||||||
dtd_grammar.out sminmpec.c
|
dtd_grammar.out
|
||||||
|
|
||||||
distclean: distclean-local
|
distclean: distclean-local
|
||||||
cd crypt
|
cd crypt
|
||||||
|
@ -383,8 +383,8 @@ asm_utils_win32_x86.obj: asm_utils_win32_x86.asm
|
||||||
$(NASM) -f $(WIRESHARK_TARGET_PLATFORM) -o $@ $?
|
$(NASM) -f $(WIRESHARK_TARGET_PLATFORM) -o $@ $?
|
||||||
!ENDIF
|
!ENDIF
|
||||||
|
|
||||||
sminmpec.c: enterprise-numbers ..\tools\make-sminmpec.pl
|
update-sminmpec:
|
||||||
$(PERL) ../tools/make-sminmpec.pl enterprise-numbers sminmpec.c
|
$(PERL) ../tools/make-sminmpec.pl
|
||||||
|
|
||||||
RUNLEX=..\tools\runlex.sh
|
RUNLEX=..\tools\runlex.sh
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
PRIVATE ENTERPRISE NUMBERS
|
PRIVATE ENTERPRISE NUMBERS
|
||||||
|
|
||||||
(last updated 2014-04-25)
|
(last updated 2014-05-05)
|
||||||
|
|
||||||
SMI Network Management Private Enterprise Codes:
|
SMI Network Management Private Enterprise Codes:
|
||||||
|
|
||||||
|
@ -7574,9 +7574,9 @@ Decimal
|
||||||
Francois Gauthie
|
Francois Gauthie
|
||||||
metfgar&met.fr
|
metfgar&met.fr
|
||||||
1890
|
1890
|
||||||
JBM Electronics
|
Red Lion Controls (JBM Electronics)
|
||||||
Kevin Morris
|
Denis Aull
|
||||||
jbmelect&mo.net
|
Engineering&RedLion.net
|
||||||
1891
|
1891
|
||||||
OPTIM Systems, Inc.
|
OPTIM Systems, Inc.
|
||||||
Mr. Sunil Meht
|
Mr. Sunil Meht
|
||||||
|
@ -22130,9 +22130,9 @@ Decimal
|
||||||
Buyle You
|
Buyle You
|
||||||
ybl&cybertek.co.kr
|
ybl&cybertek.co.kr
|
||||||
5540
|
5540
|
||||||
Aachen University of Technology (RWTH)
|
RWTH Aachen University
|
||||||
Guido Bunsen
|
Guido Bunsen
|
||||||
Bunsen&rz.RWTH-Aachen.DE
|
Bunsen&itc.RWTH-Aachen.DE
|
||||||
5541
|
5541
|
||||||
Paragea Communications, Inc
|
Paragea Communications, Inc
|
||||||
Laique Ahmed
|
Laique Ahmed
|
||||||
|
@ -23722,9 +23722,9 @@ Decimal
|
||||||
Miran Bohak
|
Miran Bohak
|
||||||
miran.bohak&halcom.si
|
miran.bohak&halcom.si
|
||||||
5940
|
5940
|
||||||
JBM Electronics Co., Inc.
|
Red Lion Controls (JBM Electronics Co., Inc.)
|
||||||
Art Surgant
|
Denis Aull
|
||||||
asurgant&jbmelectronics.com
|
Engineering&RedLion.net
|
||||||
5941
|
5941
|
||||||
Cosmocom Inc.
|
Cosmocom Inc.
|
||||||
Rick Marlborough
|
Rick Marlborough
|
||||||
|
@ -81715,9 +81715,9 @@ Nancy - FRANCE
|
||||||
Tilman Reiff
|
Tilman Reiff
|
||||||
chinchilla&fursr.com
|
chinchilla&fursr.com
|
||||||
20540
|
20540
|
||||||
SIXNET
|
Red Lion Controls (SIXNET)
|
||||||
Dave Ellis
|
Denis Aull
|
||||||
dge&sixnetio.com
|
Engineering&RedLion.net
|
||||||
20541
|
20541
|
||||||
CITTIO, Inc.
|
CITTIO, Inc.
|
||||||
Ross Fujii
|
Ross Fujii
|
||||||
|
@ -113104,9 +113104,9 @@ Decentralization / Helenic Public Administra
|
||||||
chandra nath
|
chandra nath
|
||||||
nath&01edge.com
|
nath&01edge.com
|
||||||
28381
|
28381
|
||||||
N-Tron Corp.
|
Red Lion Controls (N-Tron)
|
||||||
Warren Nicholson
|
Denis Aull
|
||||||
warren.nicholson&n-tron.com
|
Engineering&RedLion.net
|
||||||
28382
|
28382
|
||||||
AirCell LLC
|
AirCell LLC
|
||||||
Brad Schnair
|
Brad Schnair
|
||||||
|
@ -118736,9 +118736,9 @@ Decentralization / Helenic Public Administra
|
||||||
Krzysztof Czajka
|
Krzysztof Czajka
|
||||||
iptv&telmor.pl
|
iptv&telmor.pl
|
||||||
29789
|
29789
|
||||||
BlueTree Wireless Data, Inc.
|
Red Lion Controls (BlueTree Wireless Data, Inc.)
|
||||||
Fadi Bachaalani
|
Denis Aull
|
||||||
fbachaalani&bluetreewireless.com
|
Engineering&RedLion.net
|
||||||
29790
|
29790
|
||||||
Yelp Inc.
|
Yelp Inc.
|
||||||
Sean Plaice
|
Sean Plaice
|
||||||
|
@ -152034,8 +152034,8 @@ Decentralization / Helenic Public Administra
|
||||||
yedaoliang&163.com
|
yedaoliang&163.com
|
||||||
38113
|
38113
|
||||||
Red Lion Controls Inc.
|
Red Lion Controls Inc.
|
||||||
Paul Marsh
|
Denis Aull
|
||||||
paulm&redlion.net
|
Engineering&RedLion.net
|
||||||
38114
|
38114
|
||||||
Merseytravel
|
Merseytravel
|
||||||
Mark Evans
|
Mark Evans
|
||||||
|
@ -174100,6 +174100,210 @@ Decentralization / Helenic Public Administra
|
||||||
PSITEX, LLC
|
PSITEX, LLC
|
||||||
Jack D. Pond
|
Jack D. Pond
|
||||||
jack.pond&psitex.com
|
jack.pond&psitex.com
|
||||||
|
43630
|
||||||
|
Duxoft, Inc.
|
||||||
|
Gennadiy Bezkorovayniy
|
||||||
|
gb&duxoft.com
|
||||||
|
43631
|
||||||
|
Heijmans N.V.
|
||||||
|
Edwin van de Burgt
|
||||||
|
eburgt2&heijmans.nl
|
||||||
|
43632
|
||||||
|
Celtex Works
|
||||||
|
Davey Robertson
|
||||||
|
d.robertson&celtexworks.com
|
||||||
|
43633
|
||||||
|
AIES Advanced Industrial Electronic Systems
|
||||||
|
Dariusz Makowski
|
||||||
|
dariusz.makowski&aies.pl
|
||||||
|
43634
|
||||||
|
Metrellis, Inc.
|
||||||
|
Walter Sujansky
|
||||||
|
wsujansky&sujansky.com
|
||||||
|
43635
|
||||||
|
Practice Velocity, LLC
|
||||||
|
Gregory J Wentz
|
||||||
|
gwentz&practicevelocity.com
|
||||||
|
43636
|
||||||
|
LES.NET
|
||||||
|
Leslie Bester
|
||||||
|
sales&les.net
|
||||||
|
43637
|
||||||
|
Zymer Inc.
|
||||||
|
Peter Yoo
|
||||||
|
pryoo&zymerinc.com
|
||||||
|
43638
|
||||||
|
ITS Korea
|
||||||
|
Sanghyun Lee
|
||||||
|
shleego&itskorea.kr
|
||||||
|
43639
|
||||||
|
Evoluta Interactive
|
||||||
|
Schalk Snyman
|
||||||
|
schalks&evoluta.biz
|
||||||
|
43640
|
||||||
|
through.other.eyes (Jonathan Platzer)
|
||||||
|
Jonathan Platzer
|
||||||
|
jonathan1996&gmx.at
|
||||||
|
43641
|
||||||
|
netplus.ch SA
|
||||||
|
Jean-Blaise Rey
|
||||||
|
jean-blaise.rey&netplus.pro
|
||||||
|
43642
|
||||||
|
Linde Engineering
|
||||||
|
Walter Werther
|
||||||
|
walter.werther&linde-le.com
|
||||||
|
43643
|
||||||
|
TEQ SA
|
||||||
|
Alessandro Prioglio
|
||||||
|
tech-admin&teq.ch
|
||||||
|
43644
|
||||||
|
Infra Services
|
||||||
|
Arjen Barnhard
|
||||||
|
pen.iana&infra-services.net
|
||||||
|
43645
|
||||||
|
FEIG ELECTRONIC GmbH
|
||||||
|
Sascha Brueck
|
||||||
|
sascha.brueck&feig.de
|
||||||
|
43646
|
||||||
|
Datatal AB
|
||||||
|
Thomas Persson
|
||||||
|
thomas&datatal.se
|
||||||
|
43647
|
||||||
|
Rimbach IT Systems UG
|
||||||
|
Rene M. Rimbach
|
||||||
|
info&rimbach-it-systems.de
|
||||||
|
43648
|
||||||
|
Naudit High Performance Computing and Networking S.L.
|
||||||
|
Eduardo Magaña
|
||||||
|
eduardo.magana&naudit.es
|
||||||
|
43649
|
||||||
|
Raritan Bay Medical Center
|
||||||
|
Susan Landow
|
||||||
|
slandow&rbmc.org
|
||||||
|
43650
|
||||||
|
United Health Services
|
||||||
|
Kevin Rymer
|
||||||
|
kevin_rymer&uhs.org
|
||||||
|
43651
|
||||||
|
INTTRA Inc
|
||||||
|
Michael Lunny
|
||||||
|
michael.lunny&inttra.com
|
||||||
|
43652
|
||||||
|
GoBICS
|
||||||
|
Rasmus Steinkamp
|
||||||
|
iana.pen.6kUL4EWH2w&gobics.de
|
||||||
|
43653
|
||||||
|
UNIVERSITAT OBERTA DE CATALUNYA
|
||||||
|
Carles Cortada i Hortalà
|
||||||
|
ccortada&uoc.edu
|
||||||
|
43654
|
||||||
|
marcsi.ch
|
||||||
|
Marc Siegenthaler
|
||||||
|
shin&marcsi.ch
|
||||||
|
43655
|
||||||
|
University Ecclesiastical Academy of Thessaloniki
|
||||||
|
Telemachos Stamkopoulos
|
||||||
|
telem&aeath.gr
|
||||||
|
43656
|
||||||
|
Consortium
|
||||||
|
Samsun Kang
|
||||||
|
sammy-kang&nate.com
|
||||||
|
43657
|
||||||
|
Kanton St.Gallen
|
||||||
|
Robert Schneider
|
||||||
|
Robert.Schneider&sg.ch
|
||||||
|
43658
|
||||||
|
Seacloud
|
||||||
|
Bong Dae Kim
|
||||||
|
bd.kim&sea-cloud.co.kr
|
||||||
|
43659
|
||||||
|
Hochschule für Technik und Wirtschaft des Saarlandes (htw saar)
|
||||||
|
Niclas Wolniak
|
||||||
|
niclas.wolniak&htwsaar.de
|
||||||
|
43660
|
||||||
|
Zadara Storage Ltd
|
||||||
|
Yair Hershko
|
||||||
|
yair&zadarastorage.com
|
||||||
|
43661
|
||||||
|
Columbus Business Solutions
|
||||||
|
Johnny Mejias
|
||||||
|
jmejias17&gmail.com
|
||||||
|
43662
|
||||||
|
Simpson Housing LLLP
|
||||||
|
Gene Pinson
|
||||||
|
gene.pinson&simpsonhousing.com
|
||||||
|
43663
|
||||||
|
eTouch Federal Systems
|
||||||
|
Benjamin Stassart
|
||||||
|
iana&etouchfederal.com
|
||||||
|
43664
|
||||||
|
Unzane
|
||||||
|
Gerald Turner
|
||||||
|
gturner&unzane.com
|
||||||
|
43665
|
||||||
|
rioxo GmbH
|
||||||
|
Rudolf Rohr
|
||||||
|
rudolf.rohr&rioxo.net
|
||||||
|
43666
|
||||||
|
Hackerspace Brussels
|
||||||
|
Frederic Pasteleurs
|
||||||
|
askarel&hackerspace.be
|
||||||
|
43667
|
||||||
|
Sunwire Inc
|
||||||
|
Jason Legault
|
||||||
|
support&sunwire.ca
|
||||||
|
43668
|
||||||
|
Andreas Kreisel
|
||||||
|
Andreas Kreisel
|
||||||
|
akreisel&duck-edv.de
|
||||||
|
43669
|
||||||
|
The Institute of Mathematical Sciences
|
||||||
|
B. Raveendra Reddy
|
||||||
|
ravi&imsc.res.in
|
||||||
|
43670
|
||||||
|
Epic Code Pty. Ltd.
|
||||||
|
Michael Slade
|
||||||
|
mslade&knobbits.org
|
||||||
|
43671
|
||||||
|
EMSEAS Teknik AB
|
||||||
|
Jonathan Petersson
|
||||||
|
jonathan.petersson&cxense.com
|
||||||
|
43672
|
||||||
|
INTELLECT MODULE
|
||||||
|
Ivan Fedotov
|
||||||
|
ivan&intellect-module.ru
|
||||||
|
43673
|
||||||
|
Federal State Unitary Enterprise CentrInform
|
||||||
|
Aleksey Gvozdev
|
||||||
|
a.gvozdev¢er-inform.ru
|
||||||
|
43674
|
||||||
|
Robonect
|
||||||
|
Mikhail Sokolov
|
||||||
|
robot&robonect.com
|
||||||
|
43675
|
||||||
|
Accenture CAS GmbH
|
||||||
|
Carsten Mueller
|
||||||
|
carsten.mueller&accenture.com
|
||||||
|
43676
|
||||||
|
57North Hacklab
|
||||||
|
Iain Learmonth
|
||||||
|
irl&fsfe.org
|
||||||
|
43677
|
||||||
|
ICT Plus srl
|
||||||
|
Alessandro Barsotti
|
||||||
|
alessandro.barsotti&ictplus.it
|
||||||
|
43678
|
||||||
|
Michael Kramer
|
||||||
|
Michael Kramer
|
||||||
|
verwaltung&turkeyfish.de
|
||||||
|
43679
|
||||||
|
SETTE
|
||||||
|
Sotir Gramosli
|
||||||
|
sotir.gramosli&sette.com.mk
|
||||||
|
43680
|
||||||
|
Chorus Limited
|
||||||
|
David Vink
|
||||||
|
chorusopsnotify&chorus.co.nz
|
||||||
|
|
||||||
|
|
||||||
End of Document
|
End of Document
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -19,6 +19,7 @@
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
|
||||||
use strict;
|
use strict;
|
||||||
use File::Spec;
|
use File::Spec;
|
||||||
|
|
||||||
|
@ -48,12 +49,6 @@ if($in =~ m/^http:/i) {
|
||||||
|
|
||||||
my $request = HTTP::Request->new(GET => $in);
|
my $request = HTTP::Request->new(GET => $in);
|
||||||
|
|
||||||
if (-f "enterprise-numbers") {
|
|
||||||
my $mtime;
|
|
||||||
(undef,undef,undef,undef,undef,undef,undef,undef,undef,$mtime,undef,undef,undef) = stat("enterprise-numbers");
|
|
||||||
$request->if_modified_since( $mtime );
|
|
||||||
}
|
|
||||||
|
|
||||||
my $result = $agent->request($request);
|
my $result = $agent->request($request);
|
||||||
|
|
||||||
if ($result->code eq 200) {
|
if ($result->code eq 200) {
|
||||||
|
@ -127,11 +122,14 @@ print OUT <<"_SMINMPEC";
|
||||||
/*
|
/*
|
||||||
* THIS FILE IS AUTOGENERATED, DO NOT EDIT
|
* THIS FILE IS AUTOGENERATED, DO NOT EDIT
|
||||||
* generated from http://www.iana.org/assignments/enterprise-numbers
|
* generated from http://www.iana.org/assignments/enterprise-numbers
|
||||||
* run "tools/make-sminmspec <infile> <outfile>" to regenerate
|
* run "tools/make-sminmpec.pl <infile> <outfile>" to regenerate
|
||||||
*
|
*
|
||||||
* Note: "Gaps" in the iana enterprise-numbers list have been "filled in"
|
* Note 1: "Gaps" in the iana enterprise-numbers list have been "filled in"
|
||||||
* with "(Unknown)" as the name so that direct (indexed) access
|
* with "(Unknown)" as the name so that direct (indexed) access to
|
||||||
* to the list is possible.
|
* the list is possible.
|
||||||
|
*
|
||||||
|
* Note 2: We should probably parse "enterprise-numbers" at program start
|
||||||
|
* instead of generating this file.
|
||||||
*/
|
*/
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
|
|
|
@ -112,6 +112,11 @@ header="""/* usb.c
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* XXX We should probably parse a USB ID file at program start instead
|
||||||
|
* of generating this file.
|
||||||
|
*/
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include <epan/packet.h>
|
#include <epan/packet.h>
|
||||||
"""
|
"""
|
||||||
|
|
Loading…
Reference in New Issue