Commit Graph

34 Commits

Author SHA1 Message Date
Philip Rosenberg-Watt bf2b6dd2a0 Add short name for CableLabs.
Change-Id: I474c03a1a40586a14cdec2196ee3ebc89eedd8ab
Reviewed-on: https://code.wireshark.org/review/1236
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-21 18:06:50 +00:00
Alexis La Goutte 757aa33220 Continue to remove $Id$ from top of file
(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>
2014-03-31 18:48:06 +00:00
Gerald Combs 4b28a988aa Update the "latest version" URL in manuf/manuf.tmpl.
Regenerate manuf. I *really* wish Gitweb URLs were less ugly.

Change-Id: I51eabe1a028999859499466a9369106f465dec80
Reviewed-on: https://code.wireshark.org/review/300
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-21 21:36:02 +00:00
Jaap Keuter ae85ba7c58 From Hadriel Kaplan:
The 'make-manuf'perl script gets the IEEE 22-bit OUI and IAB registries, but not OUI-36.
patch to get the OUI-36 listings.

From me:
Update header text in template to list the sources actually used.

svn path=/trunk/; revision=48572
2013-03-26 21:53:09 +00:00
Jakub Zawadzki bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Gerald Combs b854d9e20f Update some comments.
svn path=/trunk/; revision=26384
2008-10-08 23:14:47 +00:00
Ulf Lamping f39958d89a add PROFINET Multicast OUI 01:0E:CF (in addition to the unicast 00:0E:CF)
svn path=/trunk/; revision=22433
2007-07-31 19:03:43 +00:00
Jörg Mayer 39c29557c7 Update to current IEEE and remove fixed entry for 00-06-0D (bug 1256)
svn path=/trunk/; revision=20048
2006-12-05 15:25:16 +00:00
Ronnie Sahlberg 17dd373fbd ethereal to wireshark
svn path=/trunk/; revision=18502
2006-06-17 12:27:56 +00:00
Gerald Combs eb71f7fb96 Rename the main executable to "wireshark", along with more conversions:
ethereal.com -> wireshark.org
  mailing lists and addresses
  ETHEREAL -> WIRESHARK
  Man pages
  Automake/Autoconf names


svn path=/trunk/; revision=18271
2006-05-31 19:12:15 +00:00
Ronnie Sahlberg 6075ec39fb ethereal->wireshark
svn path=/trunk/; revision=18207
2006-05-22 08:21:22 +00:00
Ronnie Sahlberg f0b33a4789 ethereal->wireshark updates
svn path=/trunk/; revision=18206
2006-05-22 08:14:01 +00:00
Ronnie Sahlberg 89f022b12b name change
svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +00:00
Jörg Mayer 6d79c4bbd3 Whitespace change
svn path=/trunk/; revision=16740
2005-12-09 15:47:50 +00:00
Jörg Mayer 4b7a025a9e Graeme Hewson: Continue to use the old Netscreen name - it makes it
easier to identify the Juniper firewall products.

svn path=/trunk/; revision=16513
2005-11-16 18:44:05 +00:00
Jörg Mayer ac836959c0 Rename Cisco (00:40:96) back to Aironet
svn path=/trunk/; revision=15565
2005-08-27 09:21:41 +00:00
Jörg Mayer be2bab3d18 IEEE is correct about 00:00:39
svn path=/trunk/; revision=13767
2005-03-16 16:42:53 +00:00
Jörg Mayer aaf320c76b - Modify make-manuf to add a message to manuf how to modify it
(aka: don't modify manuf, change manuf.tmpl and wka.tmpl instead)
- Remove OUI 08:00:0F from manuf.tmpl, the IEEE provides the correct
  value by now.
- Regenerate manuf

svn path=/trunk/; revision=13608
2005-03-06 01:52:34 +00:00
Jörg Mayer 209d626c61 At least in some cases some Marconi 2810 send packets with
the locally assigned flag set.
Update manuf, while I'm at it.

svn path=/trunk/; revision=12789
2004-12-20 13:32:08 +00:00
Guy Harris 8a8b883450 Set the svn:eol-style property on all text files to "native", so that
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-07-18 00:24:25 +00:00
Jörg Mayer 5174f6075e Tiny update
svn path=/trunk/; revision=7606
2003-04-29 23:58:00 +00:00
Gerald Combs bbe13fd78c Obscure email addresses and update entries.
svn path=/trunk/; revision=7558
2003-04-25 15:04:32 +00:00
Jörg Mayer b0fc3cb0eb make-manuf:
Don't print Cavebear skipped - it makes the output unusable.
manuf.tmpl:
	Remove entries that overwrite identical or similar results from IEEE
manuf:
	Rebuild to reflect the changes in manuf.tmpl and add some new IEEE
	entries.

svn path=/trunk/; revision=7447
2003-04-13 13:51:32 +00:00
Jörg Mayer a7cd846b47 make-manuf:
Sometimes printed a \n too much
manuf.tmpl:
	Remove most manual Mappings to Cisco because that's what gets used
	anyway (all except Racal and Newpoint)
manuf:
	Update to represent changes in make-manuf, manuf.tmpl and IEEE

svn path=/trunk/; revision=7422
2003-04-08 16:41:59 +00:00
Jörg Mayer 0af9ca446a Remove 00:40:96 from manuf.tmpl (Aironet, Ciron).
svn path=/trunk/; revision=7288
2003-03-05 17:29:33 +00:00
Laurent Deniel 1a66f9aec9 Update my email address in various places since my old one no longer works
svn path=/trunk/; revision=7003
2003-01-26 19:35:31 +00:00
Gerald Combs 2a76fc921c Remove an errant space from the name "TippingPoint Technologies, Inc."
svn path=/trunk/; revision=6782
2002-12-12 22:09:19 +00:00
Guy Harris 91ecc404e9 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
2002-09-09 19:38:11 +00:00
Jörg Mayer 49a2f32336 I still have to see a case when a MAC address starting with 0:0:0
actually means Xerox, but 0:0:0:0:0:0 can be found quite often.

svn path=/trunk/; revision=5934
2002-08-03 00:50:22 +00:00
Guy Harris dc9448b2b4 From Andrew Feren: put all of Cisco's OUIs into manuf.tmpl.
svn path=/trunk/; revision=4945
2002-03-14 21:24:40 +00:00
Gerald Combs 0d0e0d3cf6 manuf: Periodic updates from "make-manuf".
manuf.tmpl: Update 00:B0:D0 as per http://www.ethereal.com/lists/ethereal-cvs/200201/msg00048.html so that make-manuf won't clobber the fix.

svn path=/trunk/; revision=4633
2002-01-30 22:23:32 +00:00
Guy Harris fb8a4e877c From Joerg Mayer: a patch to add 00:40:96 as an OUI for Aironet wireless
devices (which are now Cisco wireless devices, as Cisco bought Aironet).

This overrides the out-of-date assignment of 00:40:96 to Telesystems SLW
in the cavebear.com file (Telesystems SLW were bought by Telxon, who
then apparently spun off their RF division, plus Telesystems, as
Aironet).

svn path=/trunk/; revision=4006
2001-10-07 09:27:57 +00:00
Gerald Combs 841a0c56d4 Credit Michael Patton and the IEEE in the document header. Add URLs to the
IEEE data (Michael's was already there).

svn path=/trunk/; revision=2701
2000-11-26 19:35:31 +00:00
Gerald Combs 78efde1cef Add make-manuf, a script that:
- Reads our current 'manuf' file header and contents

  - Fetches OUI information from the IEEE and CaveBear

  - Merges the OUI information, with our entries taking precedence, then
    CaveBear's, then the IEEE.

  - Dumps eveything into the 'manuf' file.

svn path=/trunk/; revision=2700
2000-11-23 18:22:00 +00:00