diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-09-09 19:38:11 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-09-09 19:38:11 +0000 |
| commit | 91ecc404e92176df8d3f80ca8309d2d2b5bb11a9 (patch) | |
| tree | 0d72f94b7c1794f25ac0726b7956c7b93cfb4ddc /manuf.tmpl | |
| parent | 9390e0591a3ec18c48abe0b34db9ea59183a1818 (diff) | |
| download | wireshark-91ecc404e92176df8d3f80ca8309d2d2b5bb11a9.tar.gz | |
Allow the "manuf" file to contain well-known MAC addresses and address
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
Diffstat (limited to 'manuf.tmpl')
| -rw-r--r-- | manuf.tmpl | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/manuf.tmpl b/manuf.tmpl index a22664d0d8..0ef96d1972 100644 --- a/manuf.tmpl +++ b/manuf.tmpl @@ -1,7 +1,7 @@ # -# /etc/manuf - Ethernet vendor codes +# /etc/manuf - Ethernet vendor codes, and well-known MAC addresses # -# $Id: manuf.tmpl,v 1.6 2002/08/03 00:50:22 jmayer Exp $ +# $Id: manuf.tmpl,v 1.7 2002/09/09 19:38:09 guy Exp $ # # Laurent Deniel <deniel@worldnet.fr> # @@ -39,10 +39,12 @@ # In the event of data set collisions the Ethereal entries have been given # precedence, followed by Michael Patton's, followed by the IEEE. # -# -# # This file is in the same format as ethers(4) except that vendor names -# are truncated to eight characters when used with Ethereal. +# are truncated to eight characters when used with Ethereal, and +# that well-known MAC addresses need not have a full 6 octets and may +# have a netmask following them specifying how many bits of the address +# are relevant (the other bits are wildcards). Also, either ":", "-", +# or "." can be used to separate the octets. # 00:00:00 00:00:00 # Officially Xerox, but 0:0:0:0:0:0 is more common |