aboutsummaryrefslogtreecommitdiffstats
path: root/wka.tmpl
AgeCommit message (Collapse)AuthorFilesLines
2017-07-23Put the well-known addresses into a separate file from OUIsJoão Valverde1-263/+0
Having two distinct logical concepts (OUI and Well Known Address) concatenated to a single "manuf" file is needlessly obfuscating the WKA feature. Have a distinct "wka" file instead and just skip the cat. Change-Id: I46f53b0015a37331d65f8cfac7cbbd499dd0c5b8 Reviewed-on: https://code.wireshark.org/review/22742 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-13Change spaces to tab for recent wka entriesDavid Barrera1-3/+3
Commit 66549a9cacb29abdbb2c6fdaaf8235c4f34f6a13 added 3 new entries to wka.tmpl, but used spaces instead of the default tab separator. This inconsistency causes external tools that expect tabs in the manuf file to behave unexpectedly. The manuf file was re-generated after the fix to wka.tmpl. Change-Id: I79bceac649e0fc29b3502fc2e074dcd513f29ff5 Reviewed-on: https://code.wireshark.org/review/19217 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-06Fix a mac collision in wka.tmpl.Joerg Mayer1-0/+6
Change-Id: Ic85f552f6f8bf094c03c613d9068abfccbec0597 Reviewed-on: https://code.wireshark.org/review/15753 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-05-07manuf: Add well-known MAC entries for DOCSIS and regenerate fileDominic Chen1-0/+4
DOCSIS has a few well-known MAC entries defined in ANSI SCTE 22-1 with the prefix 01-E0-2F. Currently, this gets munged by manuf_name_lookup() to 00-E0-2F and the vendor "McnsHold", which is incorrect. Change-Id: Ib5888d2545fcfbcadf4dd918dd2639de8f7b81b4 Reviewed-on: https://code.wireshark.org/review/15278 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-28epl: Add support for AMNI frameJosef Baumgartner1-0/+1
The "EPSG Draft Standard 302-A: High Availability" introduces the new frame "AMNI". This change adds support to correctly dissect POWERLINK AMNI frames. Change-Id: I9e402423296c4e82a25e897de964629bb695d566 Reviewed-on: https://code.wireshark.org/review/8215 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-08-22TRILL updatesMarian Ďurkovič1-1/+3
Update Version info Update Nickname IDs Add new multicast MAC addresses Change-Id: I72647b5f98a48267340d51df428602e1c77cb206 Reviewed-on: https://code.wireshark.org/review/3714 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-15Add some missing group addresses.Guy Harris1-0/+11
Bug: 10383 Change-Id: I94c9604824f25347fcd3c7bfd5c18aabdbe0a332 Reviewed-on: https://code.wireshark.org/review/3603 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-24Adding two well known OAM related multicast address ranges.Jaap Keuter1-0/+2
Change-Id: I8fb840e7422b5fe7cd3072d8332de659598ebd3d Reviewed-on: https://code.wireshark.org/review/1313 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash) Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd Reviewed-on: https://code.wireshark.org/review/881 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2012-12-05Broadcom "donated" one of their OUIs for use in Fibre Channel overGuy Harris1-0/+14
Ethernet group MAC-48 addresses: http://www.t11.org/ftp/t11/pub/fc/bb-5/08-334v0.pdf so we add entries for the three group addresses in question and an entry to cover all unassigned group addresses in that range. Regenerate manuf file. Fixes bug 8046. svn path=/trunk/; revision=46386
2012-06-28Update Free Software Foundation address.Jakub Zawadzki1-1/+1
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2010-08-16Modernize the SONMP ("SynOptics Network Management Protocol") dissector by ↵Stephen Fisher1-4/+4
renaming it to NDP ("Nortel Discovery Protocol") and do some basic cleanup. svn path=/trunk/; revision=33815
2010-07-16Fix for bug 5015:Jaap Keuter1-1/+1
Remove redundancy from VRRP MAC address name resolution, even though it's fitting for the protocol ;) svn path=/trunk/; revision=33556
2010-01-05More updates to the ISL dissector:Stephen Fisher1-0/+1
1) Rollback r14139 in two parts: a) Change user priority back to what Cisco's ISL documentation states that the values mean instead of the 802.1Q CoS values (see also note below). b) Change the destination address back to type FT_ETHER since the ISL-Frame values were added to manuf/wka.tmpl in r16741 with a /40 mask. 2) Add 03-00-0C-00-00/40 to manuf/wka.tmpl for ISL over Token Ring. 3) Move the type and user fields to a tree elow the destination address since that is where the values come from. NOTE: Regarding change 1a, I noticed in the Wiki's isl-2-dot1q.cap sample capture file that bit #2 is being set to 1 when bits 0 and 1 are set to 1. When bits 0 and 1 are both set to 0, bit 2 is not set. I cannot find a reference to this bit being used in Cisco's documentation. svn path=/trunk/; revision=31446
2008-04-14Fix for bug 2456:Jaap Keuter1-1/+2
IPv6 multicast MAC address incorrectly resolved to neighborhood discovery. svn path=/trunk/; revision=25015
2008-02-13Fix for bug 2259:Jaap Keuter1-0/+1
Add a line to map MAC addresses 01:00:5E/25 to IPv4 multicast. svn path=/trunk/; revision=24319
2007-12-28Two addresses from the 802.1 Plenary 11/2007Jaap Keuter1-0/+2
svn path=/trunk/; revision=23959
2007-11-02change some extreme wkas and update manufJörg Mayer1-2/+2
svn path=/trunk/; revision=23341
2007-09-25Small change about extreme EAPSv2 address and update manufJörg Mayer1-1/+3
svn path=/trunk/; revision=22954
2007-04-08Add mc-mac address for l2tp (l2 tunneling proto): GBPTJörg Mayer1-0/+1
svn path=/trunk/; revision=21357
2006-08-22From David Buechi:Anders Broman1-0/+4
Add support for the ETHERNET Powerlink protocol svn path=/trunk/; revision=18998
2006-05-31Rename the main executable to "wireshark", along with more conversions:Gerald Combs1-1/+1
ethereal.com -> wireshark.org mailing lists and addresses ETHEREAL -> WIRESHARK Man pages Automake/Autoconf names svn path=/trunk/; revision=18271
2006-05-21name changeRonnie Sahlberg1-1/+1
svn path=/trunk/; revision=18197
2006-03-15Update/add some Cisco multicast addressesJörg Mayer1-1/+4
svn path=/trunk/; revision=17633
2006-01-05Jaap Keuter:Jörg Mayer1-0/+2
I've captured a Direct Cable Connection on a WinXP machine (see http://wiki.ethereal.com/SampleCaptures?action=AttachFile&do=get&target=PPP-config.cap). The thing is that the capture lib(?) creates fake Ethernet headers for the PPP LCP and NCP packets. These contain " SEND#" or " RECV#" as both source and destination address, where "#" seems to be a session number based on modem control signals(?). Anyway, to make more sense of the direction these PPP frames are going I've added them to the address resolution file, as per attached patch. svn path=/trunk/; revision=16949
2005-12-16Jaap Keuter:Jörg Mayer1-0/+1
I'm seeing a variant of the registered Ethernet address for MS NLB multicast being used. Changed to remove "multicast" from the name as it isn't a multicast address. svn path=/trunk/; revision=16823
2005-12-09Add Cisco-ISL MAC-addressesJörg Mayer1-1/+2
Remove IETF-VRRP: This is a generic multicast address, and there are 31 other IP-multicast addresses mapping to the same mac address. svn path=/trunk/; revision=16741
2005-10-05Add two Enterasys STP multicast MACsJörg Mayer1-0/+2
svn path=/trunk/; revision=16129
2005-09-28Updates for foundry addresses/protocolsJörg Mayer1-0/+1
svn path=/trunk/; revision=16042
2005-09-19Jim Young: LLDP improvementsJörg Mayer1-0/+1
svn path=/trunk/; revision=15879
2005-09-16wka.tmpl:Jörg Mayer1-2/+35
Show MS NLB Adresses individually manuf: Update svn path=/trunk/; revision=15834
2005-08-27- Update wka.tmpl with two Extreme MAC addressesJörg Mayer1-1/+2
- Update manuf - Update faq svn path=/trunk/; revision=15560
2005-08-15- Update manufJörg Mayer1-0/+1
- Add some Extreme MAC addresses to wka.tmpl svn path=/trunk/; revision=15363
2005-07-28Add Extreme stuffJörg Mayer1-0/+3
svn path=/trunk/; revision=15123
2005-02-03From Dominique Bastien: add the slow protocol MAC address to the list ofGuy Harris1-0/+1
well-known MAC addresses. svn path=/trunk/; revision=13258
2004-07-18Set the svn:eol-style property on all text files to "native", so thatGuy Harris1-1/+1
they have LF at the end of the line on UN*X and CR/LF on Windows; hopefully this means that if a CR/LF version is checked in on Windows, the CRs will be stripped so that they show up only when checked out on Windows, not on UN*X. svn path=/trunk/; revision=11400
2004-06-18Add local MAC addresses for MS-Loadbalancing (not all, see comment in wka.tmpl)Jörg Mayer1-1/+10
Update manuf svn path=/trunk/; revision=11180
2004-06-15Add and entry for 03-00-C7-00-00-EE (HP/Compaq ProLiant NIC teaming).Gerald Combs1-1/+2
The protocol is documented at http://www.hp.com/sbso/bus_protect/teaming.pdf if anyone wants to write a dissector. svn path=/trunk/; revision=11153
2003-04-25Obscure email addresses and update entries.Gerald Combs1-2/+2
svn path=/trunk/; revision=7558
2002-09-09Allow the "manuf" file to contain well-known MAC addresses and addressGuy Harris1-0/+153
ranges specified with a mask, as well as manufacturer OUIs. Match the address range values, as well as MAC addresses and manufacturer OUIs, when translating MAC addresses to names. Have "make-manuf" read a file containing the well-known addresses and append it to the list of OUIs. svn path=/trunk/; revision=6233