as suggested by Loris: add wpcap_packet_get_version() and check the packet.dll versio...
[obnox/wireshark/wip.git] / manuf
diff --git a/manuf b/manuf
index eda3bcf42c05744cb14f2e28792f3669dd32e35e..a255f2731b565eac3d32bb36ace8b11a73509822 100644 (file)
--- a/manuf
+++ b/manuf
@@ -1,3 +1,6 @@
+# This file was generated by running ./make-manuf.
+# Don't change it directly, change manuf.tmpl and wka.tmpl instead.
+#
 # 
 # /etc/manuf - Ethernet vendor codes, and well-known MAC addresses
 #
 00:01:70       EseEmbedde             # ESE Embedded System Engineer'g
 00:01:71       AlliedData             # Allied Data Technologies
 00:01:72       Technoland             # TechnoLand Co., LTD.
-00:01:73       Jni                    # JNI Corporation
+00:01:73       Amcc
 00:01:74       Cyberoptic             # CyberOptics Corporation
 00:01:75       RadiantCom             # Radiant Communications Corp.
 00:01:76       OrientSilv             # Orient Silver Enterprises
 00:02:4E       DatacardGr             # Datacard Group
 00:02:4F       IpmDatacom             # IPM Datacom S.R.L.
 00:02:50       GeyserNetw             # Geyser Networks, Inc.
-00:02:51       SomaNetwor             # Soma Networks
+00:02:51       SomaNetwor             # Soma Networks, Inc.
 00:02:52       Carrier                # Carrier Corporation
 00:02:53       Televideo              # Televideo, Inc.
 00:02:54       Worldgate
 00:04:CF       SeagateTec             # Seagate Technology
 00:04:D0       SoftlinkSR             # Softlink s.r.o.
 00:04:D1       DrewTechno             # Drew Technologies, Inc.
-00:04:D2       AdconTelem             # Adcon Telemetry AG
+00:04:D2       AdconTelem             # Adcon Telemetry GmbH
 00:04:D3       Toyokeiki              # Toyokeiki Co., Ltd.
 00:04:D4       ProviewEle             # Proview Electronics Co., Ltd.
 00:04:D5       HitachiCom             # Hitachi Communication Systems, Inc.
 00:05:43       IqWireless             # IQ Wireless GmbH
 00:05:44       ValleyTech             # Valley Technologies, Inc.
 00:05:45       InternetPh             # Internet Photonics
-00:05:46       K-Solution             # K-Solutions Inc.
+00:05:46       KddiNetwor             # KDDI Network & Solultions Inc.
 00:05:47       StarentNet             # Starent Networks
 00:05:48       Disco                  # Disco Corporation
 00:05:49       SaliraOpti             # Salira Optical Network Systems
 00:06:30       AdtranzSwe             # Adtranz Sweden
 00:06:31       OpticalSol             # Optical Solutions, Inc.
 00:06:32       MescoEngin             # Mesco Engineering GmbH
-00:06:33       HeimannBio             # Heimann Biometric Systems GmbH
+00:06:33       SmithsHeim             # Smiths Heimann Biometric Systems
 00:06:34       GteAirfone             # GTE Airfone Inc.
 00:06:35       PacketairN             # PacketAir Networks, Inc.
 00:06:36       JedaiBroad             # Jedai Broadband Networks
 00:06:CA       AmericanCo             # American Computer & Digital Components, Inc. (ACDC)
 00:06:CB       JotronElec             # Jotron Electronics A/S
 00:06:CC       JmiElectro             # JMI Electronics Co., Ltd.
-00:06:CD       Creoscitex             # CreoScitex Corporation Ltd.
+00:06:CD       CreoIl                 # Creo IL. Ltd.
 00:06:CE       Dateno
 00:06:CF       ThalesAvio             # Thales Avionics In-Flight Systems, LLC
 00:06:D0       ElgarElect             # Elgar Electronics Corp.
 00:08:24       PromatekIn             # Promatek Industries Ltd.
 00:08:25       AcmePacket             # Acme Packet
 00:08:26       ColoradoMe             # Colorado Med Tech
