Attachment #1818 for bug #1868

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

(-)a/examples/routing/manet-routing-compare.cc (-1 / +1 lines)

Lines 343-349	Link Here

343

  onoff1.SetAttribute ("OnTime", StringValue ("ns3::ConstantRandomVariable[Constant=1.0]"));

343

  onoff1.SetAttribute ("OnTime", StringValue ("ns3::ConstantRandomVariable[Constant=1.0]"));

344

  onoff1.SetAttribute ("OffTime", StringValue ("ns3::ConstantRandomVariable[Constant=0.0]"));

344

  onoff1.SetAttribute ("OffTime", StringValue ("ns3::ConstantRandomVariable[Constant=0.0]"));

345

346

  for (int i = 0; i <= nSinks - 1; i++)

346

  for (int i = 0; nSinks - i > 0; i++)

347

348

      Ptr<Socket> sink = SetupPacketReceive (adhocInterfaces.GetAddress (i), adhocNodes.Get (i));

348

      Ptr<Socket> sink = SetupPacketReceive (adhocInterfaces.GetAddress (i), adhocNodes.Get (i));

349

(-)a/src/dsr/model/dsr-options.cc (-1 / +1 lines)

Lines 1307-1313	Link Here

1307

                    m_dropTrace (packet);

1307

                    m_dropTrace (packet);

1308

                    return 0;

1308

                    return 0;

1309

1310

                if (numberAddress - segsLeft - 2 < 0) // The index is invalid

1310

                if (numberAddress - segsLeft < 2) // The index is invalid

1311

1312

                      NS_LOG_LOGIC ("Malformed header. Drop!");

1312

                      NS_LOG_LOGIC ("Malformed header. Drop!");

1313

                      m_dropTrace (packet);

1313

                      m_dropTrace (packet);

(-)a/src/internet/model/icmpv6-header.cc (-1 / +1 lines)

Lines 1895-1901	Link Here

1895

1896

  SetType (i.ReadU8 ());

1896

  SetType (i.ReadU8 ());

1897

  SetLength (i.ReadU8 ());

1897

  SetLength (i.ReadU8 ());

1898

  NS_ASSERT (GetLength () * 8 - 2 <= 32);

1898

  NS_ASSERT (GetLength () < 5);

1899

  i.Read (mac, (GetLength () * 8) - 2);

1899

  i.Read (mac, (GetLength () * 8) - 2);

1900

1901

  m_addr.CopyFrom (mac, (GetLength () * 8)-2);

1901

  m_addr.CopyFrom (mac, (GetLength () * 8)-2);

(-)a/src/internet/model/ipv4-header.cc (-1 / +1 lines)

Lines 246-252	Link Here

246

Ipv4Header::GetFragmentOffset (void) const

246

Ipv4Header::GetFragmentOffset (void) const

247

248

  NS_LOG_FUNCTION (this);

248

  NS_LOG_FUNCTION (this);

249

  if ((m_fragmentOffset+m_payloadSize+5*4) > 65535)

249

  if ((m_fragmentOffset+m_payloadSize) > 65535 - 5*4)

250

251

      NS_LOG_WARN("Fragment will exceed the maximum packet size once reassembled");

251

      NS_LOG_WARN("Fragment will exceed the maximum packet size once reassembled");

252

(-)a/src/lte/model/fdbet-ff-mac-scheduler.cc (-1 / +4 lines)

Lines 1543-1549	Link Here

1543

      uldci.m_rbLen = rbPerFlow;

1543

      uldci.m_rbLen = rbPerFlow;

1544

      bool allocated = false;

1544

      bool allocated = false;

1545

      NS_LOG_INFO (this << " RB Allocated " << rbAllocated << " rbPerFlow " << rbPerFlow << " flows " << nflows);

1545

      NS_LOG_INFO (this << " RB Allocated " << rbAllocated << " rbPerFlow " << rbPerFlow << " flows " << nflows);

