osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
43,288 Commits 23 Branches 0 Tags 1.3 GiB
Commit Graph

292 Commits

Author SHA1 Message Date
Gerald Combs d1cdba1c13 [Automatic manuf, services and enterprise-numbers update for 2011-11-20] 
svn path=/trunk/; revision=39958
 2011-11-20 15:03:25 +00:00
Gerald Combs a22d69fd72 [Automatic manuf, services and enterprise-numbers update for 2011-11-13] 
svn path=/trunk/; revision=39818
 2011-11-13 15:03:25 +00:00
Gerald Combs 54c1e0e2a6 [Automatic manuf, services and enterprise-numbers update for 2011-11-06] 
svn path=/trunk/; revision=39741
 2011-11-06 15:03:27 +00:00
Gerald Combs c34e5d4357 [Automatic manuf, services and enterprise-numbers update for 2011-10-30] 
svn path=/trunk/; revision=39669
 2011-10-30 14:03:25 +00:00
Gerald Combs 417b986cce [Automatic manuf, services and enterprise-numbers update for 2011-10-23] 
svn path=/trunk/; revision=39509
 2011-10-23 14:03:27 +00:00
Gerald Combs 37f853b220 [Automatic manuf, services and enterprise-numbers update for 2011-10-16] 
svn path=/trunk/; revision=39433
 2011-10-16 14:03:24 +00:00
Gerald Combs d2076e06cd [Automatic manuf, services and enterprise-numbers update for 2011-10-09] 
svn path=/trunk/; revision=39323
 2011-10-09 14:03:25 +00:00
Gerald Combs 4e76faeba6 [Automatic manuf, services and enterprise-numbers update for 2011-10-02] 
svn path=/trunk/; revision=39216
 2011-10-02 14:03:24 +00:00
Gerald Combs 6c560b876a [Automatic manuf, services and enterprise-numbers update for 2011-09-25] 
svn path=/trunk/; revision=39126
 2011-09-25 14:03:26 +00:00
Gerald Combs f2dd639bf1 [Automatic manuf, services and enterprise-numbers update for 2011-09-18] 
svn path=/trunk/; revision=39032
 2011-09-18 14:03:28 +00:00
Gerald Combs 21ad6d3c35 [Automatic manuf, services and enterprise-numbers update for 2011-09-11] 
svn path=/trunk/; revision=38961
 2011-09-11 14:03:28 +00:00
Gerald Combs 34035d0f86 [Automatic manuf, services and enterprise-numbers update for 2011-09-05] 
svn path=/trunk/; revision=38887
 2011-09-05 20:22:47 +00:00
Gerald Combs d07ef4630c [Automatic manuf, services and enterprise-numbers update for 2011-08-28] 
svn path=/trunk/; revision=38757
 2011-08-28 15:34:37 +00:00
Gerald Combs 3115572d34 [Automatic manuf, services and enterprise-numbers update for 2011-08-21] 
svn path=/trunk/; revision=38640
 2011-08-21 14:03:33 +00:00
Gerald Combs 48166c84f4 [Automatic manuf, services and enterprise-numbers update for 2011-08-14] 
svn path=/trunk/; revision=38532
 2011-08-14 14:03:42 +00:00
Gerald Combs ee925e0444 [Automatic manuf, services and enterprise-numbers update for 2011-08-07] 
svn path=/trunk/; revision=38384
 2011-08-07 14:03:28 +00:00
Gerald Combs e87f6a74fa [Automatic manuf, services and enterprise-numbers update for 2011-05-08] 
svn path=/trunk/; revision=37017
 2011-05-08 15:03:55 +00:00
Gerald Combs 2903639c52 [Automatic manuf, services and enterprise-numbers update for 2011-05-01] 
svn path=/trunk/; revision=36959
 2011-05-01 15:03:48 +00:00
Gerald Combs 99154bfea1 [Automatic manuf, services and enterprise-numbers update for 2011-04-24] 
svn path=/trunk/; revision=36834
 2011-04-24 15:03:44 +00:00
