Attachment #526 for bug #633

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

(-)a/examples/simple-wimax.cc (+2 lines)

Lines 62-67	Link Here

      return (char*)"NOT FOUND!";

      return (char*)"NOT FOUND!";

      break;

      break;

  //this line is never reached but it is here to support compiling under gcc 4.0.4

  return 0;

void

void

(-)a/src/applications/UdpClientServer/udpServer.cc (-2 / +1 lines)

Lines 101-111	Link Here

101

102

        if (InetSocketAddress::IsMatchingType(from))

102

        if (InetSocketAddress::IsMatchingType(from))

103

104

            uint32_t * sequence_number = (uint32_t *) (packet->PeekData());

105

            InetSocketAddress address = InetSocketAddress::ConvertFrom(from);

104

            InetSocketAddress address = InetSocketAddress::ConvertFrom(from);

106

            NS_LOG_INFO("Received " << packet->GetSize() << " bytes from "

105

            NS_LOG_INFO("Received " << packet->GetSize() << " bytes from "

107

                << address.GetIpv4() << " Sequence Number: "

106

                << address.GetIpv4() << " Sequence Number: "

108

                << *sequence_number << std::endl);

107

                << (uint32_t *) (packet->PeekData()) << std::endl);

109

            packet->RemoveAllPacketTags();

108

            packet->RemoveAllPacketTags();

110

            packet->RemoveAllByteTags();

109

            packet->RemoveAllByteTags();

111

110

(-)a/src/devices/wimax/IPCS_BS_Packet_classifier.cc (-2 / +2 lines)

Lines 188-195	Link Here

188

    Ipv4Header IPV4_Header;

188

    Ipv4Header IPV4_Header;

189

    UdpHeader UDP_Header;

189

    UdpHeader UDP_Header;

190

    TcpHeader TCP_Header;

190

    TcpHeader TCP_Header;

191

    uint16_t source_port;

191

    uint16_t source_port = 0;

192

    uint16_t dest_port;

192

    uint16_t dest_port = 0;

193

    SSRecord *my_ssRecord;

193

    SSRecord *my_ssRecord;

194

    SSRecord *ssRecord;

194

    SSRecord *ssRecord;

195

    Mac48Address destMac;

195

    Mac48Address destMac;

(-)a/src/devices/wimax/IPCS_SS_Packet_classifier.cc (-2 / +2 lines)

Lines 68-75	Link Here

    Ipv4Header IPV4_Header;

    Ipv4Header IPV4_Header;

    UdpHeader UDP_Header;

    UdpHeader UDP_Header;

    TcpHeader TCP_Header;

    TcpHeader TCP_Header;

    uint16_t source_port;

    uint16_t source_port = 0;

    uint16_t dest_port;

    uint16_t dest_port = 0;

    std::cout << "\tIPCS-Packet-Classifier: " << std::endl;

    std::cout << "\tIPCS-Packet-Classifier: " << std::endl;

    std::cout << "\t\tRetrieving parameters from packet:" << std::endl;

    std::cout << "\t\tRetrieving parameters from packet:" << std::endl;

    Ptr<Packet> C_Packet = packet->Copy();

    Ptr<Packet> C_Packet = packet->Copy();




        rngrsp.SetInitRangOppNumber(m_bs->GetRangingOppNumber());

        //not needed actually, m_rangingOppNumber serves the purpose. will not be an integer due to transmission delay
        NS_ASSERT(m_bs->GetRangingOppNumber() == (uint8_t)(((Simulator::Now()
        - m_bs->GetUlSubframeStartTime()).GetSeconds()
        / (m_bs->GetRangReqOppSize()
            * m_bs->GetSymbolDuration().GetSeconds())) + 1));//temp
        uint8_t curRangingOppNumber = (uint8_t) curRangingOpp;
        NS_ASSERT(m_bs->GetRangingOppNumber() == curRangingOppNumber);//temp

        SetParametersToAdjust(&rngrsp);
        rngrsp.SetRangStatus(WimaxNetDevice::RANGING_STATUS_CONTINUE); //see Figure 64

