Commit 99c0cd52 authored by garciay's avatar garciay
Browse files

Bug fixed in GN for hashedid3 list 

Update version for GN and ITSUT
parent 95390791

gn/moduleinfo.h

+1 −1
Original line number Diff line number Diff line
@@ -21,5 +21,5 @@ 
#define BUILD_NUMBER 0

#endif



#define VERSION "2.3." stringize(BUILD_NUMBER)

#define VERSION "2.4." stringize(BUILD_NUMBER)

gn/packet-gn.c

+32 −7
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ static int hf_gn_sh_field_endtime = -1; 
static int hf_gn_sh_field_startendtime = -1;

static int hf_gn_sh_field_startduration = -1;

static int hf_gn_sh_field_elev = -1;

static int hf_gn_sh_field_hashedid3_list = -1;

static int hf_gn_sh_field_hashedid3 = -1;

static int hf_gn_sh_field_hashedid8 = -1;

static int hf_gn_sh_field_itsaid = -1;
@@ -656,6 +657,33 @@ static int tree_gn_2dpos(tvbuff_t *tvb, proto_tree *ext_tree, int offset) 
  return offset_extra;

}



/* Interpret HashedID3 list */

static int tree_hashedId3_list(tvbuff_t *tvb, proto_tree *ext_tree, int offset)

{

  guint16 offset_extra = 0;

  guint8 lengthHashed3;

  proto_item *ti = NULL;

  proto_tree *loc_tree = NULL;

  

  // FIXME length

  lengthHashed3 = tvb_get_guint8(tvb, offset); // One octet

  offset += 1;

  offset_extra += 1;

  

  ti = proto_tree_add_item(ext_tree, hf_gn_sh_field_hashedid3_list, tvb, offset, 8, FALSE); 

  loc_tree = proto_item_add_subtree(ti, ett_2dlocation);

  

  while (lengthHashed3 > 0) {

    

    proto_tree_add_item(loc_tree, hf_gn_sh_field_hashedid3, tvb, offset, 3, FALSE);

    offset += 3;

    offset_extra += 3;

    lengthHashed3 -= 3;

  } // End of 'while' version

  

  return offset_extra;

}



/* Interpret ECC point */

static int tree_gn_ecc_point(tvbuff_t *tvb, proto_tree *ext_tree, int offset)

{
@@ -1889,13 +1917,7 @@ dissect_secured_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int 
	break;

      case 4: {

	// req unrecognised certificate

	// FIXME length

	guint8 lengthHashed3 = tvb_get_guint8(tvb, offset);

	offset += 1;

	hdrlen -= 1;

	proto_tree_add_item(shf_tree, hf_gn_sh_field_hashedid3, tvb, offset, lengthHashed3, FALSE);     

	offset += lengthHashed3;

	hdrlen -= lengthHashed3;

    offset += tree_hashedId3_list(tvb, shf_tree, offset);

	break;

      }

      case 5: {
@@ -2599,6 +2621,9 @@ proto_register_gn(void) 
    { &hf_gn_sh_field_elev,

      {"Elevation", "gn.sh.elev", FT_UINT16, BASE_HEX, NULL, 0x00, NULL, HFILL}

    },

    { &hf_gn_sh_field_hashedid3_list,

      {"HashedId3 list", "gn.sh.hashedid3s", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL}

    },

    { &hf_gn_sh_field_hashedid3,

      {"HashedId3", "gn.sh.hashedid3", FT_UINT24, BASE_HEX, NULL, 0x00, NULL, HFILL}

    },

itsut/moduleinfo.h

+1 −1
Original line number Diff line number Diff line
@@ -21,5 +21,5 @@ 
#define BUILD_NUMBER 0

#endif



#define VERSION "1.4." stringize(BUILD_NUMBER)

#define VERSION "1.5." stringize(BUILD_NUMBER)