EntityStatePdu wrong marshalled size calculation (number of articulation parameters)

[DPD85]

Inside the implementation of EntityStatePdu I discovered that the marshalled size of the PDU is calculated assuming to be present always only one articulation parameter. This is true for DIS6 and DIS7.

{
   int marshalSize = 0;

   marshalSize = EntityInformationFamilyPdu::getMarshalledSize();
   marshalSize = marshalSize + _entityID.getMarshalledSize();  // _entityID
   marshalSize = marshalSize + 1;  // _forceId
   marshalSize = marshalSize + 1;  // _numberOfArticulationParameters
   marshalSize = marshalSize + _entityType.getMarshalledSize();  // _entityType
   marshalSize = marshalSize + _alternativeEntityType.getMarshalledSize();  // _alternativeEntityType
   marshalSize = marshalSize + _entityLinearVelocity.getMarshalledSize();  // _entityLinearVelocity
   marshalSize = marshalSize + _entityLocation.getMarshalledSize();  // _entityLocation
   marshalSize = marshalSize + _entityOrientation.getMarshalledSize();  // _entityOrientation
   marshalSize = marshalSize + 4;  // _entityAppearance
   marshalSize = marshalSize + _deadReckoningParameters.getMarshalledSize();  // _deadReckoningParameters
   marshalSize = marshalSize + _marking.getMarshalledSize();  // _marking
   marshalSize = marshalSize + 4;  // _capabilities

   for(unsigned long long idx=0; idx < _articulationParameters.size(); idx++)
   {
        ArticulationParameter listElement = _articulationParameters[idx];
        marshalSize = marshalSize + listElement.getMarshalledSize();
    }

    return marshalSize;
}

As is possible to see the number of articulation parameters is stubbed to one when instead it should be _articulationParameters.size().

[leif81]

Thank-you for this report @DPD85 . Would you be interested in submitting a PR to fix this?

[DPD85]

@leif81 I did it.

[DPD85]

@leif81 It is necessary to revert this because

marshalSize = marshalSize + _articulationParameters.size(); // _numberOfArticulationParameters

this is the size of the variable containing the number of articulation parameters and not the number of articulation parameters. So if you marshal the PDU and compare the size of the buffer with the marshalled size then you will find a difference of 1 byte.

Sorry for the mistake! :-(

[leif81]

Ok thanks for heads up. Can you submit a pull request? I'll merge it when it comes in.

[leif81]

Or did you want the whole original pull request reverted?

[DPD85]

You can revert the entire original pull request

[leif81]

Thank-you @DPD85 , the revert is done now.