(-)a/src/devices/wimax/connection-identifier-factory.cc (-1 / +1 lines)

Lines 69-75	Link Here

  WimaxConnection::ConnectionType

  WimaxConnection::ConnectionType

  ConnectionIdentifierFactory::GetCidType(Ptr<const ConnectionIdentifier> cid) const

  ConnectionIdentifierFactory::GetCidType(Ptr<const ConnectionIdentifier> cid) const

    WimaxConnection::ConnectionType type;

    WimaxConnection::ConnectionType type = WimaxConnection::CONNECTION_TYPE_UNINITIALIZED;//initialize the variable for compiling in optimized mode

    uint16_t identifier = cid->GetIdentifier();

    uint16_t identifier = cid->GetIdentifier();

    if (identifier == ConnectionIdentifier::CID_INITIAL_RANGING)

    if (identifier == ConnectionIdentifier::CID_INITIAL_RANGING)

(-)a/src/devices/wimax/ofdm-wimax-phy.cc (-1 / +1 lines)

Lines 504-510	Link Here

504

  uint32_t

504

  uint32_t

505

  OfdmWimaxPhy::GetFecBlockSize(WimaxPhy::ModulationType modulationType) const

505

  OfdmWimaxPhy::GetFecBlockSize(WimaxPhy::ModulationType modulationType) const

506

507

    uint32_t blockSize;

507

    uint32_t blockSize = 0;

508

    switch (modulationType)

508

    switch (modulationType)

509

510

    case MODULATION_TYPE_BPSK_12:

510

    case MODULATION_TYPE_BPSK_12:

(-)a/src/devices/wimax/qos-parameter-set.h (+1 lines)

Lines 22-27	Link Here

#define QOS_PARAMETER_SET_H

#define QOS_PARAMETER_SET_H

#include <stdint.h>

#include <stdint.h>

#include <iostream>

#include "ns3/buffer.h"

#include "ns3/buffer.h"

namespace ns3

namespace ns3

(-)a/src/devices/wimax/simpleOfdmWimaxPhy.cc (-1 / +1 lines)

Lines 823-829	Link Here

823

  uint32_t

823

  uint32_t

824

  simpleOfdmWimaxPhy::GetFecBlockSize(WimaxPhy::ModulationType modulationType) const

824

  simpleOfdmWimaxPhy::GetFecBlockSize(WimaxPhy::ModulationType modulationType) const

825

826

    uint32_t blockSize;

826

    uint32_t blockSize = 0;

827

    switch (modulationType)

827

    switch (modulationType)

828

829

    case MODULATION_TYPE_BPSK_12:

829

    case MODULATION_TYPE_BPSK_12:

(-)a/src/devices/wimax/wimax-bs-net-device.cc (-1 / +1 lines)

Lines 424-430	Link Here

424

      uint16_t protocolNumber)

424

      uint16_t protocolNumber)

425

426

    Ptr<PacketBurst> burst = Create<PacketBurst> ();

426

    Ptr<PacketBurst> burst = Create<PacketBurst> ();

427

    ServiceFlow *serviceFlow;

427

    ServiceFlow *serviceFlow = 0;

428

429

    //drop packet if no SS registered with BS, the destination SS is not yet registered or if queue is full

429

    //drop packet if no SS registered with BS, the destination SS is not yet registered or if queue is full

430

(-)a/src/devices/wimax/wimax-ofdm-phy/packetCreator.cpp (-1 / +1 lines)

Lines 44-50	Link Here

bool PacketCreator::nextPacket(bvec& output){

bool PacketCreator::nextPacket(bvec& output){

/// method to extract the next packet from the file. Successive calls of this method will result in different packets.

/// method to extract the next packet from the file. Successive calls of this method will result in different packets.

/// return value will be 0 if there are no more packets in the file.

/// return value will be 0 if there are no more packets in the file.

int cicleEnd;

int cicleEnd = 0;

bool isValid;

bool isValid;

if (bytesLeftToRead >= packetSizeBytes){ // there are more bytes left in the file than the packet size

if (bytesLeftToRead >= packetSizeBytes){ // there are more bytes left in the file than the packet size

Return to bug 633