diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-04-07 07:38:30 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-04-08 10:47:27 +0000 |
| commit | 717613e529044ad4ac84995578339bad83e14910 (patch) | |
| tree | 22a51f035a1fcf49fb062d7866acdad624bdda38 | |
| parent | 1d8cab5029554fdcd7af983d7b309241cb487d6e (diff) | |
Fix Hello options Flags
* Remove flag I and F (from old draft of draft-ietf-ospf-manet-or)
* Add flag AT (Authentication) from RFC6506 (RFC7166)
Closed-bug: 9941
Change-Id: If6e9c2aa3d2e437ac499253a3061579f344fe607
Reviewed-on: https://code.wireshark.org/review/1003
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-ospf.c | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c index c27f9b9450..05a54afdad 100644 --- a/epan/dissectors/packet-ospf.c +++ b/epan/dissectors/packet-ospf.c @@ -122,8 +122,7 @@ static const value_string auth_vals[] = { #define OSPF_V3_OPTIONS_DC 0x20 #define OSPF_V3_OPTIONS_AF 0x0100 #define OSPF_V3_OPTIONS_L 0x0200 -#define OSPF_V3_OPTIONS_I 0x0400 -#define OSPF_V3_OPTIONS_F 0x0800 +#define OSPF_V3_OPTIONS_AT 0x0400 /* Bitmask definitions for the informational capabilities bits. */ #define OSPF_RI_OPTIONS_GRC 0x80 @@ -487,13 +486,9 @@ static const true_false_string tfs_v3_options_l = { "L is SET", "L is NOT set" }; -static const true_false_string tfs_v3_options_i = { - "I is SET", - "I is NOT set" -}; -static const true_false_string tfs_v3_options_f = { - "F is SET", - "F is NOT set" +static const true_false_string tfs_v3_options_at = { + "AT is SET", + "AT is NOT set" }; static const true_false_string tfs_dbd_i = { "Init bit is SET", @@ -708,8 +703,7 @@ enum { OSPFF_V3_OPTIONS_DC, OSPFF_V3_OPTIONS_AF, OSPFF_V3_OPTIONS_L, - OSPFF_V3_OPTIONS_I, - OSPFF_V3_OPTIONS_F, + OSPFF_V3_OPTIONS_AT, OSPFF_DBD, OSPFF_DBD_R, OSPFF_DBD_I, @@ -887,8 +881,7 @@ static int bf_ri_options[] = { OSPFF_RI_OPTIONS_ETE }; static int bf_v3_options[] = { - OSPFF_V3_OPTIONS_F, - OSPFF_V3_OPTIONS_I, + OSPFF_V3_OPTIONS_AT, OSPFF_V3_OPTIONS_L, OSPFF_V3_OPTIONS_AF, OSPFF_V3_OPTIONS_DC, @@ -3561,12 +3554,9 @@ proto_register_ospf(void) {&hf_ospf_filter[OSPFF_V3_OPTIONS_L], { "L", "ospf.v3.options.l", FT_BOOLEAN, 24, TFS(&tfs_v3_options_l), OSPF_V3_OPTIONS_L, NULL, HFILL }}, - {&hf_ospf_filter[OSPFF_V3_OPTIONS_I], - { "I", "ospf.v3.options.i", FT_BOOLEAN, 24, - TFS(&tfs_v3_options_i), OSPF_V3_OPTIONS_I, NULL, HFILL }}, - {&hf_ospf_filter[OSPFF_V3_OPTIONS_F], - { "F", "ospf.v3.options.f", FT_BOOLEAN, 24, - TFS(&tfs_v3_options_f), OSPF_V3_OPTIONS_F, NULL, HFILL }}, + {&hf_ospf_filter[OSPFF_V3_OPTIONS_AT], + { "AT", "ospf.v3.options.at", FT_BOOLEAN, 24, + TFS(&tfs_v3_options_at), OSPF_V3_OPTIONS_AT, NULL, HFILL }}, {&hf_ospf_filter[OSPFF_DBD], { "DB Description", "ospf.dbd", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, |