Attachment #3055 for bug #2754

View | Details | Raw Unified | Return to bug 2754
Collapse All | Expand All





void Asn1Header::SerializeInteger (int n, int nmin, int nmax) const
{
  NS_ASSERT_MSG (nmin <= n && n <= nmax,
                 "Integer " << n << " is outside range [" << nmin << ", " << nmax << "]");
    {
      int aux = nmin;
      nmin = nmax;
      nmax = aux;
    }

  // Clause 11.5.3 ITU-T X.691
  int range = nmax - nmin + 1;

(-)a/src/lte/model/lte-enb-rrc.cc (-2 / +4 lines)

Lines 235-241	Link Here

235

    m_srb1->m_rlc = rlc;

235

    m_srb1->m_rlc = rlc;

236

    m_srb1->m_pdcp = pdcp;

236

    m_srb1->m_pdcp = pdcp;

237

    m_srb1->m_srbIdentity = 1;

237

    m_srb1->m_srbIdentity = 1;

238

    m_srb1->m_logicalChannelConfig.priority = 0;

238

    m_srb1->m_logicalChannelConfig.priority = 1;

239

    m_srb1->m_logicalChannelConfig.prioritizedBitRateKbps = 100;

239

    m_srb1->m_logicalChannelConfig.prioritizedBitRateKbps = 100;

240

    m_srb1->m_logicalChannelConfig.bucketSizeDurationMs = 100;

240

    m_srb1->m_logicalChannelConfig.bucketSizeDurationMs = 100;

241

    m_srb1->m_logicalChannelConfig.logicalChannelGroup = 0;

241

    m_srb1->m_logicalChannelConfig.logicalChannelGroup = 0;

Lines 1310-1316	Link Here

1310

uint8_t

1310

uint8_t

1311

UeManager::GetNewRrcTransactionIdentifier ()

1311

UeManager::GetNewRrcTransactionIdentifier ()

1312

1313

  return ++m_lastRrcTransactionIdentifier;

1313

  ++m_lastRrcTransactionIdentifier;

1314

  m_lastRrcTransactionIdentifier %= 4;

1315

  return m_lastRrcTransactionIdentifier;

1314

1316

1315

1317

1316

uint8_t

1318

uint8_t





NS_LOG_COMPONENT_DEFINE ("RrcHeader");


//////////////////// RrcAsn1Header class ///////////////////////////////
RrcAsn1Header::RrcAsn1Header ()
{

  return m_messageType;
}

int
RrcAsn1Header::BandwidthToEnum (uint8_t bandwidth) const
{
  int n;
  switch (bandwidth)
    {
      case 6: n = 0; break;
      case 15: n = 1; break;
      case 25: n = 2; break;
      case 50: n = 3; break;
      case 75: n = 4; break;
      case 100: n = 5; break;
      default:
        NS_FATAL_ERROR ("Wrong bandwidth: " << (uint16_t) bandwidth);
    }
  return n;
}

uint8_t
RrcAsn1Header::EnumToBandwidth (int n) const
{
  uint8_t bw;
  switch (n)
    {
      case 0: bw = 6; break;
      case 1: bw = 15; break;
      case 2: bw = 25; break;
      case 3: bw = 50; break;
      case 4: bw = 75; break;
      case 5: bw = 100; break;
      default:
        NS_FATAL_ERROR ("Wrong enum value for bandwidth: " << n);
    }
  return bw;
}

void
RrcAsn1Header::SerializeDrbToAddModList (std::list<LteRrcSap::DrbToAddMod> drbToAddModList) const
{

  SerializeSequence (std::bitset<0> (0),false);
  SerializeInteger (0,-126,24); // p0-NominalPUSCH
  SerializeEnum (8,0); // alpha
  SerializeInteger (-110,-127,-96); // p0-NominalPUCCH
  SerializeSequence (std::bitset<0> (0),false); // deltaFList-PUCCH
  SerializeEnum (3,0); // deltaF-PUCCH-Format1
  SerializeEnum (3,0); // deltaF-PUCCH-Format1b

  // freqInfo
  SerializeSequence (std::bitset<2> (3),false);
  SerializeInteger ((int) systemInformationBlockType2.freqInfo.ulCarrierFreq, 0, MAX_EARFCN);
  SerializeEnum (6, BandwidthToEnum (systemInformationBlockType2.freqInfo.ulBandwidth));
    {
    case 6:
      SerializeEnum (6,0);
      break;
    case 15:
      SerializeEnum (6,1);
      break;
    case 25:
      SerializeEnum (6,2);
      break;
    case 50:
      SerializeEnum (6,3);
      break;
    case 75:
      SerializeEnum (6,4);
      break;
    case 100:
      SerializeEnum (6,5);
      break;
    default:
      SerializeEnum (6,0);
    }

  SerializeInteger (29,1,32); // additionalSpectrumEmission
  // timeAlignmentTimerCommon

          SerializeInteger (it->measObjectEutra.carrierFreq, 0, MAX_EARFCN);

          // Serialize  allowedMeasBandwidth
          SerializeEnum (6, BandwidthToEnum (it->measObjectEutra.allowedMeasBandwidth));
            {
            case 6:
              SerializeEnum (6,0);
              break;
            case 15:
              SerializeEnum (6,1);
              break;
            case 25:
              SerializeEnum (6,2);
              break;
            case 50:
              SerializeEnum (6,3);
              break;
            case 75:
              SerializeEnum (6,4);
              break;
            case 100:
              SerializeEnum (6,5);
              break;
            default:
              SerializeEnum (6,0);
            }

          SerializeBoolean (it->measObjectEutra.presenceAntennaPort1);
          SerializeBitstring (std::bitset<2> (it->measObjectEutra.neighCellConfig));

    {
      // Deserialize ul-Bandwidth
      bIterator = DeserializeEnum (6, &n, bIterator);
      systemInformationBlockType2->freqInfo.ulBandwidth = EnumToBandwidth (n);
        {
        case 0:
          systemInformationBlockType2->freqInfo.ulBandwidth = 6;
          break;
        case 1:
          systemInformationBlockType2->freqInfo.ulBandwidth = 15;
          break;
        case 2:
          systemInformationBlockType2->freqInfo.ulBandwidth = 25;
          break;
        case 3:
          systemInformationBlockType2->freqInfo.ulBandwidth = 50;
          break;
        case 4:
          systemInformationBlockType2->freqInfo.ulBandwidth = 75;
          break;
        case 5:
          systemInformationBlockType2->freqInfo.ulBandwidth = 100;
          break;
        default:
          systemInformationBlockType2->freqInfo.ulBandwidth = 6;
        }
    }

  // additionalSpectrumEmission


              // allowedMeasBandwidth
              bIterator = DeserializeEnum (6, &n, bIterator);
              elem.measObjectEutra.allowedMeasBandwidth = EnumToBandwidth (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:
                default:
                  elem.measObjectEutra.allowedMeasBandwidth = 100;
                  break;
                }

              // presenceAntennaPort1
              bIterator = DeserializeBoolean (&elem.measObjectEutra.presenceAntennaPort1, bIterator);

    }
  return bIterator;
}

