diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2006-08-08 19:54:37 +0000 |
|---|---|---|
| committer | Jaap Keuter <jaap.keuter@xs4all.nl> | 2006-08-08 19:54:37 +0000 |
| commit | c9a6054b75de076099541c4c7edf8594243b742d (patch) | |
| tree | dd634b50d899c6bcc33a89358d0ea8013bff004d /epan/dissectors/packet-bfd.c | |
| parent | 0238e4a076573a4d974ade91d29e1eabfdf0ecff (diff) | |
From: Bálint Réczey:
The attached patch fixes decoding of message flags in BFD control packets.
svn path=/trunk/; revision=18853
Diffstat (limited to 'epan/dissectors/packet-bfd.c')
| -rw-r--r-- | epan/dissectors/packet-bfd.c | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/epan/dissectors/packet-bfd.c b/epan/dissectors/packet-bfd.c index f822a7cd25..7484b16e4e 100644 --- a/epan/dissectors/packet-bfd.c +++ b/epan/dissectors/packet-bfd.c @@ -85,6 +85,8 @@ static gint hf_bfd_flags_c = -1; static gint hf_bfd_flags_a = -1; static gint hf_bfd_flags_d = -1; static gint hf_bfd_flags_d_v0 = -1; +static gint hf_bfd_flags_p_v0 = -1; +static gint hf_bfd_flags_f_v0 = -1; static gint hf_bfd_detect_time_multiplier = -1; static gint hf_bfd_my_discriminator = -1; static gint hf_bfd_your_discriminator = -1; @@ -159,6 +161,8 @@ static void dissect_bfd_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t gint bfd_flags_a = -1; gint bfd_flags_d = -1; gint bfd_flags_d_v0 = -1; + gint bfd_flags_p_v0 = -1; + gint bfd_flags_f_v0 = -1; gint bfd_detect_time_multiplier = -1; gint bfd_length = -1; gint bfd_my_discriminator = -1; @@ -183,6 +187,8 @@ static void dissect_bfd_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t bfd_flags = tvb_get_guint8(tvb, 1 ); bfd_flags_h = (tvb_get_guint8(tvb, 1) & 0x80); bfd_flags_d_v0 = (tvb_get_guint8(tvb, 1) & 0x40); + bfd_flags_p_v0 = (tvb_get_guint8(tvb, 1) & 0x20); + bfd_flags_f_v0 = (tvb_get_guint8(tvb, 1) & 0x10); break; case 1: default: @@ -248,19 +254,21 @@ static void dissect_bfd_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t ti = proto_tree_add_text ( bfd_tree, tvb, 1, 1, "Message Flags: 0x%02x", bfd_flags); bfd_flags_tree = proto_item_add_subtree(bfd_tree, ett_bfd_flags); - ti = proto_tree_add_boolean(bfd_flags_tree, hf_bfd_flags_h, tvb, 8, 1, bfd_flags_h); - ti = proto_tree_add_boolean(bfd_flags_tree, hf_bfd_flags_d_v0, tvb, 8, 1, bfd_flags_d_v0); + ti = proto_tree_add_boolean(bfd_flags_tree, hf_bfd_flags_h, tvb, 1, 1, bfd_flags_h); + ti = proto_tree_add_boolean(bfd_flags_tree, hf_bfd_flags_d_v0, tvb, 1, 1, bfd_flags_d_v0); + ti = proto_tree_add_boolean(bfd_flags_tree, hf_bfd_flags_p_v0, tvb, 1, 1, bfd_flags_p_v0); + ti = proto_tree_add_boolean(bfd_flags_tree, hf_bfd_flags_f_v0, tvb, 1, 1, bfd_flags_f_v0); break; case 1: default: ti = proto_tree_add_text ( bfd_tree, tvb, 1, 1, "Message Flags: 0x%02x", bfd_flags); bfd_flags_tree = proto_item_add_subtree(bfd_tree, ett_bfd_flags); - ti = proto_tree_add_boolean(bfd_flags_tree, hf_bfd_flags_p, tvb, 6, 1, bfd_flags_p); - ti = proto_tree_add_boolean(bfd_flags_tree, hf_bfd_flags_f, tvb, 6, 1, bfd_flags_f); - ti = proto_tree_add_boolean(bfd_flags_tree, hf_bfd_flags_c, tvb, 6, 1, bfd_flags_c); - ti = proto_tree_add_boolean(bfd_flags_tree, hf_bfd_flags_a, tvb, 6, 1, bfd_flags_a); - ti = proto_tree_add_boolean(bfd_flags_tree, hf_bfd_flags_d, tvb, 6, 1, bfd_flags_d); + ti = proto_tree_add_boolean(bfd_flags_tree, hf_bfd_flags_p, tvb, 1, 1, bfd_flags_p); + ti = proto_tree_add_boolean(bfd_flags_tree, hf_bfd_flags_f, tvb, 1, 1, bfd_flags_f); + ti = proto_tree_add_boolean(bfd_flags_tree, hf_bfd_flags_c, tvb, 1, 1, bfd_flags_c); + ti = proto_tree_add_boolean(bfd_flags_tree, hf_bfd_flags_a, tvb, 1, 1, bfd_flags_a); + ti = proto_tree_add_boolean(bfd_flags_tree, hf_bfd_flags_d, tvb, 1, 1, bfd_flags_d); break; } @@ -333,6 +341,16 @@ void proto_register_bfd(void) FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x40, "", HFILL } }, + { &hf_bfd_flags_p_v0, + { "Poll", "bfd.flags.p", + FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x20, + "", HFILL } + }, + { &hf_bfd_flags_f_v0, + { "Final", "bfd.flags.f", + FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x10, + "", HFILL } + }, { &hf_bfd_flags_p, { "Poll", "bfd.flags.p", FT_BOOLEAN, 6, TFS(&flags_set_truth), 0x20, |