diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2017-06-30 20:25:11 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-06-30 21:55:39 +0000 |
| commit | d30887d2897bb6a474efa2464bf234b00e4d45c1 (patch) | |
| tree | 54dee49d82cf9c0eb5ecd41e707eef26610a964f | |
| parent | ee6a687f52188545e3ddbf98436fe2aa1cea5a7e (diff) | |
| download | wireshark-d30887d2897bb6a474efa2464bf234b00e4d45c1.tar.gz | |
ospf: update LSA Option Types
Add missing entries from IANA registry, remove dummy OSPF_LSA_UNKNOWN
which does not exist and has become unused in the code.
Change-Id: I55e28e67da744e358e0629906ef5ebd3c4c82b5d
Reviewed-on: https://code.wireshark.org/review/22487
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | epan/dissectors/packet-ospf.c | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c index c8fcbab758..5c265a245d 100644 --- a/epan/dissectors/packet-ospf.c +++ b/epan/dissectors/packet-ospf.c @@ -212,13 +212,17 @@ static const value_string auth_vals[] = { #define OSPF_LSA_HEADER_LENGTH 20 #define OSPF_DNA_LSA 0x8000 -/* Known opaque LSAs */ +/* Opaque Link-State Advertisements (LSA) Option Types + * https://www.iana.org/assignments/ospf-opaque-types/ospf-opaque-types.xhtml */ #define OSPF_LSA_MPLS_TE 1 +#define OSPF_LSA_SYCAMORE 2 #define OSPF_LSA_GRACE 3 -/* The type field "4" indicates the Opaque RI LSA with Optional Router Capabilites - advertized in the first TLV. (RFC4970) */ #define OSPF_LSA_OPAQUE_RI 4 -#define OSPF_LSA_UNKNOWN 11 +#define OSPF_LSA_L1VPN 5 +#define OSPF_LSA_IAS_TE_V2 6 +#define OSPF_LSA_EXT_PREFIX 7 +#define OSPF_LSA_EXT_LINK 8 +#define OSPF_LSA_TTZ 9 #define OSPF_RESTART_REASON_UNKNOWN 0 #define OSPF_RESTART_REASON_SWRESTART 1 #define OSPF_RESTART_REASON_SWRELOAD 2 @@ -298,11 +302,16 @@ static const value_string ls_type_vals[] = { }; static const value_string ls_opaque_type_vals[] = { - {OSPF_LSA_MPLS_TE, "Traffic Engineering LSA" }, - {2, "Sycamore Optical Topology Descriptions" }, - {OSPF_LSA_GRACE, "grace-LSA" }, - {OSPF_LSA_OPAQUE_RI, "Optional Router Capabilities Opaque RI LSA" }, - {0, NULL } + {OSPF_LSA_MPLS_TE, "Traffic Engineering LSA" }, + {OSPF_LSA_SYCAMORE, "Sycamore Optical Topology Descriptions" }, + {OSPF_LSA_GRACE, "grace-LSA" }, + {OSPF_LSA_OPAQUE_RI, "Router Information (RI)" }, + {OSPF_LSA_L1VPN, "L1VPN LSA" }, + {OSPF_LSA_IAS_TE_V2, "Inter-AS-TE-v2 LSA" }, + {OSPF_LSA_EXT_PREFIX, "OSPFv2 Extended Prefix Opaque LSA" }, + {OSPF_LSA_EXT_LINK, "OSPFv2 Extended Link Opaque LSA" }, + {OSPF_LSA_TTZ, "TTZ LSA" }, + {0, NULL } }; static const value_string v3_ls_type_vals[] = { |