diff --git a/src/lte/model/lte-rrc-header.cc b/src/lte/model/lte-rrc-header.cc index bcc545a22..955e2fb35 100644 --- a/src/lte/model/lte-rrc-header.cc +++ b/src/lte/model/lte-rrc-header.cc @@ -1661,19 +1661,21 @@ RrcAsn1Header::DeserializeThresholdEutra (LteRrcSap::ThresholdEutra * thresholdE { int thresholdEutraChoice, range; bIterator = DeserializeChoice (2, false, &thresholdEutraChoice, bIterator); - - switch(thresholdEutraChoice) - { - case 0: thresholdEutra->choice = LteRrcSap::ThresholdEutra::thresholdRsrp; + + switch (thresholdEutraChoice) + { + case 0: + thresholdEutra->choice = LteRrcSap::ThresholdEutra::thresholdRsrp; bIterator = DeserializeInteger (&range, 0, 97, bIterator); thresholdEutra->range = range; - break; + break; case 1: - default: thresholdEutra->choice = LteRrcSap::ThresholdEutra::thresholdRsrq; + default: + thresholdEutra->choice = LteRrcSap::ThresholdEutra::thresholdRsrq; bIterator = DeserializeInteger (&range, 0, 34, bIterator); thresholdEutra->range = range; - } - + } + return bIterator; } @@ -1682,41 +1684,102 @@ RrcAsn1Header::DeserializeQoffsetRange (int8_t * qOffsetRange, Buffer::Iterator { int n; bIterator = DeserializeEnum (31, &n, bIterator); - switch(n) - { - case 0: *qOffsetRange = -24; break; - case 1: *qOffsetRange = -22; break; - case 2: *qOffsetRange = -20; break; - case 3: *qOffsetRange = -18; break; - case 4: *qOffsetRange = -16; break; - case 5: *qOffsetRange = -14; break; - case 6: *qOffsetRange = -12; break; - case 7: *qOffsetRange = -10; break; - case 8: *qOffsetRange = -8; break; - case 9: *qOffsetRange = -6; break; - case 10: *qOffsetRange = -5; break; - case 11: *qOffsetRange = -4; break; - case 12: *qOffsetRange = -3; break; - case 13: *qOffsetRange = -2; break; - case 14: *qOffsetRange = -1; break; - case 15: *qOffsetRange = 0; break; - case 16: *qOffsetRange = 1; break; - case 17: *qOffsetRange = 2; break; - case 18: *qOffsetRange = 3; break; - case 19: *qOffsetRange = 4; break; - case 20: *qOffsetRange = 5; break; - case 21: *qOffsetRange = 6; break; - case 22: *qOffsetRange = 8; break; - case 23: *qOffsetRange = 10; break; - case 24: *qOffsetRange = 12; break; - case 25: *qOffsetRange = 14; break; - case 26: *qOffsetRange = 16; break; - case 27: *qOffsetRange = 18; break; - case 28: *qOffsetRange = 20; break; - case 29: *qOffsetRange = 22; break; + switch (n) + { + case 0: + *qOffsetRange = -24; + break; + case 1: + *qOffsetRange = -22; + break; + case 2: + *qOffsetRange = -20; + break; + case 3: + *qOffsetRange = -18; + break; + case 4: + *qOffsetRange = -16; + break; + case 5: + *qOffsetRange = -14; + break; + case 6: + *qOffsetRange = -12; + break; + case 7: + *qOffsetRange = -10; + break; + case 8: + *qOffsetRange = -8; + break; + case 9: + *qOffsetRange = -6; + break; + case 10: + *qOffsetRange = -5; + break; + case 11: + *qOffsetRange = -4; + break; + case 12: + *qOffsetRange = -3; + break; + case 13: + *qOffsetRange = -2; + break; + case 14: + *qOffsetRange = -1; + break; + case 15: + *qOffsetRange = 0; + break; + case 16: + *qOffsetRange = 1; + break; + case 17: + *qOffsetRange = 2; + break; + case 18: + *qOffsetRange = 3; + break; + case 19: + *qOffsetRange = 4; + break; + case 20: + *qOffsetRange = 5; + break; + case 21: + *qOffsetRange = 6; + break; + case 22: + *qOffsetRange = 8; + break; + case 23: + *qOffsetRange = 10; + break; + case 24: + *qOffsetRange = 12; + break; + case 25: + *qOffsetRange = 14; + break; + case 26: + *qOffsetRange = 16; + break; + case 27: + *qOffsetRange = 18; + break; + case 28: + *qOffsetRange = 20; + break; + case 29: + *qOffsetRange = 22; + break; case 30: - default: *qOffsetRange = 24; - } + default: + *qOffsetRange = 24; + } return bIterator; } @@ -2971,434 +3034,519 @@ RrcAsn1Header::DeserializeMeasConfig (LteRrcSap::MeasConfig * measConfig, Buffer // measObjectToRemoveList int measObjectToRemoveListElems; bIterator = DeserializeSequenceOf (&measObjectToRemoveListElems, MAX_OBJECT_ID, 1, bIterator); - - for(int i=0; imeasObjectToRemoveList.push_back (n); - } + + for (int i = 0; i < measObjectToRemoveListElems; i++) + { + bIterator = DeserializeInteger (&n, 1, MAX_OBJECT_ID, bIterator); + measConfig->measObjectToRemoveList.push_back (n); + } } - + if (bitset11[9]) { // measObjectToAddModList int measObjectToAddModListElems; bIterator = DeserializeSequenceOf (&measObjectToAddModListElems, MAX_OBJECT_ID, 1, bIterator); - - for(int i=0; imeasObjectId = n; - - int measObjectChoice; - bIterator = DeserializeChoice (4, true, &measObjectChoice, bIterator); - switch(measObjectChoice) + for (int i = 0; i < measObjectToAddModListElems; i++) { - case 1: - // Deserialize measObjectUTRA - // ... - break; - - case 2: - // Deserialize measObjectGERAN - // ... - break; - - case 3: - // Deserialize measObjectCDMA2000 - // ... - break; - - case 0: - default: - // Deserialize measObjectEUTRA - std::bitset<5> measObjectEutraOpts; - bIterator = DeserializeSequence (&measObjectEutraOpts, true, bIterator); - - // carrierFreq - bIterator = DeserializeInteger (&n, 0, MAX_EARFCN, bIterator); - elem->measObjectEutra.carrierFreq = n; - - // allowedMeasBandwidth - bIterator = DeserializeEnum (6, &n, bIterator); - switch(n) - { - case 0: elem->measObjectEutra.allowedMeasBandwidth = 6; - break; - case 1: elem->measObjectEutra.allowedMeasBandwidth = 15; - break; - case 2: elem->measObjectEutra.allowedMeasBandwidth = 25; - break; - case 3: elem->measObjectEutra.allowedMeasBandwidth = 50; - break; - case 4: elem->measObjectEutra.allowedMeasBandwidth = 75; - break; - case 5: + LteRrcSap::MeasObjectToAddMod * elem = new LteRrcSap::MeasObjectToAddMod (); + + bIterator = DeserializeSequence (&bitset0, false, bIterator); + + bIterator = DeserializeInteger (&n, 1, MAX_OBJECT_ID, bIterator); + elem->measObjectId = n; + + int measObjectChoice; + bIterator = DeserializeChoice (4, true, &measObjectChoice, bIterator); + + switch (measObjectChoice) + { + case 1: + // Deserialize measObjectUTRA + // ... + break; + + case 2: + // Deserialize measObjectGERAN + // ... + break; + + case 3: + // Deserialize measObjectCDMA2000 + // ... + break; + + case 0: default: - elem->measObjectEutra.allowedMeasBandwidth = 100; - break; - } - - // presenceAntennaPort1 - bIterator = DeserializeBoolean (&elem->measObjectEutra.presenceAntennaPort1, bIterator); - - // neighCellConfig - bIterator = DeserializeBitstring (&bitset2, bIterator); - elem->measObjectEutra.neighCellConfig = bitset2.to_ulong(); - - // offsetFreq - DeserializeQoffsetRange (&elem->measObjectEutra.offsetFreq, bIterator); + // Deserialize measObjectEUTRA + std::bitset<5> measObjectEutraOpts; + bIterator = DeserializeSequence (&measObjectEutraOpts, true, bIterator); - if(measObjectEutraOpts[4]) - { - // cellsToRemoveList - int numElems; - bIterator = DeserializeSequenceOf(&numElems, MAX_CELL_MEAS, 1, bIterator); - - for(int i = 0; imeasObjectEutra.cellsToRemoveList.push_back(n); - } - } + // carrierFreq + bIterator = DeserializeInteger (&n, 0, MAX_EARFCN, bIterator); + elem->measObjectEutra.carrierFreq = n; - if(measObjectEutraOpts[3]) - { - // cellsToAddModList - int numElems; - bIterator = DeserializeSequenceOf(&numElems, MAX_CELL_MEAS, 1, bIterator); - - for(int i = 0; icellIndex = n; - - // PhysCellId - bIterator = DeserializeInteger (&n, 0, 503, bIterator); - cellsToAddMod->physCellId = n; - - // cellIndividualOffset - bIterator = DeserializeQoffsetRange( &cellsToAddMod->cellIndividualOffset, bIterator); - - elem->measObjectEutra.cellsToAddModList.push_back(*cellsToAddMod); - } - } - - if(measObjectEutraOpts[2]) - { - // blackCellsToRemoveList - int numElems; - bIterator = DeserializeSequenceOf(&numElems, MAX_CELL_MEAS, 1, bIterator); - - for(int i = 0; imeasObjectEutra.blackCellsToRemoveList.push_back(n); - } - } - - - if(measObjectEutraOpts[1]) - { - // blackCellsToAddModList - int numElems; - bIterator = DeserializeSequenceOf(&numElems, MAX_CELL_MEAS, 1, bIterator); - - for(int i = 0; icellIndex = n; - - // PhysCellIdRange - std::bitset<1> isRangePresent; - bIterator = DeserializeSequence (&isRangePresent, false, bIterator); - - // start - bIterator = DeserializeInteger (&n, 0, 503, bIterator); - blackCellsToAddMod->physCellIdRange.start = n; - - blackCellsToAddMod->physCellIdRange.haveRange=isRangePresent[0]; - if (blackCellsToAddMod->physCellIdRange.haveRange) - { - // range - bIterator = DeserializeEnum (16, &n, bIterator); - switch(n) + // allowedMeasBandwidth + bIterator = DeserializeEnum (6, &n, bIterator); + switch (n) { - case 0: blackCellsToAddMod->physCellIdRange.range = 4; break; - case 1: blackCellsToAddMod->physCellIdRange.range = 8; break; - case 2: blackCellsToAddMod->physCellIdRange.range = 12; break; - case 3: blackCellsToAddMod->physCellIdRange.range = 16; break; - case 4: blackCellsToAddMod->physCellIdRange.range = 24; break; - case 5: blackCellsToAddMod->physCellIdRange.range = 32; break; - case 6: blackCellsToAddMod->physCellIdRange.range = 48; break; - case 7: blackCellsToAddMod->physCellIdRange.range = 64; break; - case 8: blackCellsToAddMod->physCellIdRange.range = 84; break; - case 9: blackCellsToAddMod->physCellIdRange.range = 96; break; - case 10: blackCellsToAddMod->physCellIdRange.range = 128; break; - case 11: blackCellsToAddMod->physCellIdRange.range = 168; break; - case 12: blackCellsToAddMod->physCellIdRange.range = 252; break; - case 13: blackCellsToAddMod->physCellIdRange.range = 504; break; - default: blackCellsToAddMod->physCellIdRange.range = 0; + case 0: + elem->measObjectEutra.allowedMeasBandwidth = 6; + break; + case 1: + elem->measObjectEutra.allowedMeasBandwidth = 15; + break; + case 2: + elem->measObjectEutra.allowedMeasBandwidth = 25; + break; + case 3: + elem->measObjectEutra.allowedMeasBandwidth = 50; + break; + case 4: + elem->measObjectEutra.allowedMeasBandwidth = 75; + break; + case 5: + default: + elem->measObjectEutra.allowedMeasBandwidth = 100; + break; } - } - - elem->measObjectEutra.blackCellsToAddModList.push_back(*blackCellsToAddMod); - } - } - elem->measObjectEutra.haveCellForWhichToReportCGI = measObjectEutraOpts[0]; - if(measObjectEutraOpts[0]) - { - // cellForWhichToReportCGI - bIterator = DeserializeInteger (&n, 0, 503, bIterator); - elem->measObjectEutra.cellForWhichToReportCGI = n; - } + // presenceAntennaPort1 + bIterator = DeserializeBoolean (&elem->measObjectEutra.presenceAntennaPort1, bIterator); + + // neighCellConfig + bIterator = DeserializeBitstring (&bitset2, bIterator); + elem->measObjectEutra.neighCellConfig = bitset2.to_ulong (); + + // offsetFreq + DeserializeQoffsetRange (&elem->measObjectEutra.offsetFreq, bIterator); + + if (measObjectEutraOpts[4]) + { + // cellsToRemoveList + int numElems; + bIterator = DeserializeSequenceOf (&numElems, MAX_CELL_MEAS, 1, bIterator); + + for (int i = 0; i < numElems; i++) + { + bIterator = DeserializeInteger (&n, 1, MAX_CELL_MEAS, bIterator); + elem->measObjectEutra.cellsToRemoveList.push_back (n); + } + } + + if (measObjectEutraOpts[3]) + { + // cellsToAddModList + int numElems; + bIterator = DeserializeSequenceOf (&numElems, MAX_CELL_MEAS, 1, bIterator); + + for (int i = 0; i < numElems; i++) + { + LteRrcSap::CellsToAddMod * cellsToAddMod = new LteRrcSap::CellsToAddMod (); + + bIterator = DeserializeSequence (&bitset0, false, bIterator); + + // cellIndex + bIterator = DeserializeInteger (&n, 1, MAX_CELL_MEAS, bIterator); + cellsToAddMod->cellIndex = n; + + // PhysCellId + bIterator = DeserializeInteger (&n, 0, 503, bIterator); + cellsToAddMod->physCellId = n; + + // cellIndividualOffset + bIterator = DeserializeQoffsetRange ( &cellsToAddMod->cellIndividualOffset, bIterator); + + elem->measObjectEutra.cellsToAddModList.push_back (*cellsToAddMod); + } + } + + if (measObjectEutraOpts[2]) + { + // blackCellsToRemoveList + int numElems; + bIterator = DeserializeSequenceOf (&numElems, MAX_CELL_MEAS, 1, bIterator); + + for (int i = 0; i < numElems; i++) + { + bIterator = DeserializeInteger (&n, 1, MAX_CELL_MEAS, bIterator); + elem->measObjectEutra.blackCellsToRemoveList.push_back (n); + } + } + + + if (measObjectEutraOpts[1]) + { + // blackCellsToAddModList + int numElems; + bIterator = DeserializeSequenceOf (&numElems, MAX_CELL_MEAS, 1, bIterator); + + for (int i = 0; i < numElems; i++) + { + LteRrcSap::BlackCellsToAddMod * blackCellsToAddMod = new LteRrcSap::BlackCellsToAddMod (); + bIterator = DeserializeSequence (&bitset0, false, bIterator); + + bIterator = DeserializeInteger (&n, 1, MAX_CELL_MEAS, bIterator); + blackCellsToAddMod->cellIndex = n; + + // PhysCellIdRange + std::bitset<1> isRangePresent; + bIterator = DeserializeSequence (&isRangePresent, false, bIterator); + + // start + bIterator = DeserializeInteger (&n, 0, 503, bIterator); + blackCellsToAddMod->physCellIdRange.start = n; + + blackCellsToAddMod->physCellIdRange.haveRange = isRangePresent[0]; + if (blackCellsToAddMod->physCellIdRange.haveRange) + { + // range + bIterator = DeserializeEnum (16, &n, bIterator); + switch (n) + { + case 0: + blackCellsToAddMod->physCellIdRange.range = 4; + break; + case 1: + blackCellsToAddMod->physCellIdRange.range = 8; + break; + case 2: + blackCellsToAddMod->physCellIdRange.range = 12; + break; + case 3: + blackCellsToAddMod->physCellIdRange.range = 16; + break; + case 4: + blackCellsToAddMod->physCellIdRange.range = 24; + break; + case 5: + blackCellsToAddMod->physCellIdRange.range = 32; + break; + case 6: + blackCellsToAddMod->physCellIdRange.range = 48; + break; + case 7: + blackCellsToAddMod->physCellIdRange.range = 64; + break; + case 8: + blackCellsToAddMod->physCellIdRange.range = 84; + break; + case 9: + blackCellsToAddMod->physCellIdRange.range = 96; + break; + case 10: + blackCellsToAddMod->physCellIdRange.range = 128; + break; + case 11: + blackCellsToAddMod->physCellIdRange.range = 168; + break; + case 12: + blackCellsToAddMod->physCellIdRange.range = 252; + break; + case 13: + blackCellsToAddMod->physCellIdRange.range = 504; + break; + default: + blackCellsToAddMod->physCellIdRange.range = 0; + } + } + + elem->measObjectEutra.blackCellsToAddModList.push_back (*blackCellsToAddMod); + } + } + + elem->measObjectEutra.haveCellForWhichToReportCGI = measObjectEutraOpts[0]; + if (measObjectEutraOpts[0]) + { + // cellForWhichToReportCGI + bIterator = DeserializeInteger (&n, 0, 503, bIterator); + elem->measObjectEutra.cellForWhichToReportCGI = n; + } + } + measConfig->measObjectToAddModList.push_back (*elem); } - measConfig->measObjectToAddModList.push_back (*elem); - } - } - + } + if (bitset11[8]) { // reportConfigToRemoveList int reportConfigToRemoveListElems; bIterator = DeserializeSequenceOf (&reportConfigToRemoveListElems, MAX_REPORT_CONFIG_ID, 1, bIterator); - - for(int i=0; ireportConfigToRemoveList.push_back (n); - } + + for (int i = 0; i < reportConfigToRemoveListElems; i++) + { + bIterator = DeserializeInteger (&n, 1, MAX_REPORT_CONFIG_ID, bIterator); + measConfig->reportConfigToRemoveList.push_back (n); + } } - + if (bitset11[7]) { // reportConfigToAddModList int reportConfigToAddModListElems; bIterator = DeserializeSequenceOf (&reportConfigToAddModListElems, MAX_REPORT_CONFIG_ID, 1, bIterator); - - for(int i=0; ireportConfigId = n; - - // Deserialize reportConfig - int reportConfigChoice; - bIterator = DeserializeChoice (2, false, &reportConfigChoice, bIterator); - - if(reportConfigChoice == 0) + + for (int i = 0; i < reportConfigToAddModListElems; i++) { - // reportConfigEUTRA - bIterator = DeserializeSequence (&bitset0, true, bIterator); - - // triggerType - int triggerTypeChoice; - bIterator = DeserializeChoice (2, false, &triggerTypeChoice, bIterator); - - if (triggerTypeChoice == 0) - { - // event - elem->reportConfigEutra.triggerType = LteRrcSap::ReportConfigEutra::event; - bIterator = DeserializeSequence (&bitset0, false, bIterator); - - // eventId - int eventIdChoice; - bIterator = DeserializeChoice (5, true, &eventIdChoice, bIterator); - - switch(eventIdChoice) + LteRrcSap::ReportConfigToAddMod * elem = new LteRrcSap::ReportConfigToAddMod (); + + bIterator = DeserializeSequence (&bitset0, false, bIterator); + bIterator = DeserializeInteger (&n, 1, MAX_REPORT_CONFIG_ID, bIterator); + elem->reportConfigId = n; + + // Deserialize reportConfig + int reportConfigChoice; + bIterator = DeserializeChoice (2, false, &reportConfigChoice, bIterator); + + if (reportConfigChoice == 0) { - case 0: elem->reportConfigEutra.eventId = LteRrcSap::ReportConfigEutra::eventA1; - bIterator = DeserializeSequence (&bitset0, false, bIterator); - bIterator = DeserializeThresholdEutra (&elem->reportConfigEutra.threshold1, bIterator); - break; + // reportConfigEUTRA + bIterator = DeserializeSequence (&bitset0, true, bIterator); - case 1: elem->reportConfigEutra.eventId = LteRrcSap::ReportConfigEutra::eventA2; - bIterator = DeserializeSequence (&bitset0, false, bIterator); - bIterator = DeserializeThresholdEutra (&elem->reportConfigEutra.threshold1, bIterator); - break; + // triggerType + int triggerTypeChoice; + bIterator = DeserializeChoice (2, false, &triggerTypeChoice, bIterator); - case 2: elem->reportConfigEutra.eventId = LteRrcSap::ReportConfigEutra::eventA3; - bIterator = DeserializeSequence (&bitset0, false, bIterator); - bIterator = DeserializeInteger (&n, -30, 30, bIterator); - elem->reportConfigEutra.a3Offset = n; - bIterator = DeserializeBoolean (&elem->reportConfigEutra.reportOnLeave, bIterator); - break; + if (triggerTypeChoice == 0) + { + // event + elem->reportConfigEutra.triggerType = LteRrcSap::ReportConfigEutra::event; + bIterator = DeserializeSequence (&bitset0, false, bIterator); - case 3: elem->reportConfigEutra.eventId = LteRrcSap::ReportConfigEutra::eventA4; - bIterator = DeserializeSequence (&bitset0, false, bIterator); - bIterator = DeserializeThresholdEutra (&elem->reportConfigEutra.threshold1, bIterator); - break; + // eventId + int eventIdChoice; + bIterator = DeserializeChoice (5, true, &eventIdChoice, bIterator); - default: elem->reportConfigEutra.eventId = LteRrcSap::ReportConfigEutra::eventA5; - bIterator = DeserializeSequence (&bitset0, false, bIterator); - bIterator = DeserializeThresholdEutra (&elem->reportConfigEutra.threshold1, bIterator); - bIterator = DeserializeThresholdEutra (&elem->reportConfigEutra.threshold2, bIterator); - break; + switch (eventIdChoice) + { + case 0: + elem->reportConfigEutra.eventId = LteRrcSap::ReportConfigEutra::eventA1; + bIterator = DeserializeSequence (&bitset0, false, bIterator); + bIterator = DeserializeThresholdEutra (&elem->reportConfigEutra.threshold1, bIterator); + break; + + case 1: + elem->reportConfigEutra.eventId = LteRrcSap::ReportConfigEutra::eventA2; + bIterator = DeserializeSequence (&bitset0, false, bIterator); + bIterator = DeserializeThresholdEutra (&elem->reportConfigEutra.threshold1, bIterator); + break; + + case 2: + elem->reportConfigEutra.eventId = LteRrcSap::ReportConfigEutra::eventA3; + bIterator = DeserializeSequence (&bitset0, false, bIterator); + bIterator = DeserializeInteger (&n, -30, 30, bIterator); + elem->reportConfigEutra.a3Offset = n; + bIterator = DeserializeBoolean (&elem->reportConfigEutra.reportOnLeave, bIterator); + break; + + case 3: + elem->reportConfigEutra.eventId = LteRrcSap::ReportConfigEutra::eventA4; + bIterator = DeserializeSequence (&bitset0, false, bIterator); + bIterator = DeserializeThresholdEutra (&elem->reportConfigEutra.threshold1, bIterator); + break; + + default: + elem->reportConfigEutra.eventId = LteRrcSap::ReportConfigEutra::eventA5; + bIterator = DeserializeSequence (&bitset0, false, bIterator); + bIterator = DeserializeThresholdEutra (&elem->reportConfigEutra.threshold1, bIterator); + bIterator = DeserializeThresholdEutra (&elem->reportConfigEutra.threshold2, bIterator); + break; + } + + bIterator = DeserializeInteger (&n, 0, 30, bIterator); + elem->reportConfigEutra.hysteresis = n; + + bIterator = DeserializeEnum (16, &n, bIterator); + switch (n) + { + case 0: + elem->reportConfigEutra.timeToTrigger = 0; + break; + case 1: + elem->reportConfigEutra.timeToTrigger = 40; + break; + case 2: + elem->reportConfigEutra.timeToTrigger = 64; + break; + case 3: + elem->reportConfigEutra.timeToTrigger = 80; + break; + case 4: + elem->reportConfigEutra.timeToTrigger = 100; + break; + case 5: + elem->reportConfigEutra.timeToTrigger = 128; + break; + case 6: + elem->reportConfigEutra.timeToTrigger = 160; + break; + case 7: + elem->reportConfigEutra.timeToTrigger = 256; + break; + case 8: + elem->reportConfigEutra.timeToTrigger = 320; + break; + case 9: + elem->reportConfigEutra.timeToTrigger = 480; + break; + case 10: + elem->reportConfigEutra.timeToTrigger = 512; + break; + case 11: + elem->reportConfigEutra.timeToTrigger = 640; + break; + case 12: + elem->reportConfigEutra.timeToTrigger = 1024; + break; + case 13: + elem->reportConfigEutra.timeToTrigger = 1280; + break; + case 14: + elem->reportConfigEutra.timeToTrigger = 2560; + break; + case 15: + default: + elem->reportConfigEutra.timeToTrigger = 5120; + break; + } + } + + if (triggerTypeChoice == 1) + { + // periodical + elem->reportConfigEutra.triggerType = LteRrcSap::ReportConfigEutra::periodical; + + bIterator = DeserializeSequence (&bitset0, false, bIterator); + bIterator = DeserializeEnum (2, &n, bIterator); + if (n == 0) + { + elem->reportConfigEutra.purpose = LteRrcSap::ReportConfigEutra::reportStrongestCells; + } + else + { + elem->reportConfigEutra.purpose = LteRrcSap::ReportConfigEutra::reportCgi; + } + } + + // triggerQuantity + bIterator = DeserializeEnum (2, &n, bIterator); + if (n == 0) + { + elem->reportConfigEutra.triggerQuantity = LteRrcSap::ReportConfigEutra::rsrp; + } + else + { + elem->reportConfigEutra.triggerQuantity = LteRrcSap::ReportConfigEutra::rsrq; + } + + // reportQuantity + bIterator = DeserializeEnum (2, &n, bIterator); + if (n == 0) + { + elem->reportConfigEutra.reportQuantity = LteRrcSap::ReportConfigEutra::sameAsTriggerQuantity; + } + else + { + elem->reportConfigEutra.reportQuantity = LteRrcSap::ReportConfigEutra::both; + } + + // maxReportCells + bIterator = DeserializeInteger (&n, 1, MAX_CELL_REPORT, bIterator); + elem->reportConfigEutra.maxReportCells = n; + + // reportInterval + bIterator = DeserializeEnum (16, &n, bIterator); + switch (n) + { + case 0: + elem->reportConfigEutra.reportInterval = LteRrcSap::ReportConfigEutra::ms120; + break; + case 1: + elem->reportConfigEutra.reportInterval = LteRrcSap::ReportConfigEutra::ms240; + break; + case 2: + elem->reportConfigEutra.reportInterval = LteRrcSap::ReportConfigEutra::ms480; + break; + case 3: + elem->reportConfigEutra.reportInterval = LteRrcSap::ReportConfigEutra::ms640; + break; + case 4: + elem->reportConfigEutra.reportInterval = LteRrcSap::ReportConfigEutra::ms1024; + break; + case 5: + elem->reportConfigEutra.reportInterval = LteRrcSap::ReportConfigEutra::ms2048; + break; + case 6: + elem->reportConfigEutra.reportInterval = LteRrcSap::ReportConfigEutra::ms5120; + break; + case 7: + elem->reportConfigEutra.reportInterval = LteRrcSap::ReportConfigEutra::ms10240; + break; + case 8: + elem->reportConfigEutra.reportInterval = LteRrcSap::ReportConfigEutra::min1; + break; + case 9: + elem->reportConfigEutra.reportInterval = LteRrcSap::ReportConfigEutra::min6; + break; + case 10: + elem->reportConfigEutra.reportInterval = LteRrcSap::ReportConfigEutra::min12; + break; + case 11: + elem->reportConfigEutra.reportInterval = LteRrcSap::ReportConfigEutra::min30; + break; + case 12: + elem->reportConfigEutra.reportInterval = LteRrcSap::ReportConfigEutra::min60; + break; + case 13: + elem->reportConfigEutra.reportInterval = LteRrcSap::ReportConfigEutra::spare3; + break; + case 14: + elem->reportConfigEutra.reportInterval = LteRrcSap::ReportConfigEutra::spare2; + break; + case 15: + default: + elem->reportConfigEutra.reportInterval = LteRrcSap::ReportConfigEutra::spare1; + } + + // reportAmount + bIterator = DeserializeEnum (8, &n, bIterator); + switch (n) + { + case 0: + elem->reportConfigEutra.reportAmount = 1; + break; + case 1: + elem->reportConfigEutra.reportAmount = 2; + break; + case 2: + elem->reportConfigEutra.reportAmount = 4; + break; + case 3: + elem->reportConfigEutra.reportAmount = 8; + break; + case 4: + elem->reportConfigEutra.reportAmount = 16; + break; + case 5: + elem->reportConfigEutra.reportAmount = 32; + break; + case 6: + elem->reportConfigEutra.reportAmount = 64; + break; + default: + elem->reportConfigEutra.reportAmount = 0; + } } - - bIterator = DeserializeInteger (&n, 0, 30, bIterator); - elem->reportConfigEutra.hysteresis = n; - bIterator = DeserializeEnum (16, &n, bIterator); - switch(n) + if (reportConfigChoice == 1) { - case 0: elem->reportConfigEutra.timeToTrigger = 0; break; - case 1: elem->reportConfigEutra.timeToTrigger = 40; break; - case 2: elem->reportConfigEutra.timeToTrigger = 64; break; - case 3: elem->reportConfigEutra.timeToTrigger = 80; break; - case 4: elem->reportConfigEutra.timeToTrigger = 100; break; - case 5: elem->reportConfigEutra.timeToTrigger = 128; break; - case 6: elem->reportConfigEutra.timeToTrigger = 160; break; - case 7: elem->reportConfigEutra.timeToTrigger = 256; break; - case 8: elem->reportConfigEutra.timeToTrigger = 320; break; - case 9: elem->reportConfigEutra.timeToTrigger = 480; break; - case 10: elem->reportConfigEutra.timeToTrigger = 512; break; - case 11: elem->reportConfigEutra.timeToTrigger = 640; break; - case 12: elem->reportConfigEutra.timeToTrigger = 1024; break; - case 13: elem->reportConfigEutra.timeToTrigger = 1280; break; - case 14: elem->reportConfigEutra.timeToTrigger = 2560; break; - case 15: - default: - elem->reportConfigEutra.timeToTrigger = 5120; break; - } - } - - if (triggerTypeChoice == 1) - { - // periodical - elem->reportConfigEutra.triggerType = LteRrcSap::ReportConfigEutra::periodical; - - bIterator = DeserializeSequence (&bitset0, false, bIterator); - bIterator = DeserializeEnum (2, &n, bIterator); - if(n==0) - { - elem->reportConfigEutra.purpose = LteRrcSap::ReportConfigEutra::reportStrongestCells; + // ReportConfigInterRAT + // ... } - else - { - elem->reportConfigEutra.purpose = LteRrcSap::ReportConfigEutra::reportCgi; - } - } - - // triggerQuantity - bIterator = DeserializeEnum (2, &n, bIterator); - if(n==0) - { - elem->reportConfigEutra.triggerQuantity = LteRrcSap::ReportConfigEutra::rsrp; - } - else - { - elem->reportConfigEutra.triggerQuantity = LteRrcSap::ReportConfigEutra::rsrq; - } - - // reportQuantity - bIterator = DeserializeEnum (2, &n, bIterator); - if(n==0) - { - elem->reportConfigEutra.reportQuantity = LteRrcSap::ReportConfigEutra::sameAsTriggerQuantity; - } - else - { - elem->reportConfigEutra.reportQuantity = LteRrcSap::ReportConfigEutra::both; - } - - // maxReportCells - bIterator = DeserializeInteger(&n, 1, MAX_CELL_REPORT, bIterator); - elem->reportConfigEutra.maxReportCells = n; - - // reportInterval - bIterator = DeserializeEnum (16, &n, bIterator); - switch(n) - { - case 0: - elem->reportConfigEutra.reportInterval = LteRrcSap::ReportConfigEutra::ms120; - break; - case 1: - elem->reportConfigEutra.reportInterval = LteRrcSap::ReportConfigEutra::ms240; - break; - case 2: - elem->reportConfigEutra.reportInterval = LteRrcSap::ReportConfigEutra::ms480; - break; - case 3: - elem->reportConfigEutra.reportInterval = LteRrcSap::ReportConfigEutra::ms640; - break; - case 4: - elem->reportConfigEutra.reportInterval = LteRrcSap::ReportConfigEutra::ms1024; - break; - case 5: - elem->reportConfigEutra.reportInterval = LteRrcSap::ReportConfigEutra::ms2048; - break; - case 6: - elem->reportConfigEutra.reportInterval = LteRrcSap::ReportConfigEutra::ms5120; - break; - case 7: - elem->reportConfigEutra.reportInterval = LteRrcSap::ReportConfigEutra::ms10240; - break; - case 8: - elem->reportConfigEutra.reportInterval = LteRrcSap::ReportConfigEutra::min1; - break; - case 9: - elem->reportConfigEutra.reportInterval = LteRrcSap::ReportConfigEutra::min6; - break; - case 10: - elem->reportConfigEutra.reportInterval = LteRrcSap::ReportConfigEutra::min12; - break; - case 11: - elem->reportConfigEutra.reportInterval = LteRrcSap::ReportConfigEutra::min30; - break; - case 12: - elem->reportConfigEutra.reportInterval = LteRrcSap::ReportConfigEutra::min60; - break; - case 13: - elem->reportConfigEutra.reportInterval = LteRrcSap::ReportConfigEutra::spare3; - break; - case 14: - elem->reportConfigEutra.reportInterval = LteRrcSap::ReportConfigEutra::spare2; - break; - case 15: - default: - elem->reportConfigEutra.reportInterval = LteRrcSap::ReportConfigEutra::spare1; - } - - // reportAmount - bIterator = DeserializeEnum (8, &n, bIterator); - switch(n) - { - case 0: elem->reportConfigEutra.reportAmount = 1; break; - case 1: elem->reportConfigEutra.reportAmount = 2; break; - case 2: elem->reportConfigEutra.reportAmount = 4; break; - case 3: elem->reportConfigEutra.reportAmount = 8; break; - case 4: elem->reportConfigEutra.reportAmount = 16; break; - case 5: elem->reportConfigEutra.reportAmount = 32; break; - case 6: elem->reportConfigEutra.reportAmount = 64; break; - default: elem->reportConfigEutra.reportAmount = 0; - } + + measConfig->reportConfigToAddModList.push_back (*elem); } - - if(reportConfigChoice == 1) - { - // ReportConfigInterRAT - // ... - } - - measConfig->reportConfigToAddModList.push_back (*elem); - } } if (bitset11[6]) @@ -3406,12 +3554,12 @@ RrcAsn1Header::DeserializeMeasConfig (LteRrcSap::MeasConfig * measConfig, Buffer // measIdToRemoveList int measIdToRemoveListElems; bIterator = DeserializeSequenceOf (&measIdToRemoveListElems, MAX_MEAS_ID, 1, bIterator); - - for(int i=0; imeasIdToRemoveList.push_back (n); - } + + for (int i = 0; i < measIdToRemoveListElems; i++) + { + bIterator = DeserializeInteger (&n, 1, MAX_MEAS_ID, bIterator); + measConfig->measIdToRemoveList.push_back (n); + } } if (bitset11[5]) @@ -3419,163 +3567,163 @@ RrcAsn1Header::DeserializeMeasConfig (LteRrcSap::MeasConfig * measConfig, Buffer // measIdToAddModList int measIdToAddModListElems; bIterator = DeserializeSequenceOf (&measIdToAddModListElems, MAX_MEAS_ID, 1, bIterator); - - for(int i=0; imeasId = n; - - bIterator = DeserializeInteger (&n, 1, MAX_OBJECT_ID, bIterator); - elem->measObjectId = n; - - bIterator = DeserializeInteger (&n, 1, MAX_REPORT_CONFIG_ID, bIterator); - elem->reportConfigId = n; - - measConfig->measIdToAddModList.push_back (*elem); - } + + for (int i = 0; i < measIdToAddModListElems; i++) + { + LteRrcSap::MeasIdToAddMod * elem = new LteRrcSap::MeasIdToAddMod (); + + bIterator = DeserializeSequence (&bitset0, false, bIterator); + + bIterator = DeserializeInteger (&n, 1, MAX_MEAS_ID, bIterator); + elem->measId = n; + + bIterator = DeserializeInteger (&n, 1, MAX_OBJECT_ID, bIterator); + elem->measObjectId = n; + + bIterator = DeserializeInteger (&n, 1, MAX_REPORT_CONFIG_ID, bIterator); + elem->reportConfigId = n; + + measConfig->measIdToAddModList.push_back (*elem); + } } - + measConfig->haveQuantityConfig = bitset11[4]; if (measConfig->haveQuantityConfig) { // quantityConfig std::bitset<4> quantityConfigOpts; bIterator = DeserializeSequence (&quantityConfigOpts, true, bIterator); - - if(quantityConfigOpts[3]) - { - // quantityConfigEUTRA - bIterator = DeserializeSequence (&bitset0,false,bIterator); - bIterator = DeserializeEnum (16, &n, bIterator); - switch(n) + + if (quantityConfigOpts[3]) { - case 0: - measConfig->quantityConfig.filterCoefficientRSRP = 0; - break; - case 1: - measConfig->quantityConfig.filterCoefficientRSRP = 1; - break; - case 2: - measConfig->quantityConfig.filterCoefficientRSRP = 2; - break; - case 3: - measConfig->quantityConfig.filterCoefficientRSRP = 3; - break; - case 4: - measConfig->quantityConfig.filterCoefficientRSRP = 4; - break; - case 5: - measConfig->quantityConfig.filterCoefficientRSRP = 5; - break; - case 6: - measConfig->quantityConfig.filterCoefficientRSRP = 6; - break; - case 7: - measConfig->quantityConfig.filterCoefficientRSRP = 7; - break; - case 8: - measConfig->quantityConfig.filterCoefficientRSRP = 8; - break; - case 9: - measConfig->quantityConfig.filterCoefficientRSRP = 9; - break; - case 10: - measConfig->quantityConfig.filterCoefficientRSRP = 11; - break; - case 11: - measConfig->quantityConfig.filterCoefficientRSRP = 13; - break; - case 12: - measConfig->quantityConfig.filterCoefficientRSRP = 15; - break; - case 13: - measConfig->quantityConfig.filterCoefficientRSRP = 17; - break; - case 14: - measConfig->quantityConfig.filterCoefficientRSRP = 19; - break; - case 15: - measConfig->quantityConfig.filterCoefficientRSRP = 0; - break; - default: - measConfig->quantityConfig.filterCoefficientRSRP = 4; + // quantityConfigEUTRA + bIterator = DeserializeSequence (&bitset0,false,bIterator); + bIterator = DeserializeEnum (16, &n, bIterator); + switch (n) + { + case 0: + measConfig->quantityConfig.filterCoefficientRSRP = 0; + break; + case 1: + measConfig->quantityConfig.filterCoefficientRSRP = 1; + break; + case 2: + measConfig->quantityConfig.filterCoefficientRSRP = 2; + break; + case 3: + measConfig->quantityConfig.filterCoefficientRSRP = 3; + break; + case 4: + measConfig->quantityConfig.filterCoefficientRSRP = 4; + break; + case 5: + measConfig->quantityConfig.filterCoefficientRSRP = 5; + break; + case 6: + measConfig->quantityConfig.filterCoefficientRSRP = 6; + break; + case 7: + measConfig->quantityConfig.filterCoefficientRSRP = 7; + break; + case 8: + measConfig->quantityConfig.filterCoefficientRSRP = 8; + break; + case 9: + measConfig->quantityConfig.filterCoefficientRSRP = 9; + break; + case 10: + measConfig->quantityConfig.filterCoefficientRSRP = 11; + break; + case 11: + measConfig->quantityConfig.filterCoefficientRSRP = 13; + break; + case 12: + measConfig->quantityConfig.filterCoefficientRSRP = 15; + break; + case 13: + measConfig->quantityConfig.filterCoefficientRSRP = 17; + break; + case 14: + measConfig->quantityConfig.filterCoefficientRSRP = 19; + break; + case 15: + measConfig->quantityConfig.filterCoefficientRSRP = 0; + break; + default: + measConfig->quantityConfig.filterCoefficientRSRP = 4; + } + bIterator = DeserializeEnum (16, &n, bIterator); + switch (n) + { + case 0: + measConfig->quantityConfig.filterCoefficientRSRQ = 0; + break; + case 1: + measConfig->quantityConfig.filterCoefficientRSRQ = 1; + break; + case 2: + measConfig->quantityConfig.filterCoefficientRSRQ = 2; + break; + case 3: + measConfig->quantityConfig.filterCoefficientRSRQ = 3; + break; + case 4: + measConfig->quantityConfig.filterCoefficientRSRQ = 4; + break; + case 5: + measConfig->quantityConfig.filterCoefficientRSRQ = 5; + break; + case 6: + measConfig->quantityConfig.filterCoefficientRSRQ = 6; + break; + case 7: + measConfig->quantityConfig.filterCoefficientRSRQ = 7; + break; + case 8: + measConfig->quantityConfig.filterCoefficientRSRQ = 8; + break; + case 9: + measConfig->quantityConfig.filterCoefficientRSRQ = 9; + break; + case 10: + measConfig->quantityConfig.filterCoefficientRSRQ = 11; + break; + case 11: + measConfig->quantityConfig.filterCoefficientRSRQ = 13; + break; + case 12: + measConfig->quantityConfig.filterCoefficientRSRQ = 15; + break; + case 13: + measConfig->quantityConfig.filterCoefficientRSRQ = 17; + break; + case 14: + measConfig->quantityConfig.filterCoefficientRSRQ = 19; + break; + case 15: + measConfig->quantityConfig.filterCoefficientRSRQ = 0; + break; + default: + measConfig->quantityConfig.filterCoefficientRSRQ = 4; + } } - bIterator = DeserializeEnum (16, &n, bIterator); - switch(n) + if (quantityConfigOpts[2]) { - case 0: - measConfig->quantityConfig.filterCoefficientRSRQ = 0; - break; - case 1: - measConfig->quantityConfig.filterCoefficientRSRQ = 1; - break; - case 2: - measConfig->quantityConfig.filterCoefficientRSRQ = 2; - break; - case 3: - measConfig->quantityConfig.filterCoefficientRSRQ = 3; - break; - case 4: - measConfig->quantityConfig.filterCoefficientRSRQ = 4; - break; - case 5: - measConfig->quantityConfig.filterCoefficientRSRQ = 5; - break; - case 6: - measConfig->quantityConfig.filterCoefficientRSRQ = 6; - break; - case 7: - measConfig->quantityConfig.filterCoefficientRSRQ = 7; - break; - case 8: - measConfig->quantityConfig.filterCoefficientRSRQ = 8; - break; - case 9: - measConfig->quantityConfig.filterCoefficientRSRQ = 9; - break; - case 10: - measConfig->quantityConfig.filterCoefficientRSRQ = 11; - break; - case 11: - measConfig->quantityConfig.filterCoefficientRSRQ = 13; - break; - case 12: - measConfig->quantityConfig.filterCoefficientRSRQ = 15; - break; - case 13: - measConfig->quantityConfig.filterCoefficientRSRQ = 17; - break; - case 14: - measConfig->quantityConfig.filterCoefficientRSRQ = 19; - break; - case 15: - measConfig->quantityConfig.filterCoefficientRSRQ = 0; - break; - default: - measConfig->quantityConfig.filterCoefficientRSRQ = 4; + // quantityConfigUTRA + // ... + } + if (quantityConfigOpts[1]) + { + // quantityConfigGERAN + // ... + } + if (quantityConfigOpts[0]) + { + // quantityConfigCDMA2000 + // ... } - } - if(quantityConfigOpts[2]) - { - // quantityConfigUTRA - // ... - } - if(quantityConfigOpts[1]) - { - // quantityConfigGERAN - // ... - } - if(quantityConfigOpts[0]) - { - // quantityConfigCDMA2000 - // ... - } } - + measConfig->haveMeasGapConfig = bitset11[3]; if (measConfig->haveMeasGapConfig) { @@ -3583,7 +3731,7 @@ RrcAsn1Header::DeserializeMeasConfig (LteRrcSap::MeasConfig * measConfig, Buffer int measGapConfigChoice; bIterator = DeserializeChoice (2, false, &measGapConfigChoice, bIterator); switch (measGapConfigChoice) - { + { case 0: measConfig->measGapConfig.type = LteRrcSap::MeasGapConfig::RESET; bIterator = DeserializeNull (bIterator); @@ -3592,11 +3740,11 @@ RrcAsn1Header::DeserializeMeasConfig (LteRrcSap::MeasConfig * measConfig, Buffer default: measConfig->measGapConfig.type = LteRrcSap::MeasGapConfig::SETUP; bIterator = DeserializeSequence (&bitset0, false, bIterator); - + int gapOffsetChoice; bIterator = DeserializeChoice (2, true, &gapOffsetChoice, bIterator); - switch(gapOffsetChoice) - { + switch (gapOffsetChoice) + { case 0: measConfig->measGapConfig.gapOffsetChoice = LteRrcSap::MeasGapConfig::gp0; bIterator = DeserializeInteger (&n, 0, 39, bIterator); @@ -3606,11 +3754,11 @@ RrcAsn1Header::DeserializeMeasConfig (LteRrcSap::MeasConfig * measConfig, Buffer default: measConfig->measGapConfig.gapOffsetChoice = LteRrcSap::MeasGapConfig::gp1; bIterator = DeserializeInteger (&n, 0, 79, bIterator); - measConfig->measGapConfig.gapOffsetValue = n; - } - } + measConfig->measGapConfig.gapOffsetValue = n; + } + } } - + measConfig->haveSmeasure = bitset11[2]; if (measConfig->haveSmeasure) { @@ -3624,15 +3772,15 @@ RrcAsn1Header::DeserializeMeasConfig (LteRrcSap::MeasConfig * measConfig, Buffer // preRegistrationInfoHRPD // ... } - + measConfig->haveSpeedStatePars = bitset11[0]; if (measConfig->haveSpeedStatePars) { - // speedStatePars + // speedStatePars int speedStateParsChoice; - bIterator = DeserializeChoice (2 , false, &speedStateParsChoice, bIterator); - switch(speedStateParsChoice) - { + bIterator = DeserializeChoice (2, false, &speedStateParsChoice, bIterator); + switch (speedStateParsChoice) + { case 0: measConfig->speedStatePars.type = LteRrcSap::SpeedStatePars::RESET; bIterator = DeserializeNull (bIterator); @@ -3641,12 +3789,12 @@ RrcAsn1Header::DeserializeMeasConfig (LteRrcSap::MeasConfig * measConfig, Buffer default: measConfig->speedStatePars.type = LteRrcSap::SpeedStatePars::SETUP; bIterator = DeserializeSequence (&bitset0, false, bIterator); - + // Deserialize mobilityStateParameters // Deserialize t-Evaluation bIterator = DeserializeEnum (8, &n, bIterator); - switch(n) - { + switch (n) + { case 0: measConfig->speedStatePars.mobilityStateParameters.tEvaluation = 30; break; @@ -3664,11 +3812,11 @@ RrcAsn1Header::DeserializeMeasConfig (LteRrcSap::MeasConfig * measConfig, Buffer break; default: measConfig->speedStatePars.mobilityStateParameters.tEvaluation = 0; - } + } // Deserialize t-HystNormal bIterator = DeserializeEnum (8, &n, bIterator); - switch(n) - { + switch (n) + { case 0: measConfig->speedStatePars.mobilityStateParameters.tHystNormal = 30; break; @@ -3686,20 +3834,20 @@ RrcAsn1Header::DeserializeMeasConfig (LteRrcSap::MeasConfig * measConfig, Buffer break; default: measConfig->speedStatePars.mobilityStateParameters.tHystNormal = 0; - } - + } + bIterator = DeserializeInteger (&n, 1, 16, bIterator); measConfig->speedStatePars.mobilityStateParameters.nCellChangeMedium = n; - + bIterator = DeserializeInteger (&n, 1, 16, bIterator); measConfig->speedStatePars.mobilityStateParameters.nCellChangeHigh = n; - + // Deserialize timeToTriggerSf bIterator = DeserializeEnum (4, &n, bIterator); - measConfig->speedStatePars.timeToTriggerSf.sfMedium = (n+1)*25; + measConfig->speedStatePars.timeToTriggerSf.sfMedium = (n + 1) * 25; bIterator = DeserializeEnum (4, &n, bIterator); - measConfig->speedStatePars.timeToTriggerSf.sfHigh = (n+1)*25; - } + measConfig->speedStatePars.timeToTriggerSf.sfHigh = (n + 1) * 25; + } } return bIterator; } @@ -4576,74 +4724,74 @@ RrcConnectionReconfigurationHeader::Print (std::ostream &os) const os << "haveMeasConfig: " << m_haveMeasConfig << std::endl; if (m_haveMobilityControlInfo) { - if(!m_measConfig.measObjectToRemoveList.empty()) - { - os << " measObjectToRemoveList: " ; - std::list auxList = m_measConfig.measObjectToRemoveList; - std::list::iterator it = auxList.begin (); - for ( ; it != auxList.end(); it++) + if (!m_measConfig.measObjectToRemoveList.empty ()) { - os << (int) *it << ", "; - } - os << std::endl; - } - if(!m_measConfig.reportConfigToRemoveList.empty()) - { - os << " reportConfigToRemoveList: " ; - std::list auxList = m_measConfig.reportConfigToRemoveList; - std::list::iterator it = auxList.begin (); - for ( ; it != auxList.end(); it++) + os << " measObjectToRemoveList: "; + std::list auxList = m_measConfig.measObjectToRemoveList; + std::list::iterator it = auxList.begin (); + for (; it != auxList.end (); it++) + { + os << (int) *it << ", "; + } + os << std::endl; + } + if (!m_measConfig.reportConfigToRemoveList.empty ()) { - os << (int) *it << ", "; - } - os << std::endl; - } - if(!m_measConfig.measIdToRemoveList.empty()) - { - os << " measIdToRemoveList: " ; - std::list auxList = m_measConfig.measIdToRemoveList; - std::list::iterator it = auxList.begin (); - for ( ; it != auxList.end(); it++) + os << " reportConfigToRemoveList: "; + std::list auxList = m_measConfig.reportConfigToRemoveList; + std::list::iterator it = auxList.begin (); + for (; it != auxList.end (); it++) + { + os << (int) *it << ", "; + } + os << std::endl; + } + if (!m_measConfig.measIdToRemoveList.empty ()) { - os << (int) *it << ", "; - } - os << std::endl; - } - + os << " measIdToRemoveList: "; + std::list auxList = m_measConfig.measIdToRemoveList; + std::list::iterator it = auxList.begin (); + for (; it != auxList.end (); it++) + { + os << (int) *it << ", "; + } + os << std::endl; + } + os << " haveQuantityConfig: " << m_measConfig.haveQuantityConfig << std::endl; if (m_measConfig.haveQuantityConfig) - { - os << " filterCoefficientRSRP: " << (int)m_measConfig.quantityConfig.filterCoefficientRSRP << std::endl; - os << " filterCoefficientRSRQ:" << (int)m_measConfig.quantityConfig.filterCoefficientRSRQ << std::endl; - } - + { + os << " filterCoefficientRSRP: " << (int)m_measConfig.quantityConfig.filterCoefficientRSRP << std::endl; + os << " filterCoefficientRSRQ:" << (int)m_measConfig.quantityConfig.filterCoefficientRSRQ << std::endl; + } + os << " haveMeasGapConfig: " << m_measConfig.haveMeasGapConfig << std::endl; if (m_measConfig.haveMeasGapConfig) - { - os << " measGapConfig.type: " << m_measConfig.measGapConfig.type << std::endl; - os << " measGapConfig.gap (gap0/1,value): (" << m_measConfig.measGapConfig.gapOffsetChoice - << "," << (int) m_measConfig.measGapConfig.gapOffsetValue << ")" << std::endl; - } - + { + os << " measGapConfig.type: " << m_measConfig.measGapConfig.type << std::endl; + os << " measGapConfig.gap (gap0/1,value): (" << m_measConfig.measGapConfig.gapOffsetChoice + << "," << (int) m_measConfig.measGapConfig.gapOffsetValue << ")" << std::endl; + } + os << " haveSmeasure: " << m_measConfig.haveSmeasure << std::endl; if (m_measConfig.haveSmeasure) - { - os << " sMeasure: " << (int) m_measConfig.sMeasure << std::endl; - } + { + os << " sMeasure: " << (int) m_measConfig.sMeasure << std::endl; + } os << " haveSpeedStatePars: " << m_measConfig.haveSpeedStatePars << std::endl; if (m_measConfig.haveSpeedStatePars) - { - os << " speedStatePars.type: " << m_measConfig.speedStatePars.type << std::endl; - os << " speedStatePars.mobilityStateParameters.tEvaluation: " << (int)m_measConfig.speedStatePars.mobilityStateParameters.tEvaluation << std::endl; - os << " speedStatePars.mobilityStateParameters.tHystNormal: " << (int)m_measConfig.speedStatePars.mobilityStateParameters.tHystNormal << std::endl; - os << " speedStatePars.mobilityStateParameters.nCellChangeMedium: " << (int)m_measConfig.speedStatePars.mobilityStateParameters.nCellChangeMedium << std::endl; - os << " speedStatePars.mobilityStateParameters.nCellChangeHigh: " << (int)m_measConfig.speedStatePars.mobilityStateParameters.nCellChangeHigh << std::endl; - os << " speedStatePars.timeToTriggerSf.sfMedium: " << (int)m_measConfig.speedStatePars.timeToTriggerSf.sfMedium << std::endl; - os << " speedStatePars.timeToTriggerSf.sfHigh: " << (int)m_measConfig.speedStatePars.timeToTriggerSf.sfHigh << std::endl; - } + { + os << " speedStatePars.type: " << m_measConfig.speedStatePars.type << std::endl; + os << " speedStatePars.mobilityStateParameters.tEvaluation: " << (int)m_measConfig.speedStatePars.mobilityStateParameters.tEvaluation << std::endl; + os << " speedStatePars.mobilityStateParameters.tHystNormal: " << (int)m_measConfig.speedStatePars.mobilityStateParameters.tHystNormal << std::endl; + os << " speedStatePars.mobilityStateParameters.nCellChangeMedium: " << (int)m_measConfig.speedStatePars.mobilityStateParameters.nCellChangeMedium << std::endl; + os << " speedStatePars.mobilityStateParameters.nCellChangeHigh: " << (int)m_measConfig.speedStatePars.mobilityStateParameters.nCellChangeHigh << std::endl; + os << " speedStatePars.timeToTriggerSf.sfMedium: " << (int)m_measConfig.speedStatePars.timeToTriggerSf.sfMedium << std::endl; + os << " speedStatePars.timeToTriggerSf.sfHigh: " << (int)m_measConfig.speedStatePars.timeToTriggerSf.sfHigh << std::endl; + } } - + os << "haveMobilityControlInfo: " << m_haveMobilityControlInfo << std::endl; if (m_haveMobilityControlInfo) { diff --git a/src/lte/test/test-asn1-encoding.cc b/src/lte/test/test-asn1-encoding.cc index 7a6f95944..8997f396f 100644 --- a/src/lte/test/test-asn1-encoding.cc +++ b/src/lte/test/test-asn1-encoding.cc @@ -46,7 +46,7 @@ public: pkt->CopyData (buffer, psize); for (uint32_t i = 0; i < psize; i++) { - sprintf (&sbuffer[i*3],"%02x ",buffer[i]); + sprintf (&sbuffer[i * 3],"%02x ",buffer[i]); } return std::string (sbuffer); } @@ -95,12 +95,12 @@ public: virtual void DoRun (void) = 0; LteRrcSap::RadioResourceConfigDedicated CreateRadioResourceConfigDedicated (); void AssertEqualRadioResourceConfigDedicated (LteRrcSap::RadioResourceConfigDedicated rrcd1, LteRrcSap::RadioResourceConfigDedicated rrcd2); - + protected: Ptr packet; }; -RrcHeaderTestCase :: RrcHeaderTestCase(std::string s) : TestCase(s) +RrcHeaderTestCase :: RrcHeaderTestCase (std::string s) : TestCase (s) { } @@ -254,7 +254,7 @@ RrcConnectionRequestTestCase::RrcConnectionRequestTestCase () : RrcHeaderTestCas void RrcConnectionRequestTestCase::DoRun (void) { - packet = Create(); + packet = Create (); NS_LOG_DEBUG ("============= RrcConnectionRequestTestCase ==========="); LteRrcSap::RrcConnectionRequest msg; @@ -282,7 +282,7 @@ RrcConnectionRequestTestCase::DoRun (void) // Check that the destination and source headers contain the same values NS_TEST_ASSERT_MSG_EQ (source.GetMmec (),destination.GetMmec (), "Different m_mmec!"); NS_TEST_ASSERT_MSG_EQ (source.GetMtmsi (),destination.GetMtmsi (), "Different m_mTmsi!"); - + packet = 0; } @@ -301,7 +301,7 @@ RrcConnectionSetupTestCase::RrcConnectionSetupTestCase () : RrcHeaderTestCase (" void RrcConnectionSetupTestCase::DoRun (void) { - packet = Create(); + packet = Create (); NS_LOG_DEBUG ("============= RrcConnectionSetupTestCase ==========="); LteRrcSap::RrcConnectionSetup msg; @@ -331,7 +331,7 @@ RrcConnectionSetupTestCase::DoRun (void) NS_TEST_ASSERT_MSG_EQ (source.GetRrcTransactionIdentifier (),destination.GetRrcTransactionIdentifier (), "RrcTransactionIdentifier"); AssertEqualRadioResourceConfigDedicated (source.GetRadioResourceConfigDedicated (),destination.GetRadioResourceConfigDedicated ()); - + packet = 0; } @@ -350,7 +350,7 @@ RrcConnectionSetupCompleteTestCase::RrcConnectionSetupCompleteTestCase () : RrcH void RrcConnectionSetupCompleteTestCase::DoRun (void) { - packet = Create(); + packet = Create (); NS_LOG_DEBUG ("============= RrcConnectionSetupCompleteTestCase ==========="); LteRrcSap::RrcConnectionSetupCompleted msg; @@ -377,7 +377,7 @@ RrcConnectionSetupCompleteTestCase::DoRun (void) // Check that the destination and source headers contain the same values NS_TEST_ASSERT_MSG_EQ (source.GetRrcTransactionIdentifier (),destination.GetRrcTransactionIdentifier (), "RrcTransactionIdentifier"); - + packet = 0; } @@ -397,7 +397,7 @@ RrcConnectionReconfigurationCompleteTestCase::RrcConnectionReconfigurationComple void RrcConnectionReconfigurationCompleteTestCase::DoRun (void) { - packet = Create(); + packet = Create (); NS_LOG_DEBUG ("============= RrcConnectionReconfigurationCompleteTestCase ==========="); LteRrcSap::RrcConnectionReconfigurationCompleted msg; @@ -424,7 +424,7 @@ RrcConnectionReconfigurationCompleteTestCase::DoRun (void) // Check that the destination and source headers contain the same values NS_TEST_ASSERT_MSG_EQ (source.GetRrcTransactionIdentifier (),destination.GetRrcTransactionIdentifier (), "RrcTransactionIdentifier"); - + packet = 0; } @@ -444,26 +444,26 @@ RrcConnectionReconfigurationTestCase::RrcConnectionReconfigurationTestCase () void RrcConnectionReconfigurationTestCase::DoRun (void) { - packet = Create(); + packet = Create (); NS_LOG_DEBUG ("============= RrcConnectionReconfigurationTestCase ==========="); LteRrcSap::RrcConnectionReconfiguration msg; msg.rrcTransactionIdentifier = 2; msg.haveMeasConfig = true; - + msg.measConfig.haveQuantityConfig = true; msg.measConfig.quantityConfig.filterCoefficientRSRP = 8; msg.measConfig.quantityConfig.filterCoefficientRSRQ = 7; - + msg.measConfig.haveMeasGapConfig = true; msg.measConfig.measGapConfig.type = LteRrcSap::MeasGapConfig::SETUP; msg.measConfig.measGapConfig.gapOffsetChoice = LteRrcSap::MeasGapConfig::gp0; - msg.measConfig.measGapConfig.gapOffsetValue = 21; - + msg.measConfig.measGapConfig.gapOffsetValue = 21; + msg.measConfig.haveSmeasure = true; msg.measConfig.sMeasure = 57; - + msg.measConfig.haveSpeedStatePars = true; msg.measConfig.speedStatePars.type = LteRrcSap::SpeedStatePars::SETUP; msg.measConfig.speedStatePars.mobilityStateParameters.tEvaluation = 240; @@ -472,21 +472,21 @@ RrcConnectionReconfigurationTestCase::DoRun (void) msg.measConfig.speedStatePars.mobilityStateParameters.nCellChangeHigh = 13; msg.measConfig.speedStatePars.timeToTriggerSf.sfMedium = 25; msg.measConfig.speedStatePars.timeToTriggerSf.sfHigh = 75; - - msg.measConfig.measObjectToRemoveList.push_back(23); - msg.measConfig.measObjectToRemoveList.push_back(13); - - msg.measConfig.reportConfigToRemoveList.push_back(7); - msg.measConfig.reportConfigToRemoveList.push_back(16); - msg.measConfig.measIdToRemoveList.push_back(4); - msg.measConfig.measIdToRemoveList.push_back(18); + msg.measConfig.measObjectToRemoveList.push_back (23); + msg.measConfig.measObjectToRemoveList.push_back (13); + + msg.measConfig.reportConfigToRemoveList.push_back (7); + msg.measConfig.reportConfigToRemoveList.push_back (16); + + msg.measConfig.measIdToRemoveList.push_back (4); + msg.measConfig.measIdToRemoveList.push_back (18); // TODO: Test the following: // std::list measObjectToAddModList; // std::list reportConfigToAddModList; // std::list measIdToAddModList; - + msg.haveMobilityControlInfo = true; msg.mobilityControlInfo.targetPhysCellId = 4; msg.mobilityControlInfo.haveCarrierFreq = true; @@ -575,7 +575,7 @@ RrcConnectionReconfigurationTestCase::DoRun (void) { AssertEqualRadioResourceConfigDedicated (source.GetRadioResourceConfigDedicated (), destination.GetRadioResourceConfigDedicated ()); } - + packet = 0; } @@ -594,7 +594,7 @@ HandoverPreparationInfoTestCase::HandoverPreparationInfoTestCase () : RrcHeaderT void HandoverPreparationInfoTestCase::DoRun (void) { - packet = Create(); + packet = Create (); NS_LOG_DEBUG ("============= HandoverPreparationInfoTestCase ==========="); LteRrcSap::HandoverPreparationInfo msg; @@ -609,12 +609,12 @@ HandoverPreparationInfoTestCase::DoRun (void) msg.asConfig.sourceSystemInformationBlockType1.cellAccessRelatedInfo.csgIdentity = 4; msg.asConfig.sourceSystemInformationBlockType1.cellAccessRelatedInfo.plmnIdentityInfo.plmnIdentity = 123; - msg.asConfig.sourceSystemInformationBlockType2.freqInfo.ulBandwidth=100; - msg.asConfig.sourceSystemInformationBlockType2.freqInfo.ulCarrierFreq=10; + msg.asConfig.sourceSystemInformationBlockType2.freqInfo.ulBandwidth = 100; + msg.asConfig.sourceSystemInformationBlockType2.freqInfo.ulCarrierFreq = 10; msg.asConfig.sourceSystemInformationBlockType2.radioResourceConfigCommon.rachConfigCommon.preambleInfo.numberOfRaPreambles = 4; msg.asConfig.sourceSystemInformationBlockType2.radioResourceConfigCommon.rachConfigCommon.raSupervisionInfo.preambleTransMax = 3; msg.asConfig.sourceSystemInformationBlockType2.radioResourceConfigCommon.rachConfigCommon.raSupervisionInfo.raResponseWindowSize = 6; - + HandoverPreparationInfoHeader source; source.SetMessage (msg); @@ -644,8 +644,8 @@ HandoverPreparationInfoTestCase::DoRun (void) NS_TEST_ASSERT_MSG_EQ (source.GetAsConfig ().sourceSystemInformationBlockType1.cellAccessRelatedInfo.cellIdentity, destination.GetAsConfig ().sourceSystemInformationBlockType1.cellAccessRelatedInfo.cellIdentity, "cellIdentity"); NS_TEST_ASSERT_MSG_EQ (source.GetAsConfig ().sourceSystemInformationBlockType1.cellAccessRelatedInfo.csgIdentity, destination.GetAsConfig ().sourceSystemInformationBlockType1.cellAccessRelatedInfo.csgIdentity, "csgIdentity"); NS_TEST_ASSERT_MSG_EQ (source.GetAsConfig ().sourceDlCarrierFreq, destination.GetAsConfig ().sourceDlCarrierFreq, "sourceDlCarrierFreq"); - - packet = 0; + + packet = 0; } // --------------------------- CLASS RrcConnectionReestablishmentRequestTestCase ----------------------------- @@ -663,7 +663,7 @@ RrcConnectionReestablishmentRequestTestCase::RrcConnectionReestablishmentRequest void RrcConnectionReestablishmentRequestTestCase::DoRun (void) { - packet = Create(); + packet = Create (); NS_LOG_DEBUG ("============= RrcConnectionReestablishmentRequestTestCase ==========="); LteRrcSap::RrcConnectionReestablishmentRequest msg; @@ -694,7 +694,7 @@ RrcConnectionReestablishmentRequestTestCase::DoRun (void) NS_TEST_ASSERT_MSG_EQ (source.GetUeIdentity ().cRnti, destination.GetUeIdentity ().cRnti, "cRnti"); NS_TEST_ASSERT_MSG_EQ (source.GetUeIdentity ().physCellId, destination.GetUeIdentity ().physCellId, "physCellId"); NS_TEST_ASSERT_MSG_EQ (source.GetReestablishmentCause (),destination.GetReestablishmentCause (), "ReestablishmentCause"); - + packet = 0; } @@ -713,7 +713,7 @@ RrcConnectionReestablishmentTestCase::RrcConnectionReestablishmentTestCase () : void RrcConnectionReestablishmentTestCase::DoRun (void) { - packet = Create(); + packet = Create (); NS_LOG_DEBUG ("============= RrcConnectionReestablishmentTestCase ==========="); LteRrcSap::RrcConnectionReestablishment msg; @@ -742,7 +742,7 @@ RrcConnectionReestablishmentTestCase::DoRun (void) // Check that the destination and source headers contain the same values NS_TEST_ASSERT_MSG_EQ (source.GetRrcTransactionIdentifier (), destination.GetRrcTransactionIdentifier (), "rrcTransactionIdentifier"); AssertEqualRadioResourceConfigDedicated (source.GetRadioResourceConfigDedicated (),destination.GetRadioResourceConfigDedicated ()); - + packet = 0; } @@ -761,7 +761,7 @@ RrcConnectionReestablishmentCompleteTestCase::RrcConnectionReestablishmentComple void RrcConnectionReestablishmentCompleteTestCase::DoRun (void) { - packet = Create(); + packet = Create (); NS_LOG_DEBUG ("============= RrcConnectionReestablishmentCompleteTestCase ==========="); LteRrcSap::RrcConnectionReestablishmentComplete msg; @@ -788,7 +788,7 @@ RrcConnectionReestablishmentCompleteTestCase::DoRun (void) // Check that the destination and source headers contain the same values NS_TEST_ASSERT_MSG_EQ (source.GetRrcTransactionIdentifier (), destination.GetRrcTransactionIdentifier (), "rrcTransactionIdentifier"); - + packet = 0; } @@ -807,7 +807,7 @@ RrcConnectionRejectTestCase::RrcConnectionRejectTestCase () : RrcHeaderTestCase void RrcConnectionRejectTestCase::DoRun (void) { - packet = Create(); + packet = Create (); NS_LOG_DEBUG ("============= RrcConnectionRejectTestCase ==========="); LteRrcSap::RrcConnectionReject msg; @@ -834,7 +834,7 @@ RrcConnectionRejectTestCase::DoRun (void) // Check that the destination and source headers contain the same values NS_TEST_ASSERT_MSG_EQ (source.GetMessage ().waitTime, destination.GetMessage ().waitTime, "Different waitTime!"); - + packet = 0; } @@ -853,7 +853,7 @@ MeasurementReportTestCase::MeasurementReportTestCase () : RrcHeaderTestCase ("Te void MeasurementReportTestCase::DoRun (void) { - packet = Create(); + packet = Create (); NS_LOG_DEBUG ("============= MeasurementReportTestCase ==========="); LteRrcSap::MeasurementReport msg; @@ -945,7 +945,7 @@ MeasurementReportTestCase::DoRun (void) } } - packet = 0; + packet = 0; } // --------------------------- CLASS Asn1EncodingSuite ----------------------------- @@ -959,17 +959,17 @@ Asn1EncodingSuite::Asn1EncodingSuite () : TestSuite ("test-asn1-encoding", UNIT) { NS_LOG_FUNCTION (this); - AddTestCase (new RrcConnectionRequestTestCase()); - AddTestCase (new RrcConnectionSetupTestCase()); - AddTestCase (new RrcConnectionSetupCompleteTestCase()); - AddTestCase (new RrcConnectionReconfigurationCompleteTestCase()); - AddTestCase (new RrcConnectionReconfigurationTestCase()); - AddTestCase (new HandoverPreparationInfoTestCase()); - AddTestCase (new RrcConnectionReestablishmentRequestTestCase()); - AddTestCase (new RrcConnectionReestablishmentTestCase()); - AddTestCase (new RrcConnectionReestablishmentCompleteTestCase()); - AddTestCase (new RrcConnectionRejectTestCase()); - AddTestCase (new MeasurementReportTestCase()); + AddTestCase (new RrcConnectionRequestTestCase ()); + AddTestCase (new RrcConnectionSetupTestCase ()); + AddTestCase (new RrcConnectionSetupCompleteTestCase ()); + AddTestCase (new RrcConnectionReconfigurationCompleteTestCase ()); + AddTestCase (new RrcConnectionReconfigurationTestCase ()); + AddTestCase (new HandoverPreparationInfoTestCase ()); + AddTestCase (new RrcConnectionReestablishmentRequestTestCase ()); + AddTestCase (new RrcConnectionReestablishmentTestCase ()); + AddTestCase (new RrcConnectionReestablishmentCompleteTestCase ()); + AddTestCase (new RrcConnectionRejectTestCase ()); + AddTestCase (new MeasurementReportTestCase ()); } Asn1EncodingSuite asn1EncodingSuite;