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

(-)a/src/internet/test/ipv4-packet-info-tag-test-suite.cc (-4 / +2 lines)
 Lines 97-106   Ipv4PacketInfoTagTest::RxCb (Ptr<Socket> socket) Link Here 
97 
  m_receivedPacket = socket->Recv (std::numeric_limits<uint32_t>::max (), 0);
 97 
  m_receivedPacket = socket->Recv (std::numeric_limits<uint32_t>::max (), 0);
98 
  NS_TEST_ASSERT_MSG_EQ (availableData, m_receivedPacket->GetSize (), "Did not read expected data");
 98 
  NS_TEST_ASSERT_MSG_EQ (availableData, m_receivedPacket->GetSize (), "Did not read expected data");
99 

          99
          

        

          
            

              100
              
  Ipv4PacketInfoTag tag;


              100
              
  Ptr<const Ipv4PacketInfoTag> tag = m_receivedPacket->RemovePacketTag<Ipv4PacketInfoTag> ();

            

            

              101
              
  bool found;


              101
              
  NS_TEST_ASSERT_MSG_NE (tag, 0, "Could not find tag");

            

            

              102
              
  found = m_receivedPacket->RemovePacketTag (tag);


              
              
            

            

              103
              
  NS_TEST_ASSERT_MSG_EQ (found, true, "Could not find tag");


            

        

          104
          
}

          102
          
}

        

        

          105
          

          103
          

        

        

          106
          
void

          104
          
void

        



(-)a/src/internet/test/ipv6-packet-info-tag-test-suite.cc
      (-4 / +2 lines)




  

    

    

       Lines 93-102
      Ipv6PacketInfoTagTest::RxCb (Ptr<Socket> socket) 
    
  Link Here 
    

  

        

          93
          
  m_receivedPacket = socket->Recv (std::numeric_limits<uint32_t>::max (), 0);

          93
          
  m_receivedPacket = socket->Recv (std::numeric_limits<uint32_t>::max (), 0);

        

        

          94
          
  NS_TEST_ASSERT_MSG_EQ (availableData, m_receivedPacket->GetSize (), "Did not read expected data");

          94
          
  NS_TEST_ASSERT_MSG_EQ (availableData, m_receivedPacket->GetSize (), "Did not read expected data");

        

        

          95
          

          95
          

        

          
            

              96
              
  Ipv6PacketInfoTag tag;


              96
              
  Ptr<const Ipv6PacketInfoTag> tag = m_receivedPacket->RemovePacketTag<Ipv6PacketInfoTag> ();

            

            

              97
              
  bool found;


              97
              
  NS_TEST_ASSERT_MSG_NE (tag, 0, "Could not find tag");

            

            

              98
              
  found = m_receivedPacket->RemovePacketTag (tag);


              
              
            

            

              99
              
  NS_TEST_ASSERT_MSG_EQ (found, true, "Could not find tag");


            

        

          100
          
}

          98
          
}

        

        

          101
          

          99
          

        

        

          102
          
void

          100
          
void

        