Gerald Combs b05a8ef84e [Automatic manuf, services and enterprise-numbers update for 2011-04-17] 
svn path=/trunk/; revision=36677
 2011-04-17 15:03:50 +00:00
Gerald Combs 0ed0777d86 [Automatic manuf, services and enterprise-numbers update for 2011-04-10] 
svn path=/trunk/; revision=36534
 2011-04-10 15:03:48 +00:00
Gerald Combs c756da785b [Automatic manuf, services and enterprise-numbers update for 2011-04-03] 
svn path=/trunk/; revision=36436
 2011-04-03 15:03:50 +00:00
Gerald Combs a4f03a1101 [Automatic manuf, services and enterprise-numbers update for 2011-03-27] 
svn path=/trunk/; revision=36368
 2011-03-27 15:03:43 +00:00
Gerald Combs cbef93064a [Automatic manuf, services and enterprise-numbers update for 2011-03-20] 
svn path=/trunk/; revision=36216
 2011-03-20 15:03:47 +00:00
Gerald Combs 4d6d8c58a5 [Automatic manuf, services and enterprise-numbers update for 2011-03-13] 
svn path=/trunk/; revision=36183
 2011-03-13 15:03:43 +00:00
Gerald Combs c7990056c2 [Automatic manuf, services and enterprise-numbers update for 2011-03-06] 
svn path=/trunk/; revision=36143
 2011-03-06 16:03:46 +00:00
Gerald Combs 1afc546580 [Automatic manuf, services and enterprise-numbers update for 2011-02-27] 
svn path=/trunk/; revision=36080
 2011-02-27 16:03:40 +00:00
Gerald Combs ba1138eb93 [Automatic manuf, services and enterprise-numbers update for 2011-02-20] 
svn path=/trunk/; revision=36012
 2011-02-20 16:03:38 +00:00
Gerald Combs 5a7ac9140e [Automatic manuf, services and enterprise-numbers update for 2011-02-13] 
svn path=/trunk/; revision=35940
 2011-02-13 16:03:49 +00:00
Gerald Combs 4c44a66e43 [Automatic manuf, services and enterprise-numbers update for 2011-02-06] 
svn path=/trunk/; revision=35837
 2011-02-06 16:03:43 +00:00
Gerald Combs 1817033522 [Automatic manuf, services and enterprise-numbers update for 2011-01-30] 
svn path=/trunk/; revision=35700
 2011-01-30 16:05:20 +00:00
Gerald Combs 5f1812edf2 [Automatic manuf, services and enterprise-numbers update for 2011-01-23] 
svn path=/trunk/; revision=35627
 2011-01-23 16:03:54 +00:00
Gerald Combs fd9f6c3ea3 [Automatic manuf, services and enterprise-numbers update for 2011-01-16] 
svn path=/trunk/; revision=35552
 2011-01-16 16:03:51 +00:00
Gerald Combs 5f98f3f307 [Automatic manuf, services and enterprise-numbers update for 2011-01-09] 
svn path=/trunk/; revision=35434
 2011-01-09 16:03:37 +00:00
Gerald Combs 0a6cf34d6e Update manuf, which the auto-update script has been missing for the past 
few weeks.

svn path=/trunk/; revision=35385
 2011-01-05 19:35:08 +00:00
Gerald Combs 0670254323 [Automatic manuf, services and enterprise-numbers update for 2010-12-12] 
svn path=/trunk/; revision=35178
 2010-12-12 16:03:46 +00:00
Gerald Combs b6da2c3ed9 [Automatic manuf, services and enterprise-numbers update for 2010-12-05] 
svn path=/trunk/; revision=35122
 2010-12-05 17:32:19 +00:00
Gerald Combs 2cc297266e [Automatic manuf, services and enterprise-numbers update for 2010-12-05] 
svn path=/trunk/; revision=35120
 2010-12-05 16:03:43 +00:00
