Commit 27542ab4 authored by garciay's avatar garciay
Browse files

Add missing flags support for dissect_itsut_denm_trigger()

parent 3a08476c

itsut/packet-itsut.c

+14 −3
Original line number Diff line number Diff line
@@ -286,6 +286,7 @@ static int hf_denm_trigger_flags = -1; 
static int hf_denm_trigger_flags_V_bit = -1;

static int hf_denm_trigger_flags_R_bit = -1;

static int hf_denm_trigger_flags_K_bit = -1;

static int hf_denm_trigger_flags_I_bit = -1;



/* ITSUT DENM Event */

static int hf_denm_event = -1;
@@ -1082,15 +1083,22 @@ static int dissect_itsut_denm_trigger(tvbuff_t *tvb, proto_tree *header_tree, in 
  ti_flags = proto_tree_add_item(tree, hf_denm_trigger_flags, tvb, offset, L_ITSUT_FLAGS, FALSE);

  tree_flags = proto_item_add_subtree(ti_flags, ett_itsut_flags);

  itsut_flags = tvb_get_guint8(tvb, offset);

  if ((itsut_flags & 0x80) == 0x80) {

  if ((itsut_flags & 0x80) == 0x80) { // V bits: Validity Duration

    proto_tree_add_item(tree_flags, hf_denm_trigger_flags_V_bit, tvb, offset, L_ITSUT_FLAGS, FALSE);

  }

  if ((itsut_flags & 0x40) == 0x40) {

  if ((itsut_flags & 0x40) == 0x40) { // R bits: RepetitionDuration Duration

    proto_tree_add_item(tree_flags, hf_denm_trigger_flags_R_bit, tvb, offset, L_ITSUT_FLAGS, FALSE);

  }

  if ((itsut_flags & 0x04) == 0x04) {

  // Three reserved bits

  if ((itsut_flags & 0x04) == 0x04) { // K bits: TransmissionInterval Duration

    proto_tree_add_item(tree_flags, hf_denm_trigger_flags_K_bit, tvb, offset, L_ITSUT_FLAGS, FALSE);

  }

  if ((itsut_flags & 0x02) == 0x02) { // I bits: RepetitionInterval Duration

    proto_tree_add_item(tree_flags, hf_denm_trigger_flags_I_bit, tvb, offset, L_ITSUT_FLAGS, FALSE);

  }

  if ((itsut_flags & 0x01) == 0x01) {

    proto_tree_add_item(tree_flags, hf_denm_event_flags_X_bit, tvb, offset, L_ITSUT_FLAGS, FALSE);

  }

  offset += L_ITSUT_FLAGS;

  /* DetectionTime */

  proto_tree_add_item(tree, hf_detection_time, tvb, offset, L_DETECTIONTIME, FALSE);
@@ -2258,6 +2266,9 @@ proto_register_itsut(void) 
    { &hf_denm_trigger_flags_K_bit,

      {"K bit", "itsut.denm_trigger.flags.kbit", FT_UINT8, BASE_HEX, NULL, 0x04, NULL, HFILL}

    },

    { &hf_denm_trigger_flags_I_bit,

      {"K bit", "itsut.denm_trigger.flags.ibit", FT_UINT8, BASE_HEX, NULL, 0x022, NULL, HFILL}

    },

    

    /* ITSUT DENM Event */

    { &hf_denm_event_flags,