(-)a/src/network/test/packet-test-suite.cc
      (-22 / +22 lines)




  

    

    

       Lines 391-423
      PacketTest::DoRun (void) 
    
  Link Here 
    

  

        

          391
          

          391
          

        

        

          392
          
  {

          392
          
  {

        

        

          393
          
    Packet p;

          393
          
    Packet p;

        

          
            

              394
              
    ATestTag<10> a;


              394
              
    Ptr< ATestTag<10> > a = CreateObject< ATestTag<10> > ();

            

        

          395
          
    p.AddPacketTag (a);

          395
          
    p.AddPacketTag (a);

        

          
            

              396
              
    NS_TEST_EXPECT_MSG_EQ (p.PeekPacketTag (a), true, "trivial");


              396
              
    NS_TEST_EXPECT_MSG_NE (p.PeekPacketTag< ATestTag<10> > (),    0, "trivial");

            

            

              397
              
    ATestTag<11> b;


              397
              
    Ptr< ATestTag<11> > b = CreateObject< ATestTag<11> > ();

            

        

          398
          
    p.AddPacketTag (b);

          398
          
    p.AddPacketTag (b);

        

          
            

              399
              
    NS_TEST_EXPECT_MSG_EQ (p.PeekPacketTag (b), true, "trivial");


              399
              
    NS_TEST_EXPECT_MSG_NE (p.PeekPacketTag< ATestTag<11> > (),    0, "trivial");

            

            

              400
              
    NS_TEST_EXPECT_MSG_EQ (p.PeekPacketTag (a), true, "trivial");


              400
              
    NS_TEST_EXPECT_MSG_NE (p.PeekPacketTag< ATestTag<10> > (),    0, "trivial");

            

        

          401
          
    Packet copy = p;

          401
          
    Packet copy = p;

        

          
            

              402
              
    NS_TEST_EXPECT_MSG_EQ (copy.PeekPacketTag (b), true, "trivial");


              402
              
    NS_TEST_EXPECT_MSG_NE (copy.PeekPacketTag< ATestTag<11> > (), 0, "trivial");

            

            

              403
              
    NS_TEST_EXPECT_MSG_EQ (copy.PeekPacketTag (a), true, "trivial");


              403
              
    NS_TEST_EXPECT_MSG_NE (copy.PeekPacketTag< ATestTag<10> > (), 0, "trivial");

            

            

              404
              
    ATestTag<12> c;


              404
              
    Ptr< ATestTag<12> > c = CreateObject< ATestTag<12> > ();

            

            

              405
              
    NS_TEST_EXPECT_MSG_EQ (copy.PeekPacketTag (c), false, "trivial");


              405
              
    NS_TEST_EXPECT_MSG_EQ (copy.PeekPacketTag< ATestTag<12> > (), 0, "trivial");

            

        

          406
          
    copy.AddPacketTag (c);

          406
          
    copy.AddPacketTag (c);

        

          
            

              407
              
    NS_TEST_EXPECT_MSG_EQ (copy.PeekPacketTag (c), true, "trivial");


              407
              
    NS_TEST_EXPECT_MSG_NE (copy.PeekPacketTag< ATestTag<12> > (), 0, "trivial");

            

            

              408
              
    NS_TEST_EXPECT_MSG_EQ (copy.PeekPacketTag (b), true, "trivial");


              408
              
    NS_TEST_EXPECT_MSG_NE (copy.PeekPacketTag< ATestTag<11> > (), 0, "trivial");

            

            

              409
              
    NS_TEST_EXPECT_MSG_EQ (copy.PeekPacketTag (a), true, "trivial");


              409
              
    NS_TEST_EXPECT_MSG_NE (copy.PeekPacketTag< ATestTag<10> > (), 0, "trivial");

            

            

              410
              
    NS_TEST_EXPECT_MSG_EQ (p.PeekPacketTag (c), false, "trivial");


              410
              
    NS_TEST_EXPECT_MSG_EQ (p.PeekPacketTag< ATestTag<12> > (),    0, "trivial");

            

            

              411
              
    copy.RemovePacketTag (b);


              411
              
    copy.RemovePacketTag< ATestTag<11> > ();

            

            

              412
              
    NS_TEST_EXPECT_MSG_EQ (copy.PeekPacketTag (b), false, "trivial");


              412
              
    NS_TEST_EXPECT_MSG_EQ (copy.PeekPacketTag< ATestTag<11> > (), 0, "trivial");

            

            

              413
              
    NS_TEST_EXPECT_MSG_EQ (p.PeekPacketTag (b), true, "trivial");


              413
              
    NS_TEST_EXPECT_MSG_NE (p.PeekPacketTag< ATestTag<11> > (),    0, "trivial");

            

            

              414
              
    p.RemovePacketTag (a);


              414
              
    p.RemovePacketTag< ATestTag<10> > ();

            

            

              415
              
    NS_TEST_EXPECT_MSG_EQ (p.PeekPacketTag (a), false, "trivial");


              415
              
    NS_TEST_EXPECT_MSG_EQ (p.PeekPacketTag< ATestTag<10> > (),    0, "trivial");

            

            

              416
              
    NS_TEST_EXPECT_MSG_EQ (copy.PeekPacketTag (a), true, "trivial");


              416
              
    NS_TEST_EXPECT_MSG_NE (copy.PeekPacketTag< ATestTag<10> > (), 0, "trivial");

            

            

              417
              
    NS_TEST_EXPECT_MSG_EQ (p.PeekPacketTag (c), false, "trivial");


              417
              
    NS_TEST_EXPECT_MSG_EQ (p.PeekPacketTag< ATestTag<12> > (),    0, "trivial");

            

            

              418
              
    NS_TEST_EXPECT_MSG_EQ (copy.PeekPacketTag (c), true, "trivial");


              418
              
    NS_TEST_EXPECT_MSG_NE (copy.PeekPacketTag< ATestTag<12> > (), 0, "trivial");

            

        

          419
          
    p.RemoveAllPacketTags ();

          419
          
    p.RemoveAllPacketTags ();

        

          
            

              420
              
    NS_TEST_EXPECT_MSG_EQ (p.PeekPacketTag (b), false, "trivial");


              420
              
    NS_TEST_EXPECT_MSG_EQ (p.PeekPacketTag< ATestTag<11> > (),    0, "trivial");

            

        

          421
          
  }

          421
          
  }

        

        

          422
          

          422
          

        

        

          423
          
  {

          423
          
  {

        



(-)a/src/test/global-routing-test-suite.cc
      (-10 / +6 lines)




  

    

    

       Lines 76-86
      DynamicGlobalRoutingTestCase::~DynamicGlobalRoutingTestCase () 
    
  Link Here 
    

  

        

          76
          
void

          76
          
void

        

        

          77
          
DynamicGlobalRoutingTestCase::SinkRx (std::string path, Ptr<const Packet> p, const Address& address)

          77
          
DynamicGlobalRoutingTestCase::SinkRx (std::string path, Ptr<const Packet> p, const Address& address)

        

        

          78
          
{

          78
          
{

        

          
            

              79
              
  Ipv4PacketInfoTag tag;


              79
              
  Ptr<const Ipv4PacketInfoTag> tag = p->PeekPacketTag<Ipv4PacketInfoTag> ();

            

            

              80
              
  bool found;


              
              
            

            

              81
              
  found = p->PeekPacketTag (tag);


            

        

          82
          
  uint8_t now = static_cast<uint8_t> (Simulator::Now ().GetSeconds ());

          80
          
  uint8_t now = static_cast<uint8_t> (Simulator::Now ().GetSeconds ());

        

          
            

              83
              
  if (found)


              81
              
  if (tag != 0)

            

        

          84
          
    {

          82
          
    {

        

        

          85
          
      ;

          83
          
      ;

        

        

          86
          
    }

          84
          
    }

        

  

    

    

       Lines 99-115
      DynamicGlobalRoutingTestCase::HandleRead (Ptr<Socket> socket) 
    
  Link Here 
    

  

        

          99
          
        { //EOF

          97
          
        { //EOF

        

        

          100
          
          break;

          98
          
          break;

        

        

          101
          
        }

          99
          
        }

        

          
            

              102
              
      Ipv4PacketInfoTag tag;


              100
              
      Ptr<const Ipv4PacketInfoTag> tag = packet->PeekPacketTag<Ipv4PacketInfoTag> ();

            

            

              103
              
      bool found;


              
              
            

            

              104
              
      found = packet->PeekPacketTag (tag);


            

        

          105
          
      uint8_t now = static_cast<uint8_t> (Simulator::Now ().GetSeconds ());

          101
          
      uint8_t now = static_cast<uint8_t> (Simulator::Now ().GetSeconds ());

        

          
            

              106
              
      if (found)


              102
              
      if (tag != 0)

            

        

          107
          
        {

          103
          
        {

        

          
            

              108
              
          if (tag.GetRecvIf () == 1)


              104
              
          if (tag->GetRecvIf () == 1)

            

        

          109
          
            {

          105
          
            {

        

        

          110
          
              m_firstInterface[now]++;

          106
          
              m_firstInterface[now]++;

        

        

          111
          
            }

          107
          
            }

        

          
            

              112
              
          if (tag.GetRecvIf () == 2)


              108
              
          if (tag->GetRecvIf () == 2)

            

        

          113
          
            {

          109
          
            {

        

        

          114
          
              m_secondInterface[now]++;

          110
          
              m_secondInterface[now]++;

        

        

          115
          
            }

          111
          
            }

        



(-)a/src/topology-read/test/rocketfuel-topology-reader-test-suite.cc
      (-2 / +1 lines)




  

    

    

       Lines 55-61
      RocketfuelTopologyReaderTest::DoRun (void) 
    
  Link Here 
    

  

        

          55
          

          55
          

        

        

          56
          
  std::string input ("./src/topology-read/examples/RocketFuel_toposample_1239_weights.txt");

          56
          
  std::string input ("./src/topology-read/examples/RocketFuel_toposample_1239_weights.txt");

        

        

          57
          

          57
          

        

          
            

              58
              
  inFile = CreateObject<RocketfuelTopologyReader> ();


              58
              
  inFile = Create<RocketfuelTopologyReader> ();

            

        

          59
          
  inFile->SetFileName (input);

          59
          
  inFile->SetFileName (input);

        

        

          60
          

          60
          

        

        

          61
          
  if (inFile != 0)

          61
          
  if (inFile != 0)

        

            

              62
              
- 

              
              
            






  

  Return to bug 1383