diff options
| author | Marian Ďurkovič <md@bts.sk> | 2014-08-19 14:22:49 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-08-22 10:55:40 +0000 |
| commit | d5ba8b4f448087f4601682b946cdbdc899ead4f4 (patch) | |
| tree | 3cfd253b3f4bb0eab01bda4a25fac065387de57e | |
| parent | b6cb2ad049df6127523593d97641075e46d6327f (diff) | |
TRILL updates
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>
| -rw-r--r-- | epan/dissectors/packet-trill.c | 8 | ||||
| -rw-r--r-- | wka.tmpl | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/epan/dissectors/packet-trill.c b/epan/dissectors/packet-trill.c index 25e90331c2..985ef178c4 100644 --- a/epan/dissectors/packet-trill.c +++ b/epan/dissectors/packet-trill.c @@ -22,7 +22,7 @@ */ /* - * See: http://tools.ietf.org/html/draft-ietf-trill-rbridge-protocol-16 + * See: RFC6325 */ #include "config.h" @@ -71,7 +71,7 @@ static const true_false_string multi_dst_strings = { } ; static const range_string version_strings[] = { - { 0, 0, "draft-ietf-trill-rbridge-protocol-16 Version" }, + { 0, 0, "RFC6325 Version" }, { 1, 3, "Unallocated Version" }, { 0, 0, NULL } } ; @@ -85,7 +85,9 @@ static const range_string reserved_strings[] = { static const range_string nickname_strings[] = { { 0x0000, 0x0000, "Nickname Not Specified" }, { 0x0001, 0xFFBF, "Valid Nickname" }, - { 0xFFC0, 0xFFFE, "Reserved for Future Specification" }, + { 0xFFC0, 0xFFC0, "Any RBridge" }, + { 0xFFC1, 0xFFC1, "OOMF" }, + { 0xFFC2, 0xFFFE, "Reserved for Future Specification" }, { 0xFFFF, 0xFFFF, "Permanently Reserved" }, { 0, 0, NULL } } ; @@ -102,7 +102,9 @@ 01-80-C2-00-00-38/45 OAM-Multicast-DA-Class-2 01-80-C2-00-00-40 All-RBridges 01-80-C2-00-00-41 All-IS-IS-RBridges -01-80-C2-00-00-42 All-ESADI-RBridges +01-80-C2-00-00-42 All-Egress-RBridges +01-80-C2-00-00-45 TRILL-End-Stations +01-80-C2-00-00-46 All-Edge-RBridges 01-80-C2-00-01-00 FDDI-RMT-Directed-Beacon 01-80-C2-00-01-10 FDDI-status-report-frame 01-DD-00-FF-FF-FF Ungermann-Bass-boot-me-requests |