Commit 37ec0819 authored by Andrea Bulgarelli's avatar Andrea Bulgarelli
Browse files

Packet::setPacketValue): bug correction

parent a3bbbd40

ChangeLog

+7 −2
Original line number Diff line number Diff line 
2013-09-18  bulgarelli  Andrea Bulgarelli <bulgarelli@iasfbo.inaf.it>

2013-09-19  Andrea Bulgarelli <bulgarelli@iasfbo.inaf.it>



* src/Packet.cpp (Packet::setPacketValue): bug correction

* include/PacketHeader.h (PacketHeader.getDimensionOfPacketLength): renamed the method for typo



2013-09-18  Andrea Bulgarelli <bulgarelli@iasfbo.inaf.it>



* src/Packet.cpp (Packet::createPacketType): bool Packet::createPacketType(char* fileName, bool isprefix, word dimprefix) bug fix when the configuration files are read more than one time

include/PacketHeader.h

+3 −3
Original line number Diff line number Diff line
@@ -50,9 +50,9 @@ public: 


    Field * getFieldWithPacketDimension();



    inline word getDimensionOfPacketLenght()

    inline word getDimensionOfPacketLength()

    {

        return dimensionOfPacketLenght;

        return dimensionOfPacketLength;

    };



private:
@@ -64,7 +64,7 @@ private: 
    word numberOfFieldWithPacketDimension;



    /// 16 or 32 bit

    word dimensionOfPacketLenght;

    word dimensionOfPacketLength;



};

src/Packet.cpp

+2 −2
Original line number Diff line number Diff line
@@ -850,7 +850,7 @@ bool Packet::verifyPacketValue(byte* stream) { 
	dim += dimHeader;

	tempHeader->setStream(stream+dimPre, dimHeader, bigendian);

	header->setByteStream(tempHeader);

	dim += header->getDimensionOfPacketLenght() + 1;

	dim += header->getDimensionOfPacketLength() + 1;

	ByteStream* packet = new ByteStream(stream+dimPre, dim, bigendian);



	return verifyPacketValue(prefix, packet);
@@ -867,7 +867,7 @@ bool Packet::setPacketValue(byte* stream) { 
	dim += dimHeader;

	tempHeader->setStream(stream+dimPre, dimHeader, bigendian);

	header->setByteStream(tempHeader);

	dim += header->getDimensionOfPacketLenght() + 1;

	dim += header->getPacketLength() + 1;

	ByteStream* packet = new ByteStream(stream+dimPre, dim, bigendian);



	return setPacketValue(prefix, packet);

src/PacketHeader.cpp

+6 −6
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ using namespace PacketLib; 
PacketHeader::PacketHeader() : PartOfPacket("Packet Header")

{

    name = 0;

    dimensionOfPacketLenght = 16;

    dimensionOfPacketLength = 16;

}
@@ -54,11 +54,11 @@ bool PacketHeader::loadHeader(char* fileName) throw(PacketException*) 


        line = header.getLine();

        if(strcmp(line, "[Field]") == 0)

            dimensionOfPacketLenght = 16;

            dimensionOfPacketLength = 16;

        else

            dimensionOfPacketLenght = atoi(line);

            dimensionOfPacketLength = atoi(line);



        if(!(dimensionOfPacketLenght == 16 || dimensionOfPacketLenght == 32))

        if(!(dimensionOfPacketLength == 16 || dimensionOfPacketLength == 32))

            throw new PacketExceptionIO("Dimension of packet length, 16 or 32 bit");;



        header.setpos(0);
@@ -87,7 +87,7 @@ bool PacketHeader::loadHeader(char* fileName) throw(PacketException*) 


dword PacketHeader::getPacketLength()

{

    if(dimensionOfPacketLenght == 16)

    if(dimensionOfPacketLength == 16)

    {

        Field* f = getFields(numberOfFieldWithPacketDimension);

        /// ESA standard: in the packet length the value 1 must be added
@@ -101,7 +101,7 @@ dword PacketHeader::getPacketLength() 


void PacketHeader::setPacketLength(dword dim)

{

    if(dimensionOfPacketLenght == 16)

    if(dimensionOfPacketLength == 16)

    {

        Field* f = getFields(numberOfFieldWithPacketDimension);

        /// ESA standard: in the packet length the value 1 must be added

Makefile

+1 −1

File changed.

Contains only whitespace changes.