1546

      while ((!allocated)&&((rbAllocated + rbPerFlow - 1) < m_cschedCellConfig.m_ulBandwidth) && (rbPerFlow != 0))

1546

      while ( (!allocated) &&

1547

              (rbAllocated + rbPerFlow - m_cschedCellConfig.m_ulBandwidth < 1) &&

1548

              (rbPerFlow != 0)

1549

1547

1550

1548

          // check availability

1551

          // check availability

1549

          bool free = true;

1552

          bool free = true;

(-)a/src/lte/model/fdmt-ff-mac-scheduler.cc (-1 / +4 lines)

Lines 1522-1528	Link Here

1522

      uldci.m_rbLen = rbPerFlow;

1522

      uldci.m_rbLen = rbPerFlow;

1523

      bool allocated = false;

1523

      bool allocated = false;

1524

      NS_LOG_INFO (this << " RB Allocated " << rbAllocated << " rbPerFlow " << rbPerFlow << " flows " << nflows);

1524

      NS_LOG_INFO (this << " RB Allocated " << rbAllocated << " rbPerFlow " << rbPerFlow << " flows " << nflows);

1525

      while ((!allocated)&&((rbAllocated + rbPerFlow - 1) < m_cschedCellConfig.m_ulBandwidth) && (rbPerFlow != 0))

1525

      while ( (!allocated) &&

1526

              (rbAllocated + rbPerFlow - m_cschedCellConfig.m_ulBandwidth < 1) &&

1527

              (rbPerFlow != 0)

1528

1526

1529

1527

          // check availability

1530

          // check availability

1528

          bool free = true;

1531

          bool free = true;

(-)a/src/lte/model/fdtbfq-ff-mac-scheduler.cc (-1 / +4 lines)

Lines 1775-1781	Link Here

1775

      uldci.m_rbLen = rbPerFlow;

1775

      uldci.m_rbLen = rbPerFlow;

1776

      bool allocated = false;

1776

      bool allocated = false;

1777

      NS_LOG_INFO (this << " RB Allocated " << rbAllocated << " rbPerFlow " << rbPerFlow << " flows " << nflows);

1777

      NS_LOG_INFO (this << " RB Allocated " << rbAllocated << " rbPerFlow " << rbPerFlow << " flows " << nflows);

1778

      while ((!allocated)&&((rbAllocated + rbPerFlow - 1) < m_cschedCellConfig.m_ulBandwidth) && (rbPerFlow != 0))

1778

      while ( (!allocated) &&

1779

              (rbAllocated + rbPerFlow - m_cschedCellConfig.m_ulBandwidth < 1) &&

1780

              (rbPerFlow != 0)

1781

1779

1782

1780

          // check availability

1783

          // check availability

1781

          bool free = true;

1784

          bool free = true;

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

Lines 1146-1152	Link Here

1146

1147

  NS_LOG_FUNCTION (this);

1147

  NS_LOG_FUNCTION (this);

1148

  const uint8_t MAX_DRB_ID = 32;

1148

  const uint8_t MAX_DRB_ID = 32;

1149

  for (uint8_t drbid = (m_lastAllocatedDrbid + 1) % MAX_DRB_ID;

1149

  for (int drbid = (m_lastAllocatedDrbid + 1) % MAX_DRB_ID;

1150

       drbid != m_lastAllocatedDrbid;

1150

       drbid != m_lastAllocatedDrbid;

1151

       drbid = (drbid + 1) % MAX_DRB_ID)

1151

       drbid = (drbid + 1) % MAX_DRB_ID)

1152

(-)a/src/lte/model/lte-mi-error-model.cc (-1 / +1 lines)

Lines 646-652	Link Here

646

  else

646

  else

647

648

      // second segmentation size: K- = maximum K in table such that K < K+

648

      // second segmentation size: K- = maximum K in table such that K < K+

649

      Kminus = cbSizeTable[KplusId-1 > 0 ? KplusId-1 : 0];

649

      Kminus = cbSizeTable[KplusId > 1 ? KplusId-1 : 0];

650

      deltaK = Kplus - Kminus;

650

      deltaK = Kplus - Kminus;

651

      Cminus = floor ((((double) C * Kplus) - (double)B1) / (double)deltaK);

651

      Cminus = floor ((((double) C * Kplus) - (double)B1) / (double)deltaK);

652

      Cplus = C - Cminus;

652

      Cplus = C - Cminus;

(-)a/src/lte/model/lte-rlc-sequence-number.h (-1 / +1 lines)

Lines 78-84	Link Here

  SequenceNumber10 operator++ (int)

  SequenceNumber10 operator++ (int)

    SequenceNumber10 retval (m_value);

    SequenceNumber10 retval (m_value);

    m_value = (m_value + 1) % 1024;

    m_value = ((uint32_t)m_value + 1) % 1024;

    return retval;

    return retval;

(-)a/src/lte/model/pf-ff-mac-scheduler.cc (-1 / +4 lines)

Lines 1566-1572	Link Here

1566

      uldci.m_rbLen = rbPerFlow;

1566

      uldci.m_rbLen = rbPerFlow;

1567

      bool allocated = false;

1567

      bool allocated = false;

1568

      NS_LOG_INFO (this << " RB Allocated " << rbAllocated << " rbPerFlow " << rbPerFlow << " flows " << nflows);

1568

      NS_LOG_INFO (this << " RB Allocated " << rbAllocated << " rbPerFlow " << rbPerFlow << " flows " << nflows);

1569

      while ((!allocated)&&((rbAllocated + rbPerFlow - 1) < m_cschedCellConfig.m_ulBandwidth) && (rbPerFlow != 0))

1569

      while ( (!allocated) &&

1570

              (rbAllocated + rbPerFlow - m_cschedCellConfig.m_ulBandwidth < 1) &&

1571

              (rbPerFlow != 0)

1572

1570

1573

1571

          // check availability

1574

          // check availability

1572

          bool free = true;

1575

          bool free = true;

(-)a/src/lte/model/pss-ff-mac-scheduler.cc (-1 / +4 lines)

Lines 1873-1879	Link Here

1873

      uldci.m_rbLen = rbPerFlow;

1873

      uldci.m_rbLen = rbPerFlow;

1874

      bool allocated = false;

1874

      bool allocated = false;

1875

      NS_LOG_INFO (this << " RB Allocated " << rbAllocated << " rbPerFlow " << rbPerFlow << " flows " << nflows);

1875

      NS_LOG_INFO (this << " RB Allocated " << rbAllocated << " rbPerFlow " << rbPerFlow << " flows " << nflows);

1876

      while ((!allocated)&&((rbAllocated + rbPerFlow - 1) < m_cschedCellConfig.m_ulBandwidth) && (rbPerFlow != 0))

1876

      while ( (!allocated) &&

1877

              (rbAllocated + rbPerFlow - m_cschedCellConfig.m_ulBandwidth < 1) &&

1878

              (rbPerFlow != 0)

1879

1877

1880

1878

          // check availability

1881

          // check availability

1879

          bool free = true;

1882

          bool free = true;

(-)a/src/lte/model/rr-ff-mac-scheduler.cc (-1 / +4 lines)

Lines 1403-1409	Link Here

1403

      uldci.m_rbLen = rbPerFlow;

1403

      uldci.m_rbLen = rbPerFlow;

1404

      bool allocated = false;

1404

      bool allocated = false;

1405

      NS_LOG_INFO (this << " RB Allocated " << rbAllocated << " rbPerFlow " << rbPerFlow << " flows " << nflows);

1405

      NS_LOG_INFO (this << " RB Allocated " << rbAllocated << " rbPerFlow " << rbPerFlow << " flows " << nflows);

1406

      while ((!allocated)&&((rbAllocated + rbPerFlow - 1) < m_cschedCellConfig.m_ulBandwidth) && (rbPerFlow != 0))

1406

      while ( (!allocated) &&

1407

              (rbAllocated + rbPerFlow - m_cschedCellConfig.m_ulBandwidth < 1) &&

1408

              (rbPerFlow != 0)

1409

1407

1410

1408

          // check availability

1411

          // check availability

1409

          bool free = true;

1412

          bool free = true;

(-)a/src/lte/model/tdbet-ff-mac-scheduler.cc (-1 / +4 lines)

Lines 1466-1472	Link Here

1466

      uldci.m_rbLen = rbPerFlow;

1466

      uldci.m_rbLen = rbPerFlow;

1467

      bool allocated = false;

1467

      bool allocated = false;

1468

      NS_LOG_INFO (this << " RB Allocated " << rbAllocated << " rbPerFlow " << rbPerFlow << " flows " << nflows);

1468

      NS_LOG_INFO (this << " RB Allocated " << rbAllocated << " rbPerFlow " << rbPerFlow << " flows " << nflows);

1469

      while ((!allocated)&&((rbAllocated + rbPerFlow - 1) < m_cschedCellConfig.m_ulBandwidth) && (rbPerFlow != 0))

1469

      while ( (!allocated) &&

1470

              (rbAllocated + rbPerFlow - m_cschedCellConfig.m_ulBandwidth < 1) &&

1471

              (rbPerFlow != 0)

1472

1470

1473

1471

          // check availability

1474

          // check availability

1472

          bool free = true;

1475

          bool free = true;

(-)a/src/lte/model/tdmt-ff-mac-scheduler.cc (-1 / +4 lines)

Lines 1462-1468	Link Here

1462

      uldci.m_rbLen = rbPerFlow;

1462

      uldci.m_rbLen = rbPerFlow;

1463

      bool allocated = false;

1463

      bool allocated = false;

1464

      NS_LOG_INFO (this << " RB Allocated " << rbAllocated << " rbPerFlow " << rbPerFlow << " flows " << nflows);

1464

      NS_LOG_INFO (this << " RB Allocated " << rbAllocated << " rbPerFlow " << rbPerFlow << " flows " << nflows);

1465

      while ((!allocated)&&((rbAllocated + rbPerFlow - 1) < m_cschedCellConfig.m_ulBandwidth) && (rbPerFlow != 0))

1465

      while ( (!allocated) &&

1466

              (rbAllocated + rbPerFlow - m_cschedCellConfig.m_ulBandwidth < 1) &&

1467

              (rbPerFlow != 0)

1468

1466

1469

1467

          // check availability

1470

          // check availability

1468

          bool free = true;

1471

          bool free = true;

(-)a/src/lte/model/tdtbfq-ff-mac-scheduler.cc (-1 / +4 lines)

Lines 1561-1567	Link Here

1561

      uldci.m_rbLen = rbPerFlow;

1561

      uldci.m_rbLen = rbPerFlow;

1562

      bool allocated = false;

1562

      bool allocated = false;

1563

      NS_LOG_INFO (this << " RB Allocated " << rbAllocated << " rbPerFlow " << rbPerFlow << " flows " << nflows);

1563

      NS_LOG_INFO (this << " RB Allocated " << rbAllocated << " rbPerFlow " << rbPerFlow << " flows " << nflows);

1564

      while ((!allocated)&&((rbAllocated + rbPerFlow - 1) < m_cschedCellConfig.m_ulBandwidth) && (rbPerFlow != 0))

1564

      while ( (!allocated) &&

1565

              (rbAllocated + rbPerFlow - m_cschedCellConfig.m_ulBandwidth < 1) &&

1566

              (rbPerFlow != 0)

1567

1565

1568

1566

          // check availability

1569

          // check availability

1567

          bool free = true;

1570

          bool free = true;

(-)a/src/lte/model/tta-ff-mac-scheduler.cc (-1 / +4 lines)

Lines 1541-1547	Link Here

1541

      uldci.m_rbLen = rbPerFlow;

1541

      uldci.m_rbLen = rbPerFlow;

1542

      bool allocated = false;

1542

      bool allocated = false;

1543

      NS_LOG_INFO (this << " RB Allocated " << rbAllocated << " rbPerFlow " << rbPerFlow << " flows " << nflows);

1543

      NS_LOG_INFO (this << " RB Allocated " << rbAllocated << " rbPerFlow " << rbPerFlow << " flows " << nflows);

1544

      while ((!allocated)&&((rbAllocated + rbPerFlow - 1) < m_cschedCellConfig.m_ulBandwidth) && (rbPerFlow != 0))

1544

      while ( (!allocated) &&

1545

              (rbAllocated + rbPerFlow - m_cschedCellConfig.m_ulBandwidth < 1) &&

1546

              (rbPerFlow != 0)

1547

1545

1548

1546

          // check availability

1549

          // check availability

1547

          bool free = true;

1550

          bool free = true;

(-)a/src/mesh/model/dot11s/ie-dot11s-perr.cc (-1 / +1 lines)

Lines 108-114	Link Here

108

bool

108

bool

109

IePerr::IsFull () const

109

IePerr::IsFull () const

110

111

  return (GetInformationFieldSize () + 2 /* ID + LENGTH*/+ 10 /* Size of Mac48Address + uint32_t (one unit)*/> 255);

111

  return (GetInformationFieldSize () > 255 - 2 /* ID + LENGTH*/- 10 /* Size of Mac48Address + uint32_t (one unit)*/);

112

113

std::vector<HwmpProtocol::FailedDestination>

113

std::vector<HwmpProtocol::FailedDestination>

114

IePerr::GetAddressUnitVector () const

114

IePerr::GetAddressUnitVector () const

(-)a/src/mesh/model/dot11s/ie-dot11s-preq.cc (-2 / +2 lines)

Lines 423-429	Link Here

423

424

      return false;

424

      return false;

425

426

  if ((GetInformationFieldSize () + 11) > 255)

426

  if ((GetInformationFieldSize ()) > 255 - 11)

427

428

      return false;

428

      return false;

429

Lines 432-438	Link Here

432

bool

432

bool

433

IePreq::IsFull () const

433

IePreq::IsFull () const

434

435

  return ((GetInformationFieldSize () + 11) > 255);

435

  return ((GetInformationFieldSize () ) > 255-11);

436

437

std::ostream &

437

std::ostream &

438

operator << (std::ostream &os, const IePreq &a)

438

operator << (std::ostream &os, const IePreq &a)

(-)a/src/network/model/address.cc (-2 / +2 lines)

Lines 90-96	Link Here

Address::CopyAllTo (uint8_t *buffer, uint8_t len) const

Address::CopyAllTo (uint8_t *buffer, uint8_t len) const

  NS_LOG_FUNCTION (this << &buffer << static_cast<uint32_t> (len));

  NS_LOG_FUNCTION (this << &buffer << static_cast<uint32_t> (len));

  NS_ASSERT (len >= m_len + 2);

  NS_ASSERT ((int)len - m_len > 1);

  buffer[0] = m_type;

  buffer[0] = m_type;

  buffer[1] = m_len;

  buffer[1] = m_len;

  std::memcpy (buffer + 2, m_data, m_len);

  std::memcpy (buffer + 2, m_data, m_len);

Lines 114-120	Link Here

114

  m_type = buffer[0];

114

  m_type = buffer[0];

115

  m_len = buffer[1];

115

  m_len = buffer[1];

116

117

  NS_ASSERT (len >= m_len + 2);

117

  NS_ASSERT ((int)len - m_len > 1);

118

  std::memcpy (m_data, buffer + 2, m_len);

118

  std::memcpy (m_data, buffer + 2, m_len);

119

  return m_len + 2;

119

  return m_len + 2;

120




  static const char xdigits_u[] = "0123456789ABCDEF";
  unsigned char tmp[16];
  unsigned char* tp = tmp;
  unsigned char* const endp = tp + 16;
  unsigned char* colonp = 0;
  const char* xdigits = 0;
#if 0

  unsigned int val = 0;

  memset (tp, 0x00, 16);
  endp = tp + 16;

  /* Leading :: requires some special handling. */
  if (*address == ':')

              continue;
            }

          if (endp - tp < 2)
            {
              return (0);
            }


      /* \todo Handle IPv4 mapped address (2001::192.168.0.1) */
#if 0
      if (ch == '.' && (endp - tp > 3 /*NS_INADDRSZ*/)) &&
          inet_pton4 (curtok, tp) > 0)
        {
          tp += 4 /*NS_INADDRSZ*/;


  if (seen_xdigits)
    {
      if ( endp - tp < 2)
        {
          return (0);
        }

(-)a/src/network/utils/packetbb.cc (-1 / +1 lines)

Lines 2516-2522	Link Here

2516

2517

2518

      /* If headlen == fulllen - 1, then tail is 0 */

2518

      /* If headlen == fulllen - 1, then tail is 0 */

2519

      if (headlen <= GetAddressLength () - 1)

2519

      if (GetAddressLength () - (int)headlen > 0)

2520

2521

          for (i = GetAddressLength () - 1;

2521

          for (i = GetAddressLength () - 1;

2522

               GetAddressLength () - 1 - i <= taillen && i > headlen;

2522

               GetAddressLength () - 1 - i <= taillen && i > headlen;

(-)a/src/wifi/model/yans-wifi-channel.cc (-1 / +1 lines)

Lines 81-87	Link Here

  Ptr<MobilityModel> senderMobility = sender->GetMobility ()->GetObject<MobilityModel> ();

  Ptr<MobilityModel> senderMobility = sender->GetMobility ()->GetObject<MobilityModel> ();

  NS_ASSERT (senderMobility != 0);

  NS_ASSERT (senderMobility != 0);

  uint32_t j = 0;

  uint32_t j = 0;

  WifiMode wifiMode=txVector.GetMode();

  //  WifiMode wifiMode=txVector.GetMode();

  for (PhyList::const_iterator i = m_phyList.begin (); i != m_phyList.end (); i++, j++)

  for (PhyList::const_iterator i = m_phyList.begin (); i != m_phyList.end (); i++, j++)

      if (sender != (*i))

      if (sender != (*i))




CidFactory::IsTransport (Cid cid) const
{
  uint16_t id = cid.m_identifier;
  return ((int)id - 2 * (int)m_m > 0) && (id <= 0xfefe);
}
bool
CidFactory::IsPrimary (Cid cid) const
{
  uint16_t id = cid.m_identifier;
  return ((int)id - m_m > 0) && (id <= 2 * m_m);
}
bool
CidFactory::IsBasic (Cid cid) const

(-)a/wscript (+2 lines)

Lines 325-330	Link Here

325

        if Options.options.build_profile == 'optimized':

325

        if Options.options.build_profile == 'optimized':

326

            if conf.check_compilation_flag('-march=native'):

326

            if conf.check_compilation_flag('-march=native'):

327

                env.append_value('CXXFLAGS', '-march=native')

327

                env.append_value('CXXFLAGS', '-march=native')

328

            env.append_value('CXXFLAGS', '-fstrict-overflow')

329

            env.append_value('CXXFLAGS', '-Wstrict-overflow=5')

328

330

329

        if sys.platform == 'win32':

331

        if sys.platform == 'win32':

330

            env.append_value("LINKFLAGS", "-Wl,--enable-runtime-pseudo-reloc")

332

            env.append_value("LINKFLAGS", "-Wl,--enable-runtime-pseudo-reloc")

Return to bug 1868