//////////////////// RrcConnectionRequest class ////////////////////////

// Constructor

          SerializeSequence (std::bitset<1> (1),false);

          // Serialize dl-Bandwidth
          SerializeEnum (16, BandwidthToEnum (m_mobilityControlInfo.carrierBandwidth.dlBandwidth));
            {
            case 6:
              SerializeEnum (16,0);
              break;
            case 15:
              SerializeEnum (16,1);
              break;
            case 25:
              SerializeEnum (16,2);
              break;
            case 50:
              SerializeEnum (16,3);
              break;
            case 75:
              SerializeEnum (16,4);
              break;
            case 100:
              SerializeEnum (16,5);
              break;
            default:
              SerializeEnum (16,6);
            }

          // Serialize ul-Bandwidth
          SerializeEnum (16, BandwidthToEnum (m_mobilityControlInfo.carrierBandwidth.ulBandwidth));
            {
            case 6:
              SerializeEnum (16,0);
              break;
            case 15:
              SerializeEnum (16,1);
              break;
            case 25:
              SerializeEnum (16,2);
              break;
            case 50:
              SerializeEnum (16,3);
              break;
            case 75:
              SerializeEnum (16,4);
              break;
            case 100:
              SerializeEnum (16,5);
              break;
            default:
              SerializeEnum (16,6);
            }
        }

      // Serialize t304

                  bIterator = DeserializeSequence (&ulBandwidthPresent,false,bIterator);

                  bIterator = DeserializeEnum (16,&n,bIterator);
                  m_mobilityControlInfo.carrierBandwidth.dlBandwidth = EnumToBandwidth (n);
                    {
                    case 0:
                      m_mobilityControlInfo.carrierBandwidth.dlBandwidth = 6;
                      break;
                    case 1:
                      m_mobilityControlInfo.carrierBandwidth.dlBandwidth = 15;
                      break;
                    case 2:
                      m_mobilityControlInfo.carrierBandwidth.dlBandwidth = 25;
                      break;
                    case 3:
                      m_mobilityControlInfo.carrierBandwidth.dlBandwidth = 50;
                      break;
                    case 4:
                      m_mobilityControlInfo.carrierBandwidth.dlBandwidth = 75;
                      break;
                    case 5:
                      m_mobilityControlInfo.carrierBandwidth.dlBandwidth = 100;
                      break;
                    case 6:
                      m_mobilityControlInfo.carrierBandwidth.dlBandwidth = 0;
                      break;
                    }

                  if (ulBandwidthPresent[0])
                    {
                      bIterator = DeserializeEnum (16,&n,bIterator);
                      m_mobilityControlInfo.carrierBandwidth.ulBandwidth = EnumToBandwidth (n);
                        {
                        case 0:
                          m_mobilityControlInfo.carrierBandwidth.ulBandwidth = 6;
                          break;
                        case 1:
                          m_mobilityControlInfo.carrierBandwidth.ulBandwidth = 15;
                          break;
                        case 2:
                          m_mobilityControlInfo.carrierBandwidth.ulBandwidth = 25;
                          break;
                        case 3:
                          m_mobilityControlInfo.carrierBandwidth.ulBandwidth = 50;
                          break;
                        case 4:
                          m_mobilityControlInfo.carrierBandwidth.ulBandwidth = 75;
                          break;
                        case 5:
                          m_mobilityControlInfo.carrierBandwidth.ulBandwidth = 100;
                          break;
                        case 6:
                          m_mobilityControlInfo.carrierBandwidth.ulBandwidth = 0;
                          break;
                        }
                    }
                }



  // Serialize sourceMasterInformationBlock
  SerializeSequence (std::bitset<0> (),false);
  SerializeEnum (6, BandwidthToEnum (m_asConfig.sourceMasterInformationBlock.dlBandwidth)); // dl-Bandwidth
  SerializeSequence (std::bitset<0> (),false); // phich-Config sequence
  SerializeEnum (2,0); // phich-Duration
  SerializeEnum (4,0); // phich-Resource

              // Deserialize sourceMasterInformationBlock
              bIterator = DeserializeSequence (&bitset0,false,bIterator);
              bIterator = DeserializeEnum (6,&n,bIterator); // dl-Bandwidth
              m_asConfig.sourceMasterInformationBlock.dlBandwidth = EnumToBandwidth (n);

              // phich-Config
              bIterator = DeserializeSequence (&bitset0,false,bIterator);




  uint32_t Deserialize (Buffer::Iterator bIterator) = 0;
  virtual void PreSerialize (void) const = 0;


  // Auxiliary functions
  /**
   * Convert from bandwidth (in RBs) to ENUMERATED value
   *
   * \param bandwidth Bandwith in RBs: 6, 15, 25, 50, 75, 100
   * \returns ENUMERATED value: 0, 1, 2, 3, 4, 5
   */
  int BandwidthToEnum (uint8_t bandwidth) const;
  /**
   * Convert from ENUMERATED value to bandwidth (in RBs)
   *
   * \param n ENUMERATED value: 0, 1, 2, 3, 4, 5
   * \returns bandwidth Bandwith in RBs: 6, 15, 25, 50, 75, 100
   */
  uint8_t EnumToBandwidth (int n) const;


  // Serialization functions
  /**
   * Serialize SRB to add mod list function

(-)a/src/lte/model/lte-rrc-sap.h (-1 / +1 lines)

Lines 59-65	Link Here

  virtual ~LteRrcSap ();

  virtual ~LteRrcSap ();

  /// Constraint values

  /// Constraint values

  static const uint8_t MaxReportCells = 255;

  static const uint8_t MaxReportCells = 8;

  // Information Elements

  // Information Elements

  /// PlmnIdentityInfo structure

  /// PlmnIdentityInfo structure

(-)a/src/lte/test/test-asn1-encoding.cc (-1 / +1 lines)

Lines 737-743	Link Here

737

  msg.asConfig.sourceDlCarrierFreq = 3;

737

  msg.asConfig.sourceDlCarrierFreq = 3;

738

  msg.asConfig.sourceUeIdentity = 11;

738

  msg.asConfig.sourceUeIdentity = 11;

739

  msg.asConfig.sourceRadioResourceConfig = CreateRadioResourceConfigDedicated ();

739

  msg.asConfig.sourceRadioResourceConfig = CreateRadioResourceConfigDedicated ();

740

  msg.asConfig.sourceMasterInformationBlock.dlBandwidth = 3;

740

  msg.asConfig.sourceMasterInformationBlock.dlBandwidth = 50;

741

  msg.asConfig.sourceMasterInformationBlock.systemFrameNumber = 1;

741

  msg.asConfig.sourceMasterInformationBlock.systemFrameNumber = 1;

742

743

  msg.asConfig.sourceSystemInformationBlockType1.cellAccessRelatedInfo.csgIndication = true;

743

  msg.asConfig.sourceSystemInformationBlockType1.cellAccessRelatedInfo.csgIndication = true;

Return to bug 2754