Greetings and challenges.

[tripe] / ethereal / packet-tripe.c

diff --git a/ethereal/packet-tripe.c b/ethereal/packet-tripe.c
index 44c74aa6e539b8fe62966210dbdb6317b9f4e6fc..4fa84028ed05d39f1ffb18bd87fa18d33de6d2bf 100644 (file)
--- a/ethereal/packet-tripe.c
+++ b/ethereal/packet-tripe.c
@@ -199,6 +199,10 @@ static void dissect_tripe(tvbuff_t *b, packet_info *p, proto_tree *t)
            col_set_str(p->cinfo, COL_INFO,
                        "Miscellaneous, encrypted ping reply");
            break;
+         case MISC_GREET:
+           col_set_str(p->cinfo, COL_INFO,
+                       "Miscellaneous, greeting");
+           break;
          default:
            col_add_fstr(p->cinfo, COL_INFO,
                         "Miscellaneous, unknown type code %u",
@@ -269,6 +273,7 @@ static void dissect_tripe(tvbuff_t *b, packet_info *p, proto_tree *t)
          case MISC_NOP:
          case MISC_PING:
          case MISC_PONG:
+         case MISC_GREET:
            proto_tree_add_item(tt, hf_tripe_misc_payload,
                                b, off, -1, FALSE);
            goto done;
@@ -366,7 +371,7 @@ void proto_register_tripe(void)
       "This is the TrIPE miscellaneous message type subcode."
     } },
     { &hf_tripe_misc_payload, {
-      "Miscellaneous message type", "tripe.misc.payload",
+      "Miscellaneous message payload", "tripe.misc.payload",
       FT_BYTES, BASE_NONE, 0, 0,
       "This is the miscellaneous message payload."
     } },
@@ -395,7 +400,7 @@ void proto_register_tripe(void)
       FT_UINT16, BASE_DEC, 0, 0,
       "This is the length of the sender's challenge x-coordinate."
     } },
-    { &hf_tripe_kx_mychal.hfy_val, {
+    { &hf_tripe_kx_mychal.hfx_val, {
       "Challenge x value", "tripe.kx.mychal.x.val",
       FT_BYTES, BASE_NONE, 0, 0,
       "This is the value of the sender's challenge x-coordinate."
@@ -405,7 +410,7 @@ void proto_register_tripe(void)
       FT_UINT16, BASE_DEC, 0, 0,
       "This is the length of the sender's challenge x-coordinate."
     } },
-    { &hf_tripe_kx_mychal.hfx_val, {
+    { &hf_tripe_kx_mychal.hfy_val, {
       "Challenge y value", "tripe.kx.mychal.y.val",
       FT_BYTES, BASE_NONE, 0, 0,
       "This is the value of the sender's challenge x-coordinate."