Attachment #1631 for bug #1723

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




    {
      case DscpDefault:
        return "Default";
      case DSCP_CS1:
        return "CS1";
      case DSCP_AF11:
        return "AF11";
      case DSCP_AF12:
        return "AF12";
      case DSCP_AF13:
        return "AF13";
      case DSCP_CS2:
        return "CS2";
      case DSCP_AF21:
        return "AF21";
      case DSCP_AF22:
        return "AF22";
      case DSCP_AF23:
        return "AF23";
      case DSCP_CS3:
        return "CS3";
      case DSCP_AF31:
        return "AF31";
      case DSCP_AF32:
        return "AF32";
      case DSCP_AF33:
        return "AF33";
      case DSCP_CS4:
        return "CS4";
      case DSCP_AF41:
        return "AF41";
      case DSCP_AF42:
        return "AF42";
      case DSCP_AF43:
        return "AF43";
      case DSCP_CS5:
        return "CS5";
      case DSCP_EF:
        return "EF";
      case DSCP_CS6:
        return "CS6";
      case DSCP_CS7:
        return "CS7";
      default:
        return "Unrecognized DSCP";

  NS_LOG_FUNCTION (this << ecn);
  switch (ecn)
    {
      case ECN_NotECT:
        return "Not-ECT";
      case ECN_ECT1:
        return "ECT (1)";
      case ECN_ECT0:
        return "ECT (0)";
      case ECN_CE:
        return "CE";      
      default:
        return "Unknown ECN";




    {
      DscpDefault = 0x00,

      // Prefixed with "DSCP" to avoid name clash (bug 1723)
      DSCP_CS1 = 0x20,
      DSCP_AF11 = 0x28,
      DSCP_AF12 = 0x30,
      DSCP_AF13 = 0x38,

      DSCP_CS2 = 0x40,
      DSCP_AF21 = 0x48,
      DSCP_AF22 = 0x50,
      DSCP_AF23 = 0x58,

      DSCP_CS3 = 0x60,
      DSCP_AF31 = 0x68,
      DSCP_AF32 = 0x70,
      DSCP_AF33 = 0x78,

      DSCP_CS4 = 0x80,
      DSCP_AF41 = 0x88,
      DSCP_AF42 = 0x90,
      DSCP_AF43 = 0x98,

      DSCP_CS5 = 0xA0,
      DSCP_EF = 0xB8,
      
      DSCP_CS6 = 0xC0,
      DSCP_CS7 = 0xE0
      
    };
  /**

   */
  enum EcnType
    {
      // Prefixed with "ECN" to avoid name clash (bug 1723)
      ECN_NotECT = 0x00,
      ECN_ECT1 = 0x01,
      ECN_ECT0 = 0x02,
      ECN_CE = 0x03
    }; 
  /**
   * \brief Set ECN Field





  std::vector <Ipv4Header::DscpType> vDscpTypes;
  vDscpTypes.push_back (Ipv4Header::DscpDefault);
  vDscpTypes.push_back (Ipv4Header::DSCP_CS1);
  vDscpTypes.push_back (Ipv4Header::DSCP_AF11);
  vDscpTypes.push_back (Ipv4Header::DSCP_AF12);
  vDscpTypes.push_back (Ipv4Header::DSCP_AF13);
  vDscpTypes.push_back (Ipv4Header::DSCP_CS2);
  vDscpTypes.push_back (Ipv4Header::DSCP_AF21);
  vDscpTypes.push_back (Ipv4Header::DSCP_AF22);
  vDscpTypes.push_back (Ipv4Header::DSCP_AF23);
  vDscpTypes.push_back (Ipv4Header::DSCP_CS3);
  vDscpTypes.push_back (Ipv4Header::DSCP_AF31);
  vDscpTypes.push_back (Ipv4Header::DSCP_AF32);
  vDscpTypes.push_back (Ipv4Header::DSCP_AF33);
  vDscpTypes.push_back (Ipv4Header::DSCP_CS4);
  vDscpTypes.push_back (Ipv4Header::DSCP_AF41);
  vDscpTypes.push_back (Ipv4Header::DSCP_AF42);
  vDscpTypes.push_back (Ipv4Header::DSCP_AF43);
  vDscpTypes.push_back (Ipv4Header::DSCP_CS5);
  vDscpTypes.push_back (Ipv4Header::DSCP_EF);
  vDscpTypes.push_back (Ipv4Header::DSCP_CS6);
  vDscpTypes.push_back (Ipv4Header::DSCP_CS7);

  for (uint32_t i = 0; i < vDscpTypes.size (); i++)
    {
      SendData_IpHdr_Dscp (txSocket, "10.0.0.1", vDscpTypes [i], Ipv4Header::ECN_ECT1);
      NS_TEST_EXPECT_MSG_EQ (m_receivedPacket->GetSize (), 143, "recv(hdrincl): 10.0.0.1");
      NS_TEST_EXPECT_MSG_EQ (m_receivedHeader.GetDscp (), vDscpTypes [i], "recv(hdrincl): 10.0.0.1");
      m_receivedHeader.Print (std::cout);

  // Ecn tests
  std::cout << "Ecn Test\n";
  std::vector <Ipv4Header::EcnType> vEcnTypes;
  vEcnTypes.push_back (Ipv4Header::ECN_NotECT);
  vEcnTypes.push_back (Ipv4Header::ECN_ECT1);
  vEcnTypes.push_back (Ipv4Header::ECN_ECT0);
  vEcnTypes.push_back (Ipv4Header::ECN_CE);
  
  for (uint32_t i = 0; i < vEcnTypes.size (); i++)
    {

Return to bug 1723