Jeff Morriss 9e7e31e1af Update the manuf file (ahead of this weekend's auto-update) to reflect rev 35082's change to make-manuf. 
svn path=/trunk/; revision=35083
 2010-11-30 22:33:29 +00:00
Gerald Combs 46123d2525 [Automatic manuf, services and enterprise-numbers update for 2010-11-28] 
svn path=/trunk/; revision=35051
 2010-11-28 16:03:43 +00:00
Gerald Combs 38503af956 [Automatic manuf, services and enterprise-numbers update for 2010-11-21] 
svn path=/trunk/; revision=34992
 2010-11-21 16:03:40 +00:00
Gerald Combs 484da51294 [Automatic manuf, services and enterprise-numbers update for 2010-11-14] 
svn path=/trunk/; revision=34868
 2010-11-14 16:03:37 +00:00
Gerald Combs 7808aab7a0 [Automatic manuf, services and enterprise-numbers update for 2010-11-10] 
svn path=/trunk/; revision=34832
 2010-11-10 15:25:11 +00:00
Gerald Combs fb932b68bf [Automatic manuf, services and enterprise-numbers update for 2010-10-24] 
svn path=/trunk/; revision=34631
 2010-10-24 15:03:37 +00:00
Gerald Combs 2e00350103 [Automatic manuf, services and enterprise-numbers update for 2010-10-17] 
svn path=/trunk/; revision=34538
 2010-10-17 15:03:47 +00:00
Gerald Combs cca5e071af [Automatic manuf, services and enterprise-numbers update for 2010-10-10] 
svn path=/trunk/; revision=34448
 2010-10-10 15:03:38 +00:00
Gerald Combs bf32b6df61 [Automatic manuf and enterprise-numbers update for 2010-10-03] 
svn path=/trunk/; revision=34341
 2010-10-03 15:03:33 +00:00
Gerald Combs 138b249153 [Automatic manuf and enterprise-numbers update for 2010-09-26] 
svn path=/trunk/; revision=34253
 2010-09-26 15:03:40 +00:00
Gerald Combs b08297d7ef [Automatic manuf and enterprise-numbers update for 2010-09-19] 
svn path=/trunk/; revision=34155
 2010-09-19 15:03:36 +00:00
Gerald Combs bc8ce9e9e3 [Automatic manuf and enterprise-numbers update for 2010-09-12] 
svn path=/trunk/; revision=34102
 2010-09-12 15:03:34 +00:00
Gerald Combs 5e686039a0 [Automatic manuf and enterprise-numbers update for 2010-09-05] 
svn path=/trunk/; revision=34064
 2010-09-05 15:03:42 +00:00
Gerald Combs 0d6000b5ff [Automatic manuf and enterprise-numbers update for 2010-08-29] 
svn path=/trunk/; revision=33992
 2010-08-29 15:03:30 +00:00
Gerald Combs 66c34b8293 [Automatic manuf and enterprise-numbers update for 2010-08-22] 
svn path=/trunk/; revision=33881
 2010-08-22 15:03:30 +00:00
Gerald Combs 1f118813e7 [Automatic manuf and enterprise-numbers update for 2010-08-15] 
svn path=/trunk/; revision=33801
 2010-08-15 15:03:33 +00:00
Gerald Combs 82ce5f971f [Automatic manuf and enterprise-numbers update for 2010-08-08] 
svn path=/trunk/; revision=33730
 2010-08-08 15:03:36 +00:00
Gerald Combs 081ff40308 [Automatic manuf and enterprise-numbers update for 2010-08-01] 
svn path=/trunk/; revision=33685
 2010-08-01 15:03:31 +00:00
Gerald Combs fccb2829e7 [Automatic manuf and enterprise-numbers update for 2010-07-25] 
svn path=/trunk/; revision=33625
 2010-07-25 15:03:38 +00:00
Gerald Combs f1cf8c0ff0 [Automatic manuf and enterprise-numbers update for 2010-07-18] 
svn path=/trunk/; revision=33564
 2010-07-18 15:03:32 +00:00
Gerald Combs 55d68ba4bc [Automatic manuf and enterprise-numbers update for 2010-07-11] 
svn path=/trunk/; revision=33484
 2010-07-11 15:03:33 +00:00
Gerald Combs 2f1e6127aa [Automatic manuf and enterprise-numbers update for 2010-07-04] 
svn path=/trunk/; revision=33426
 2010-07-04 15:03:32 +00:00
Gerald Combs 2e05cc68c0 [Automatic manuf and enterprise-numbers update for 2010-06-27] 
svn path=/trunk/; revision=33336
 2010-06-27 15:03:39 +00:00
Gerald Combs f806bc8743 [Automatic manuf and enterprise-numbers update for 2010-06-20] 
svn path=/trunk/; revision=33260
 2010-06-20 15:03:42 +00:00
Gerald Combs 7f5b0ede0d [Automatic manuf and enterprise-numbers update for 2010-06-13] 
svn path=/trunk/; revision=33215
 2010-06-13 15:03:31 +00:00
Gerald Combs 906556a849 [Automatic manuf and enterprise-numbers update for 2010-06-06] 
svn path=/trunk/; revision=33109
 2010-06-06 15:03:33 +00:00
Gerald Combs 2669f7542f [Automatic manuf and enterprise-numbers update for 2010-05-30] 
svn path=/trunk/; revision=33023
 2010-05-30 15:03:31 +00:00
Gerald Combs d8951f226f [Automatic manuf and enterprise-numbers update for 2010-05-23] 
svn path=/trunk/; revision=32917
 2010-05-23 15:03:35 +00:00
Gerald Combs 667fae7498 [Automatic manuf and enterprise-numbers update for 2010-05-16] 
svn path=/trunk/; revision=32832
 2010-05-16 15:04:06 +00:00
Gerald Combs d6482e47fc [Automatic manuf and enterprise-numbers update for 2010-05-09] 
svn path=/trunk/; revision=32728
 2010-05-09 15:03:37 +00:00
Gerald Combs ee535ac43c [Automatic manuf and enterprise-numbers update for 2010-05-02] 
svn path=/trunk/; revision=32630
 2010-05-02 15:03:30 +00:00
Gerald Combs af847ff1b7 [Automatic manuf and enterprise-numbers update for 2010-04-25] 
svn path=/trunk/; revision=32554
 2010-04-25 15:03:30 +00:00
Gerald Combs 8cfc45330d [Automatic manuf and enterprise-numbers update for 2010-04-18] 
svn path=/trunk/; revision=32505
 2010-04-18 15:03:27 +00:00
Gerald Combs 376f3f5daa [Automatic manuf and enterprise-numbers update for 2010-04-11] 
svn path=/trunk/; revision=32444
 2010-04-11 15:03:28 +00:00
Gerald Combs 251fa1e36b [Automatic manuf and enterprise-numbers update for 2010-04-04] 
svn path=/trunk/; revision=32372
 2010-04-04 15:03:28 +00:00
Gerald Combs 79616817e8 [Automatic manuf and enterprise-numbers update for 2010-03-28] 
svn path=/trunk/; revision=32316
 2010-03-28 15:03:15 +00:00
Gerald Combs e96ac9977f [Automatic manuf and enterprise-numbers update for 2010-03-21] 
svn path=/trunk/; revision=32258
 2010-03-21 15:03:40 +00:00
Gerald Combs b853aa9b68 [Automatic manuf and enterprise-numbers update for 2010-03-14] 
svn path=/trunk/; revision=32185
 2010-03-14 15:03:29 +00:00
Gerald Combs 10d19c3d98 [Automatic manuf and enterprise-numbers update for 2010-03-07] 
svn path=/trunk/; revision=32135
 2010-03-07 16:03:29 +00:00
Gerald Combs e95c25e598 [Automatic manuf and enterprise-numbers update for 2010-02-28] 
svn path=/trunk/; revision=32046
 2010-02-28 16:03:30 +00:00
Gerald Combs f88c985811 [Automatic manuf and enterprise-numbers update for 2010-02-21] 
svn path=/trunk/; revision=31938
 2010-02-21 16:02:21 +00:00
Gerald Combs 24bbdaf0dd [Automatic manuf and enterprise-numbers update for 2010-02-14] 
svn path=/trunk/; revision=31877
 2010-02-14 16:02:55 +00:00
Gerald Combs 2a9a424cf5 [Automatic manuf and enterprise-numbers update for 2010-02-07] 
svn path=/trunk/; revision=31817
 2010-02-07 16:03:28 +00:00
Gerald Combs 66351af6e5 [Automatic manuf and enterprise-numbers update for 2010-01-31] 
svn path=/trunk/; revision=31741
 2010-01-31 16:03:52 +00:00
Gerald Combs bfa1b465ed [Automatic manuf and enterprise-numbers update for 2010-01-24] 
svn path=/trunk/; revision=31641
 2010-01-24 16:03:43 +00:00
Gerald Combs fd5ca381c5 [Automatic manuf and enterprise-numbers update for 2010-01-17] 
svn path=/trunk/; revision=31549
 2010-01-17 16:03:29 +00:00
Gerald Combs 2056ea5ef6 [Automatic manuf and enterprise-numbers update for 2010-01-10] 
svn path=/trunk/; revision=31477
 2010-01-10 16:03:28 +00:00
Stephen Fisher bf2aae7784 More updates to the ISL dissector: 
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
 2010-01-05 10:15:11 +00:00
Gerald Combs b8a6f552b5 [Automatic manuf and enterprise-numbers update for 2010-01-03] 
svn path=/trunk/; revision=31435
 2010-01-03 16:03:26 +00:00
Gerald Combs 7265357a1a [Automatic manuf and enterprise-numbers update for 2009-12-27] 
svn path=/trunk/; revision=31366
 2009-12-27 21:54:34 +00:00
Gerald Combs 6e7da96440 [Automatic manuf and enterprise-numbers update for 2009-12-07] 
svn path=/trunk/; revision=31189
 2009-12-07 21:32:27 +00:00
Gerald Combs 4c5e6a4993 [Automatic manuf and enterprise-numbers update for 2009-12-06] 
svn path=/trunk/; revision=31182
 2009-12-06 16:03:25 +00:00
Gerald Combs a31b85cf72 [Automatic manuf and enterprise-numbers update for 2009-11-30] 
svn path=/trunk/; revision=31135
 2009-11-30 21:53:16 +00:00
Gerald Combs ce65783f3d [Automatic manuf and enterprise-numbers update for 2009-11-29] 
svn path=/trunk/; revision=31116
 2009-11-29 16:03:22 +00:00
Gerald Combs a6cb92c7a9 [Automatic manuf and enterprise-numbers update for 2009-11-22] 
svn path=/trunk/; revision=31044
 2009-11-22 16:03:27 +00:00
Gerald Combs 3dbe3bddcc [Automatic manuf and enterprise-numbers update for 2009-11-15] 
svn path=/trunk/; revision=30964
 2009-11-15 16:03:25 +00:00
Gerald Combs 1087c4c500 [Automatic manuf and enterprise-numbers update for 2009-11-08] 
svn path=/trunk/; revision=30861
 2009-11-08 16:03:22 +00:00
Gerald Combs 787a116e52 [Automatic manuf and enterprise-numbers update for 2009-11-01] 
svn path=/trunk/; revision=30792
 2009-11-01 16:03:28 +00:00
Gerald Combs a2af2db1cf [Automatic manuf and enterprise-numbers update for 2009-10-25] 
svn path=/trunk/; revision=30692
 2009-10-25 15:03:39 +00:00
Gerald Combs 5d316381f1 [Automatic manuf and enterprise-numbers update for 2009-10-18] 
svn path=/trunk/; revision=30596
 2009-10-18 15:03:28 +00:00
Gerald Combs 3c0689cf4d [Automatic manuf and enterprise-numbers update for 2009-10-11] 
svn path=/trunk/; revision=30512
 2009-10-11 15:03:30 +00:00
Gerald Combs 22edd6908f [Automatic manuf and enterprise-numbers update for 2009-10-04] 
svn path=/trunk/; revision=30302
 2009-10-04 15:03:26 +00:00