-00:08:27       PirelliCab             # Pirelli Cables & Systems
+00:08:27       PirelliBro             # Pirelli Broadband Solutions
 00:08:28       KoeiEngine             # Koei Engineering Ltd.
 00:08:29       AvalNagasa             # Aval Nagasaki Corporation
 00:08:2A       Powerwallz             # Powerwallz Network Security
 00:08:CB       ZetaBroadb             # Zeta Broadband Inc.
 00:08:CC       Remotec                # Remotec, Inc.
 00:08:CD       With-Net               # With-Net Inc
-00:08:CE       Private
+00:08:CE       Ipmobilene             # IPMobileNet Inc.
 00:08:CF       NipponKoei             # Nippon Koei Power Systems Co., Ltd.
 00:08:D0       MusashiEng             # Musashi Engineering Co., LTD.
 00:08:D1       Karel                  # KAREL INC.
 00:0B:20       Hirata                 # Hirata corporation
 00:0B:21       G-StarComm             # G-Star Communications Inc.
 00:0B:22       Environmen             # Environmental Systems and Services
-00:0B:23       EfficientN             # Efficient Networks, Inc.
+00:0B:23       SiemensSub             # Siemens Subscriber Networks
 00:0B:24       Airlogic
 00:0B:25       Aeluros
 00:0B:26       Wetek                  # Wetek Corporation
 00:0C:B1       SallandEng             # Salland Engineering (Europe) BV
 00:0C:B2       Safei                  # safei Co., Ltd.
 00:0C:B3       Round                  # ROUND Co.,Ltd.
-00:0C:B4       PropagateN             # Propagate Networks, Inc
+00:0C:B4       AutocellLa             # AutoCell Laboratories, Inc.
 00:0C:B5       PremierTec             # Premier Technolgies, Inc
 00:0C:B6       NanjingSeu             # NANJING SEU MOBILE & INTERNET TECHNOLOGY CO.,LTD
 00:0C:B7       NanjingHua             # Nanjing Huazhuo Electronics Co., Ltd.
 00:10:98       StarnetTec             # STARNET TECHNOLOGIES, INC.
 00:10:99       Innomedia              # InnoMedia, Inc.
 00:10:9A       Netline
-00:10:9B       Vixel                  # VIXEL CORPORATION
+00:10:9B       Emulex                 # Emulex Corporation
 00:10:9C       M-System               # M-SYSTEM CO., LTD.
 00:10:9D       Clarinet               # CLARINET SYSTEMS, INC.
 00:10:9E       Aware                  # AWARE, INC.
 00:10:D8       Calista
 00:10:D9       IbmJapanFu             # IBM JAPAN, FUJISAWA MT+D
 00:10:DA       MotionEngi             # MOTION ENGINEERING, INC.
-00:10:DB       NetscreenT             # NetScreen Technologies, Inc.
+00:10:DB       Private
 00:10:DC       Micro-Star             # MICRO-STAR INTERNATIONAL CO., LTD.
 00:10:DD       EnableSemi             # ENABLE SEMICONDUCTOR, INC.
 00:10:DE       Internatio             # INTERNATIONAL DATACASTING CORPORATION
 00:11:9B       Telesynerg             # Telesynergy Research Inc.
 00:11:9C       Ep&TEnergy             # EP&T Energy
 00:11:9D       DiginfoTec             # Diginfo Technology Corporation
-00:11:9E       SolectronB             # Solectron Brazil
+00:11:9E       Private
 00:11:9F       NokiaDanma             # Nokia Danmark A/S
 00:11:A0       VtechEngin             # Vtech Engineering Canada Ltd
 00:11:A1       VisionNetw             # VISION NETWARE CO.,LTD
 00:13:69       HondaElect             # Honda Electron Co., LED.
 00:13:6A       HachUltraA             # Hach Ultra Analytics
 00:13:6B       E-Tec
