diff options
| author | Francesco Fondelli <francesco.fondelli@gmail.com> | 2016-04-12 10:45:57 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-04-13 02:14:44 +0000 |
| commit | f6b8b4dca5c05f0e6011ca8d8ef670beb911ac39 (patch) | |
| tree | a0ffe781ada6cb3a1b0871477d8955d3655216a8 /epan/dissectors/packet-pcep.c | |
| parent | 03a4754b789f2509f9dc81597377935c9d8ea084 (diff) | |
| download | wireshark-f6b8b4dca5c05f0e6011ca8d8ef670beb911ac39.tar.gz | |
PCEP: add TRIGGERED-INITIAL-SYNC flag parsing and align
capabilities to draft-ietf-pce-stateful-sync-optimizations-04
Change-Id: I602e6395939e6f870782f2d1a867d2663e4b15e2
Signed-off-by: Francesco Fondelli <francesco.fondelli@gmail.com>
Reviewed-on: https://code.wireshark.org/review/14892
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-pcep.c')
| -rw-r--r-- | epan/dissectors/packet-pcep.c | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/epan/dissectors/packet-pcep.c b/epan/dissectors/packet-pcep.c index cfd0afdef5..018dc6f6e2 100644 --- a/epan/dissectors/packet-pcep.c +++ b/epan/dissectors/packet-pcep.c @@ -276,6 +276,7 @@ void proto_reg_handoff_pcep(void); #define PCEP_TLV_STATEFUL_PCE_CAPABILITY_I 0x0004 #define PCEP_TLV_STATEFUL_PCE_CAPABILITY_T 0x0008 #define PCEP_TLV_STATEFUL_PCE_CAPABILITY_D 0x0010 +#define PCEP_TLV_STATEFUL_PCE_CAPABILITY_F 0x0020 /* Mask for the flags of ASSOCIATION Object */ #define PCEP_OBJ_ASSOCIATION_FLAGS_R 0x0001 @@ -525,10 +526,11 @@ static int hf_pcep_subobj_sr_nai_ipv4_node = -1; static int hf_pcep_subobj_sr_nai_ipv6_node = -1; static int hf_pcep_lsp_update_capability = -1; -static int hf_pcep_lsp_include_db_version_capability = -1; +static int hf_pcep_include_db_version = -1; static int hf_pcep_lsp_instantiation_capability = -1; -static int hf_pcep_lsp_triggered_sync_capability = -1; -static int hf_pcep_lsp_delta_lsp_sync_capability_capability = -1; +static int hf_pcep_triggered_resync = -1; +static int hf_pcep_delta_lsp_sync_capability = -1; +static int hf_pcep_triggered_initial_sync = -1; static int hf_pcep_obj_lsp_flags = -1; static int hf_pcep_obj_lsp_plsp_id = -1; static int hf_pcep_obj_lsp_flags_d = -1; @@ -1085,10 +1087,11 @@ dissect_pcep_tlvs(proto_tree *pcep_obj, tvbuff_t *tvb, int offset, gint length, case 16: /* STATEFUL-PCE-CAPABILITY TLV */ proto_tree_add_item(tlv, hf_pcep_lsp_update_capability, tvb, offset+4+j, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(tlv, hf_pcep_lsp_include_db_version_capability, tvb, offset+4+j, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv, hf_pcep_include_db_version, tvb, offset+4+j, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tlv, hf_pcep_lsp_instantiation_capability, tvb, offset+4+j, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(tlv, hf_pcep_lsp_triggered_sync_capability, tvb, offset+4+j, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(tlv, hf_pcep_lsp_delta_lsp_sync_capability_capability, tvb, offset+4+j, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv, hf_pcep_triggered_resync, tvb, offset+4+j, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv, hf_pcep_delta_lsp_sync_capability, tvb, offset+4+j, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv, hf_pcep_triggered_initial_sync, tvb, offset+4+j, 4, ENC_BIG_ENDIAN); break; case 17: /* SYMBOLIC-PATH-NAME TLV */ @@ -3805,30 +3808,35 @@ proto_register_pcep(void) NULL, HFILL } }, { &hf_pcep_lsp_update_capability, - { "LSP Update Capability (U)", "pcep.stateful-pce-capability.lsp-update", + { "LSP-UPDATE-CAPABILITY (U)", "pcep.stateful-pce-capability.lsp-update", FT_BOOLEAN, 32, TFS(&tfs_true_false), PCEP_TLV_STATEFUL_PCE_CAPABILITY_U, NULL, HFILL } }, - { &hf_pcep_lsp_include_db_version_capability, - { "LSP INCLUDE-DB-VERSION Capability (S)", "pcep.stateful-pce-capability.include-db-version", + { &hf_pcep_include_db_version, + { "INCLUDE-DB-VERSION (S)", "pcep.sync-capability.include-db-version", FT_BOOLEAN, 32, TFS(&tfs_true_false), PCEP_TLV_STATEFUL_PCE_CAPABILITY_S, NULL, HFILL } }, { &hf_pcep_lsp_instantiation_capability, - { "LSP Instantiation Capability (I)", "pcep.stateful-pce-capability.lsp-instantiation", + { "LSP-INSTANTIATION-CAPABILITY (I)", "pcep.stateful-pce-capability.lsp-instantiation", FT_BOOLEAN, 32, TFS(&tfs_true_false), PCEP_TLV_STATEFUL_PCE_CAPABILITY_I, NULL, HFILL } }, - { &hf_pcep_lsp_triggered_sync_capability, - { "LSP TRIGGERED-SYNC Capability (T)", "pcep.stateful-pce-capability.triggered-sync", + { &hf_pcep_triggered_resync, + { "TRIGGERED-RESYNC (T)", "pcep.stateful-pce-capability.triggered-resync", FT_BOOLEAN, 32, TFS(&tfs_true_false), PCEP_TLV_STATEFUL_PCE_CAPABILITY_T, NULL, HFILL } }, - { &hf_pcep_lsp_delta_lsp_sync_capability_capability, - { "LSP DELTA-LSP-SYNC-CAPABILITY Capability (D)", "pcep.stateful-pce-capability.delta-lsp-sync", + { &hf_pcep_delta_lsp_sync_capability, + { "DELTA-LSP-SYNC-CAPABILITY (D)", "pcep.stateful-pce-capability.delta-lsp-sync", FT_BOOLEAN, 32, TFS(&tfs_true_false), PCEP_TLV_STATEFUL_PCE_CAPABILITY_D, NULL, HFILL } }, + { &hf_pcep_triggered_initial_sync, + { "TRIGGERED-INITIAL-SYNC (F)", "pcep.stateful-pce-capability.triggered-initial-sync", + FT_BOOLEAN, 32, TFS(&tfs_true_false), PCEP_TLV_STATEFUL_PCE_CAPABILITY_F, + NULL, HFILL } + }, { &hf_pcep_sr_capability_reserved16, { "Reserved", "pcep.sr.capability.reserved", FT_UINT16, BASE_HEX, NULL, 0x0, |