diff --git a/ChangeLog b/ChangeLog index ed683915450b3a6a248e0dc08004e2e873a734ae..08321def23cbfb87d76a9fcf217b58aa5d75fcf2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,53 @@ +25 July 2003 +v2.0.3 on git + ++ 32 bit packet length +Example of .header format +-- name of header +Header CTA +-- number of field with dimension of packet (or first field if dim of packet is stored in a 32 bit field) +6 +-- 16 or 32 bit size dimension of the packet lenght +32 +[Field] +-- field 0 +Version number +3 +0b100 +-- field 1 +Type +1 +0b0 +-- field 2 +DHFH +1 +0b1 +-- field 3 +APID +11 +none +-- field 4 +SF +2 +0b11 +-- field 5 +Source Sequence Counter +14 +none +-- field 6 +Packet Length MSB (4_14) - 1 +16 +none +-- field 7 +Packet Length LSB (4_14) - 1 +16 +none + +If the field '-- 16 or 32 bit size dimension of the packet lenght' is set to 16 or it is absent, the packet lenght is 16 bit. + ++ Field::value management (set predefined value=0 and during output stream generation + + 15 July 2013 TAG CVS: PACKETLIB_1_4_0 + 32 and 64 bit compatibility diff --git a/packetlib.bbprojectd/bulgarelli.bbprojectsettings b/packetlib.bbprojectd/bulgarelli.bbprojectsettings index 1e54beabf958eb2ecbd1a0d809c8e9f56d32138a..4e5511a3629d322c511ac8496e6d0b41a98b1f79 100644 --- a/packetlib.bbprojectd/bulgarelli.bbprojectsettings +++ b/packetlib.bbprojectd/bulgarelli.bbprojectsettings @@ -15,6 +15,44 @@ 0 OpenDocuments:bulgarelli + + BookmarkData + + Ym9va7gDAAAAAAQQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAtAIAAAUAAAABAQAAVXNlcnMAAAAKAAAAAQEAAGJ1 + bGdhcmVsbGkAAAgAAAABAQAAUHJvamVjdHMJAAAAAQEAAFBhY2tl + dExpYgAAAAMAAAABAQAAc3JjABAAAAABAQAAUGFja2V0SGVhZGVy + LmNwcBgAAAABBgAABAAAABQAAAAoAAAAOAAAAEwAAABYAAAACAAA + AAQDAABNwAAAAAAAAAgAAAAEAwAAX2oEAAAAAAAIAAAABAMAAPDs + DgAAAAAACAAAAAQDAAAxh44BAAAAAAgAAAAEAwAAD4iOAQAAAAAI + AAAABAMAACyIjgEAAAAAGAAAAAEGAACQAAAAoAAAALAAAADAAAAA + 0AAAAOAAAAAYAAAAAQIAAAEAAAAAAAAADwAAAAAAAAAAAAAAAAAA + AAAAAAABBQAABAAAAAMDAAACAAAABAAAAAMDAAAEAAAABAAAAAMD + AAD1AQAADAAAAAEBAABNYWNpbnRvc2ggSEQIAAAABAMAAACAgT10 + AAAACAAAAAAEAABBtRHxowAAACQAAAABAQAAMjlCNTJDM0MtNDBC + Mi0zRUY0LUJBODUtRjU1NzlENzQ3QkMxGAAAAAECAACBAAAAAQAI + AO8/AAABAAgAAAAAAAAAAAABAAAAAQEAAC8AAADBAAAAAQIAADc2 + ODRkOTk4MWNmMTU2MWIxNWI5NmY5MzY4MWZhMTBjODIzY2JjZWY7 + MDAwMDAwMDA7MDAwMDAwMDAwMDAwMDAyMDtjb20uYXBwbGUuYXBw + LXNhbmRib3gucmVhZC13cml0ZTswMDAwMDAwMTswZTAwMDAwMjsw + MDAwMDAwMDAxOGU4ODJjOy91c2Vycy9idWxnYXJlbGxpL3Byb2pl + Y3RzL3BhY2tldGxpYi9zcmMvcGFja2V0aGVhZGVyLmNwcAAAAADM + AAAA/v///wEAAAAAAAAAEAAAAAQQAABwAAAAAAAAAAUQAADwAAAA + AAAAABAQAAAQAQAAAAAAAFUQAAA4AQAAAAAAAFYQAAAwAQAAAAAA + AAIgAADcAQAAAAAAABAgAABcAQAAAAAAABEgAACQAQAAAAAAABIg + AABwAQAAAAAAABMgAACAAQAAAAAAACAgAAC8AQAAAAAAADAgAAAw + AQAAAAAAAAHAAABEAQAAAAAAABHAAAAUAAAAAAAAABLAAABQAQAA + AAAAAIDwAADoAQAAAAAAAA== + + FileURL + file://localhost/Users/bulgarelli/Projects/PacketLib/src/PacketHeader.cpp + RelativePath + ./src/PacketHeader.cpp + TypeID + _CFileLocator + Version + 1 + BookmarkData @@ -100,6 +138,50 @@ RecentItems:bulgarelli + + Date + 2013-07-25T17:12:08Z + Location + + BookmarkData + + Ym9va5QDAAAAAAQQMAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAqAIAAAUAAAABAQAAVXNlcnMA + AAAKAAAAAQEAAGJ1bGdhcmVsbGkAAAgAAAABAQAAUHJv + amVjdHMJAAAAAQEAAFBhY2tldExpYgAAAAMAAAABAQAA + c3JjABAAAAABAQAAUGFja2V0SGVhZGVyLmNwcBgAAAAB + BgAABAAAABQAAAAoAAAAOAAAAEwAAABYAAAACAAAAAQD + AABNwAAAAAAAAAgAAAAEAwAAX2oEAAAAAAAIAAAABAMA + APDsDgAAAAAACAAAAAQDAAAxh44BAAAAAAgAAAAEAwAA + D4iOAQAAAAAIAAAABAMAACyIjgEAAAAAGAAAAAEGAACQ + AAAAoAAAALAAAADAAAAA0AAAAOAAAAAYAAAAAQIAAAEA + AAAAAAAADwAAAAAAAAAAAAAAAAAAAAQAAAADAwAABAAA + AAQAAAADAwAA9QEAAAwAAAABAQAATWFjaW50b3NoIEhE + CAAAAAQDAAAAgIE9dAAAAAgAAAAABAAAQbUR8aMAAAAk + AAAAAQEAADI5QjUyQzNDLTQwQjItM0VGNC1CQTg1LUY1 + NTc5RDc0N0JDMRgAAAABAgAAgQAAAAEACADvPwAAAQAI + AAAAAAAAAAAAAQAAAAEBAAAvAAAAAAAAAAEFAADBAAAA + AQIAADc2ODRkOTk4MWNmMTU2MWIxNWI5NmY5MzY4MWZh + MTBjODIzY2JjZWY7MDAwMDAwMDA7MDAwMDAwMDAwMDAw + MDAyMDtjb20uYXBwbGUuYXBwLXNhbmRib3gucmVhZC13 + cml0ZTswMDAwMDAwMTswZTAwMDAwMjswMDAwMDAwMDAx + OGU4ODJjOy91c2Vycy9idWxnYXJlbGxpL3Byb2plY3Rz + L3BhY2tldGxpYi9zcmMvcGFja2V0aGVhZGVyLmNwcAAA + AAC0AAAA/v///wEAAAAAAAAADgAAAAQQAABwAAAAAAAA + AAUQAADwAAAAAAAAABAQAAAQAQAAAAAAAAIgAADIAQAA + AAAAABAgAABIAQAAAAAAABEgAAB8AQAAAAAAABIgAABc + AQAAAAAAABMgAABsAQAAAAAAACAgAACoAQAAAAAAADAg + AADUAQAAAAAAAAHAAAAwAQAAAAAAABHAAAAUAAAAAAAA + ABLAAAA8AQAAAAAAAIDwAADcAQAAAAAAAA== + + FileURL + file://localhost/Users/bulgarelli/Projects/PacketLib/src/PacketHeader.cpp + TypeID + _CFileLocator + Version + 1 + + Date 2013-07-25T17:04:25Z @@ -941,50 +1023,6 @@ 1 - - Date - 2013-07-25T17:01:55Z - Location - - BookmarkData - - Ym9va5QDAAAAAAQQMAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAqAIAAAUAAAABAQAAVXNlcnMA - AAAKAAAAAQEAAGJ1bGdhcmVsbGkAAAgAAAABAQAAUHJv - amVjdHMJAAAAAQEAAFBhY2tldExpYgAAAAMAAAABAQAA - c3JjABAAAAABAQAAUGFja2V0SGVhZGVyLmNwcBgAAAAB - BgAABAAAABQAAAAoAAAAOAAAAEwAAABYAAAACAAAAAQD - AABNwAAAAAAAAAgAAAAEAwAAX2oEAAAAAAAIAAAABAMA - APDsDgAAAAAACAAAAAQDAAAxh44BAAAAAAgAAAAEAwAA - D4iOAQAAAAAIAAAABAMAACyIjgEAAAAAGAAAAAEGAACQ - AAAAoAAAALAAAADAAAAA0AAAAOAAAAAYAAAAAQIAAAEA - AAAAAAAADwAAAAAAAAAAAAAAAAAAAAQAAAADAwAABAAA - AAQAAAADAwAA9QEAAAwAAAABAQAATWFjaW50b3NoIEhE - CAAAAAQDAAAAgIE9dAAAAAgAAAAABAAAQbUR8aMAAAAk - AAAAAQEAADI5QjUyQzNDLTQwQjItM0VGNC1CQTg1LUY1 - NTc5RDc0N0JDMRgAAAABAgAAgQAAAAEACADvPwAAAQAI - AAAAAAAAAAAAAQAAAAEBAAAvAAAAAAAAAAEFAADBAAAA - AQIAADc2ODRkOTk4MWNmMTU2MWIxNWI5NmY5MzY4MWZh - MTBjODIzY2JjZWY7MDAwMDAwMDA7MDAwMDAwMDAwMDAw - MDAyMDtjb20uYXBwbGUuYXBwLXNhbmRib3gucmVhZC13 - cml0ZTswMDAwMDAwMTswZTAwMDAwMjswMDAwMDAwMDAx - OGU4ODJjOy91c2Vycy9idWxnYXJlbGxpL3Byb2plY3Rz - L3BhY2tldGxpYi9zcmMvcGFja2V0aGVhZGVyLmNwcAAA - AAC0AAAA/v///wEAAAAAAAAADgAAAAQQAABwAAAAAAAA - AAUQAADwAAAAAAAAABAQAAAQAQAAAAAAAAIgAADIAQAA - AAAAABAgAABIAQAAAAAAABEgAAB8AQAAAAAAABIgAABc - AQAAAAAAABMgAABsAQAAAAAAACAgAACoAQAAAAAAADAg - AADUAQAAAAAAAAHAAAAwAQAAAAAAABHAAAAUAAAAAAAA - ABLAAAA8AQAAAAAAAIDwAADcAQAAAAAAAA== - - FileURL - file://localhost/Users/bulgarelli/Projects/PacketLib/src/PacketHeader.cpp - TypeID - _CFileLocator - Version - 1 - - Date 2013-07-25T17:01:55Z diff --git a/src/PacketHeader.cpp b/src/PacketHeader.cpp index fc1875523857d394230fffa49646567f75dddc50..d6e3e9cc84a28b8010e2fe50701d2f10f5014b61 100644 --- a/src/PacketHeader.cpp +++ b/src/PacketHeader.cpp @@ -40,7 +40,10 @@ bool PacketHeader::loadHeader(char* fileName) throw(PacketException*) dimensionOfPacketLenght = 16; else dimensionOfPacketLenght = atoi(line); - //cout << dimensionOfPacketLenght << endl; + + if(!(dimensionOfPacketLenght == 16 || dimensionOfPacketLenght == 32)) + throw new PacketExceptionIO("Dimension of packet length, 16 or 32 bit");; + header.setpos(0); //find the start position of the fields @@ -53,12 +56,12 @@ bool PacketHeader::loadHeader(char* fileName) throw(PacketException*) return true; } else - throw new PacketExceptionIO("Can't create the header.");; + throw new PacketExceptionIO("Can't create the header."); } else { delete[] argv; - throw new PacketExceptionIO("Can't open the header file configuration.");; + throw new PacketExceptionIO("Can't open the header file configuration."); } }