+00:13:6C       Private
+00:13:6D       Tentaculus             # Tentaculus AB
+00:13:6E       Techmetro              # Techmetro Corp.
+00:13:6F       Packetmoti             # PacketMotion, Inc.
+00:13:70       NokiaDanma             # Nokia Danmark A/S
+00:13:71       MotorolaCh             # Motorola CHS
+00:13:72       Dell                   # Dell Inc.
+00:13:73       BlwaveElec             # BLwave Electronics Co., Ltd
+00:13:74       AttansicTe             # Attansic Technology Corp.
+00:13:75       AmericanSe             # American Security Products Co.
+00:13:76       TaborElect             # Tabor Electronics Ltd.
+00:13:77       SamsungEle             # Samsung Electronics CO., LTD
+00:13:78       QsanTechno             # QSAN Technology, Inc.
+00:13:79       PonderInfo             # PONDER INFORMATION INDUSTRIES LTD.
+00:13:7A       NetvoxTech             # Netvox Technology Co., Ltd.
+00:13:7B       Movon                  # Movon Corporation
+00:13:7C       Kaicom                 # Kaicom co., Ltd.
+00:13:7D       Dynalab                # Dynalab, Inc.
+00:13:7E       CoredgeNet             # CorEdge Networks, Inc.
+00:13:7F       Cisco                  # Cisco Systems
+00:13:80       Cisco                  # Cisco Systems
+00:13:81       Chips                  # CHIPS & Systems, Inc.
+00:13:82       CetaceaNet             # Cetacea Networks Corporation
+00:13:83       Applicatio             # Application Technologies and Engineering Research Laboratory
+00:13:84       AdvancedMo             # Advanced Motion Controls
+00:13:85       Add-OnTech             # Add-On Technology Co., LTD.
+00:13:86       Abb/Totalf             # ABB Inc./Totalflow
+00:13:87       27mTechnol             # 27M Technologies AB
+00:13:88       WimediaAll             # WiMedia Alliance
+00:13:89       RedesDeTel             # Redes de Telefonía Móvil S.A.
+00:13:8A       QingdaoGoe             # QINGDAO GOERTEK ELECTRONICS CO.,LTD.
+00:13:8B       PhantomTec             # Phantom Technologies LLC
+00:13:8C       Kumyoung               # Kumyoung.Co.Ltd
+00:13:8D       Kinghold
+00:13:8E       FoabElektr             # FOAB Elektronik AB
+00:13:8F       AsiarockIn             # Asiarock Incorporation
+00:13:90       TermtekCom             # Termtek Computer Co., Ltd
+00:13:91       Ouen                   # OUEN CO.,LTD.
+00:13:92       Video54Tec             # Video54 Technologies, Inc
+00:13:93       Panta                  # Panta Systems, Inc.
+00:13:94       Infohand               # Infohand Co.,Ltd
+00:13:95       Congatec               # congatec AG
+00:13:96       AcbelPolyt             # Acbel Polytech Inc.
+00:13:97       Private
+00:13:98       Trafficsim             # TrafficSim Co.,Ltd
+00:13:99       Stac                   # STAC Corporation.
+00:13:9A       K-UbiqueId             # K-ubique ID Corp.
+00:13:9B       Ioimage                # ioIMAGE Ltd.
+00:13:9C       ExaveraTec             # Exavera Technologies, Inc.
+00:13:9D       DesignOfOn             # Design of Systems on Silicon S.A.
+00:13:9E       CiaraTechn             # Ciara Technologies Inc.
+00:13:9F       Electronic             # Electronics Design Services, Co., Ltd.
+00:13:A0       Algosystem             # ALGOSYSTEM Co., Ltd.
+00:13:A1       CrowElectr             # Crow Electronic Engeneering
+00:13:A2       Maxstream              # MaxStream, Inc
+00:13:A3       SiemensCom             # Siemens Com CPE Devices
+00:13:A4       KeyeyeComm             # KeyEye Communications
+00:13:A5       GeneralSol             # General Solutions, LTD.
+00:13:A6       Extricom               # Extricom Ltd
+00:13:A7       BattelleMe             # BATTELLE MEMORIAL INSTITUTE
+00:13:A8       TanisysTec             # Tanisys Technology
+00:13:A9       Sony                   # Sony Corporation
+00:13:AA       AlsTec                 # ALS  & TEC Ltd.
+00:13:AB       Telemotive             # Telemotive AG
+00:13:AC       SunmyungEl             # Sunmyung Electronics Co., LTD
+00:13:AD       Sendo                  # Sendo Ltd
+00:13:AE       RadianceTe             # Radiance Technologies
+00:13:AF       NumaTechno             # NUMA Technology,Inc.
+00:13:B0       Jablotron
+00:13:B1       Intelligen             # Intelligent Control Systems (Asia) Pte Ltd
+00:13:B2       Carallon               # Carallon Limited
+00:13:B3       BeijingEco             # Beijing Ecom Communications Technology Co., Ltd.
+00:13:B4       AppearTv               # Appear TV
+00:13:B5       Wavesat
+00:13:B6       SlingMedia             # Sling Media, Inc.
+00:13:B7       ScantechId             # Scantech ID
+00:13:B8       RycoElectr             # RyCo Electronic Systems Limited
+00:13:B9       BmSpa                  # BM SPA
+00:13:BA       Readylinks             # ReadyLinks Inc
+00:13:BB       Private
+00:13:BC       Artimi                 # Artimi Ltd
+00:13:BD       HymatomSa              # HYMATOM SA
+00:13:BE       VirtualCon             # Virtual Conexions
+00:13:BF       MediaSyste             # Media System Planning Corp.
+00:13:C0       TrixTecnol             # Trix Tecnologia Ltda.
+00:13:C1       AsokaUsa               # Asoka USA Corporation
+00:13:C2       Wacom                  # WACOM Co.,Ltd
+00:13:C3       Cisco                  # Cisco Systems
+00:13:C4       Cisco                  # Cisco Systems
+00:13:C5       LightronFi             # LIGHTRON FIBER-OPTIC DEVICES INC.
+00:13:C6       Opengear               # OpenGear, Inc
+00:13:C7       Ionos                  # IONOS Co.,Ltd.
+00:13:C8       PirelliBro             # PIRELLI BROADBAND SOLUTIONS S.P.A.
+00:13:C9       BeyondAchi             # Beyond Achieve Enterprises Ltd.
+00:13:CA       X-Digital              # X-Digital Systems, Inc.
+00:13:CB       ZenitelNor             # Zenitel Norway AS
+00:13:CC       TallMaple              # Tall Maple Systems
+00:13:CD       Mti                    # MTI co. LTD
+00:13:CE       IntelCorpo             # Intel Corporate
+00:13:CF       4accessCom             # 4Access Communications
+00:13:D0       E-San                  # e-San Limited
+00:13:D1       KirkTeleco             # KIRK telecom A/S
+00:13:D2       PageIberic             # PAGE IBERICA, S.A.
+00:13:D3       Micro-Star             # MICRO-STAR INTERNATIONAL CO., LTD.
+00:13:D4       AsustekCom             # ASUSTek COMPUTER INC.
+00:13:D5       Winetworks             # WiNetworks LTD
+00:13:D6       TiiNetwork             # TII NETWORK TECHNOLOGIES, INC.
+00:13:D7       SpidcomTec             # SPIDCOM Technologies SA
+00:13:D8       PrincetonI             # Princeton Instruments
+00:13:D9       MatrixProd             # Matrix Product Development, Inc.
+00:13:DA       Diskware               # Diskware Co., Ltd
+00:13:DB       ShoeiElect             # SHOEI Electric Co.,Ltd
+00:13:DC       Ibtek                  # IBTEK INC.
+00:13:DD       AbbottDiag             # Abbott Diagnostics
+00:13:DE       Adapt4
+00:13:DF       Ryvor                  # Ryvor Corp.
+00:13:E0       MurataManu             # Murata Manufacturing Co., Ltd.
+00:13:E1       Iprobe
+00:13:E2       Geovision              # GeoVision Inc.
+00:13:E3       CoviTechno             # CoVi Technologies, Inc.
+00:13:E4       Yangjae                # YANGJAE SYSTEMS CORP.
+00:13:E5       Tenosys                # TENOSYS, INC.
+00:13:E6       Technoluti             # Technolution
+00:13:E7       MinelabEle             # Minelab Electronics Pty Limited
+00:13:E8       IntelCorpo             # Intel Corporate
+00:13:E9       Veriwave               # VeriWave, Inc.
+00:13:EA       Kamstrup               # Kamstrup A/S
+00:13:EB       Sysmaster              # Sysmaster Corporation
+00:13:EC       SunbaySoft             # Sunbay Software AG
+00:13:ED       Psia
+00:13:EE       JbxDesigns             # JBX Designs Inc.
+00:13:EF       KingjonDig             # Kingjon Digital Technology Co.,Ltd
+00:13:F0       WavefrontS             # Wavefront Semiconductor
+00:13:F1       AmodTechno             # AMOD Technology Co., Ltd.
+00:13:F2       Klas                   # Klas Ltd
+00:13:F3       Giga-ByteC             # Giga-byte Communications Inc.
+00:13:F4       PsitekPty              # Psitek (Pty) Ltd
+00:13:F5       Akimbi                 # Akimbi Systems
+00:13:F6       Cintech
+00:13:F7       SmcNetwork             # SMC Networks, Inc.
 00:17:00       Kabel
 00:1C:7C       Perq                   # PERQ SYSTEMS CORPORATION
 00:20:00       LexmarkInt             # LEXMARK INTERNATIONAL, INC.
 00:30:54       CastlenetT             # CASTLENET TECHNOLOGY, INC.
 00:30:55       HitachiSem             # Hitachi Semiconductor America,
 00:30:56       BeckIpc                # Beck IPC GmbH
-00:30:57       E-Tel                  # E-Tel Corporation
+00:30:57       Qtelnet                # QTelNet, Inc.
 00:30:58       ApiMotion              # API MOTION
 00:30:59       Digital-Lo             # DIGITAL-LOGIC AG
 00:30:5A       Telgen                 # TELGEN CORPORATION
 00:30:C1       Hewlett-Pa             # HEWLETT-PACKARD
 00:30:C2       Comone
 00:30:C3       Flueckiger             # FLUECKIGER ELEKTRONIK AG
-00:30:C4       NiigataCan             # Niigata Canotec Co., Inc.
+00:30:C4       CanonImagi             # Canon Imaging System Technologies, Inc.
 00:30:C5       CadenceDes             # CADENCE DESIGN SYSTEMS
 00:30:C6       ControlSol             # CONTROL SOLUTIONS, INC.
 00:30:C7       Macromate              # MACROMATE CORP.
 00:90:F7       NbaseCommu             # NBASE COMMUNICATIONS LTD.
 00:90:F8       MediatrixT             # MEDIATRIX TELECOM
 00:90:F9       Leitch
-00:90:FA       Giganet                # GigaNet, Inc.
+00:90:FA       Emulex                 # EMULEX Corp
 00:90:FB       Portwell               # PORTWELL, INC.
 00:90:FC       NetworkCom             # NETWORK COMPUTING DEVICES
 00:90:FD       Coppercom              # CopperCom, Inc.
 08:00:0C       MiklynDeve             # MIKLYN DEVELOPMENT CO.
 08:00:0D       Internatio             # INTERNATIONAL COMPUTERS LTD.
 08:00:0E       Ncr                    # NCR CORPORATION
-08:00:0F       Mitel                  # Mitel Networks
+08:00:0F       Mitel                  # MITEL CORPORATION
 08:00:10       At&T[Misre             # AT&T [misrepresentation of 800010?]
 08:00:11       Tektronix              # TEKTRONIX INC.
 08:00:12       BellAtlant             # BELL ATLANTIC INTEGRATED SYST.
@@ -8103,6 +8246,7 @@ EC:10:00  EnanceSour             # Enance Source Co., Ltd.        PC clones(?)
 01-20-25/25            Control-Technology-Inc's-Industrial-Ctrl-Proto.
 01-80-24-00-00-00      Kalpana-Etherswitch-every-60-seconds
 01-80-C2-00-00-00/44   Spanning-tree-(for-bridges)
+01-80-C2-00-00-02      Slow-Protocols
 01-80-C2-00-00-10      Bridge-Management
 01-80-C2-00-00-11      Load-Server
 01-80-C2-00-00-12      Loadable-Device