1.1 --- a/examples/simple-wimax.cc Wed Aug 12 08:58:14 2009 -0300
1.2 +++ b/examples/simple-wimax.cc Wed Aug 12 09:46:34 2009 -0300
1.3 @@ -62,6 +62,8 @@
1.4 return (char*)"NOT FOUND!";
1.5 break;
1.6 }
1.7 + //this line is never reached but it is here to support compiling under gcc 4.0.4
1.8 + return 0;
1.9 }
1.10
1.11 void
2.1 --- a/src/applications/UdpClientServer/udpServer.cc Wed Aug 12 08:58:14 2009 -0300
2.2 +++ b/src/applications/UdpClientServer/udpServer.cc Wed Aug 12 09:46:34 2009 -0300
2.3 @@ -101,11 +101,10 @@
2.4 {
2.5 if (InetSocketAddress::IsMatchingType(from))
2.6 {
2.7 - uint32_t * sequence_number = (uint32_t *) (packet->PeekData());
2.8 InetSocketAddress address = InetSocketAddress::ConvertFrom(from);
2.9 NS_LOG_INFO("Received " << packet->GetSize() << " bytes from "
2.10 << address.GetIpv4() << " Sequence Number: "
2.11 - << *sequence_number << std::endl);
2.12 + << (uint32_t *) (packet->PeekData()) << std::endl);
2.13 packet->RemoveAllPacketTags();
2.14 packet->RemoveAllByteTags();
2.15 }
3.1 --- a/src/devices/wimax/IPCS_BS_Packet_classifier.cc Wed Aug 12 08:58:14 2009 -0300
3.2 +++ b/src/devices/wimax/IPCS_BS_Packet_classifier.cc Wed Aug 12 09:46:34 2009 -0300
3.3 @@ -188,8 +188,8 @@
3.4 Ipv4Header IPV4_Header;
3.5 UdpHeader UDP_Header;
3.6 TcpHeader TCP_Header;
3.7 - uint16_t source_port;
3.8 - uint16_t dest_port;
3.9 + uint16_t source_port = 0;
3.10 + uint16_t dest_port = 0;
3.11 SSRecord *my_ssRecord;
3.12 SSRecord *ssRecord;
3.13 Mac48Address destMac;
4.1 --- a/src/devices/wimax/IPCS_Bind_parameter_manager.h Wed Aug 12 08:58:14 2009 -0300
4.2 +++ b/src/devices/wimax/IPCS_Bind_parameter_manager.h Wed Aug 12 09:46:34 2009 -0300
4.3 @@ -37,7 +37,7 @@
4.4 IPCS_Classifier_Record* CreateIPCS_Classifier_Record (const char * src_ip_adr, const char * dst_ip_adr, uint16_t src_port, uint16_t dst_port, uint16_t protocol,uint32_t SFID);
4.5 IPCS_Classifier_Record* CreateIPCS_Classifier_Record (Ipv4Address src_ip_adr, Ipv4Address dst_ip_adr, uint16_t src_port, uint16_t dst_port, uint16_t protocol,uint32_t SFID);
4.6 IPCS_Classifier_Record* GetIPCS_Classifier_Record (const Ipv4Address src_ip_adr, Ipv4Address dst_ip_adr, uint16_t src_port, uint16_t dst_port, uint16_t protocol,uint32_t SFID)const;
4.7 - IPCS_Classifier_Record* GetIPCS_Classifier_Record (const Ipv4Address src_ip_adr, Ipv4Address src_ip_adr, uint16_t src_port, uint16_t dst_port, uint16_t protocol)const;
4.8 + IPCS_Classifier_Record* GetIPCS_Classifier_Record (const Ipv4Address src_ip_adr, Ipv4Address dst_ip_adr, uint16_t src_port, uint16_t dst_port, uint16_t protocol)const;
4.9 uint32_t Get_SFID_Classifier_Record (const Ipv4Address src_ip_adr, Ipv4Address dst_ip_adr, uint16_t src_port, uint16_t dst_port, uint16_t protocol)const;
4.10 bool IsInRecord (const Ipv4Address src_ip_adr, Ipv4Address dst_ip_adr, uint16_t src_port, uint16_t dst_port, uint16_t protocol)const;
4.11 void DeleteIPCS_Classifier_Record(Ipv4Address src_ip_adr, Ipv4Address dst_ip_adr, uint16_t src_port, uint16_t dst_port, uint16_t protocol,uint32_t SFID);
5.1 --- a/src/devices/wimax/IPCS_SS_Packet_classifier.cc Wed Aug 12 08:58:14 2009 -0300
5.2 +++ b/src/devices/wimax/IPCS_SS_Packet_classifier.cc Wed Aug 12 09:46:34 2009 -0300
5.3 @@ -68,8 +68,8 @@
5.4 Ipv4Header IPV4_Header;
5.5 UdpHeader UDP_Header;
5.6 TcpHeader TCP_Header;
5.7 - uint16_t source_port;
5.8 - uint16_t dest_port;
5.9 + uint16_t source_port = 0;
5.10 + uint16_t dest_port = 0;
5.11 std::cout << "\tIPCS-Packet-Classifier: " << std::endl;
5.12 std::cout << "\t\tRetrieving parameters from packet:" << std::endl;
5.13 Ptr<Packet> C_Packet = packet->Copy();
6.1 --- a/src/devices/wimax/bs-link-manager.cc Wed Aug 12 08:58:14 2009 -0300
6.2 +++ b/src/devices/wimax/bs-link-manager.cc Wed Aug 12 09:46:34 2009 -0300
6.3 @@ -129,12 +129,10 @@
6.4 rngrsp.SetInitRangOppNumber(m_bs->GetRangingOppNumber());
6.5
6.6 //not needed actually, m_rangingOppNumber serves the purpose. will not be an integer due to transmission delay
6.7 - double curRangingOpp = ((Simulator::Now()
6.8 - - m_bs->GetUlSubframeStartTime()).GetSeconds()
6.9 - / (m_bs->GetRangReqOppSize()
6.10 - * m_bs->GetSymbolDuration().GetSeconds())) + 1;
6.11 - uint8_t curRangingOppNumber = (uint8_t) curRangingOpp;
6.12 - NS_ASSERT(m_bs->GetRangingOppNumber() == curRangingOppNumber);//temp
6.13 + NS_ASSERT(m_bs->GetRangingOppNumber() == (uint8_t)(((Simulator::Now()
6.14 + - m_bs->GetUlSubframeStartTime()).GetSeconds()
6.15 + / (m_bs->GetRangReqOppSize()
6.16 + * m_bs->GetSymbolDuration().GetSeconds())) + 1));//temp
6.17
6.18 SetParametersToAdjust(&rngrsp);
6.19 rngrsp.SetRangStatus(WimaxNetDevice::RANGING_STATUS_CONTINUE); //see Figure 64
7.1 --- a/src/devices/wimax/burst-profile-manager.cc Wed Aug 12 08:58:14 2009 -0300
7.2 +++ b/src/devices/wimax/burst-profile-manager.cc Wed Aug 12 09:46:34 2009 -0300
7.3 @@ -117,7 +117,7 @@
7.4 //burst profile got to be there in DCD/UCD, assuming always all profiles are defined in DCD/UCD
7.5 NS_ASSERT(false);
7.6
7.7 - return -1;
7.8 + return ~0;
7.9 }
7.10
7.11 uint8_t
8.1 --- a/src/devices/wimax/connection-identifier-factory.cc Wed Aug 12 08:58:14 2009 -0300
8.2 +++ b/src/devices/wimax/connection-identifier-factory.cc Wed Aug 12 09:46:34 2009 -0300
8.3 @@ -69,7 +69,7 @@
8.4 WimaxConnection::ConnectionType
8.5 ConnectionIdentifierFactory::GetCidType(Ptr<const ConnectionIdentifier> cid) const
8.6 {
8.7 - WimaxConnection::ConnectionType type;
8.8 + WimaxConnection::ConnectionType type = WimaxConnection::CONNECTION_TYPE_UNINITIALIZED;//initialize the variable for compiling in optimized mode
8.9 uint16_t identifier = cid->GetIdentifier();
8.10
8.11 if (identifier == ConnectionIdentifier::CID_INITIAL_RANGING)
9.1 --- a/src/devices/wimax/mac-messages.cc Wed Aug 12 08:58:14 2009 -0300
9.2 +++ b/src/devices/wimax/mac-messages.cc Wed Aug 12 09:46:34 2009 -0300
9.3 @@ -29,7 +29,7 @@
9.4 NS_OBJECT_ENSURE_REGISTERED ( ManagementMessageType);
9.5
9.6 ManagementMessageType::ManagementMessageType(void) :
9.7 - m_type(-1)
9.8 + m_type(~0)
9.9 {
9.10 }
9.11
10.1 --- a/src/devices/wimax/ofdm-wimax-phy.cc Wed Aug 12 08:58:14 2009 -0300
10.2 +++ b/src/devices/wimax/ofdm-wimax-phy.cc Wed Aug 12 09:46:34 2009 -0300
10.3 @@ -504,7 +504,7 @@
10.4 uint32_t
10.5 OfdmWimaxPhy::GetFecBlockSize(WimaxPhy::ModulationType modulationType) const
10.6 {
10.7 - uint32_t blockSize;
10.8 + uint32_t blockSize = 0;
10.9 switch (modulationType)
10.10 {
10.11 case MODULATION_TYPE_BPSK_12:
11.1 --- a/src/devices/wimax/packet-classifier.cc Wed Aug 12 08:58:14 2009 -0300
11.2 +++ b/src/devices/wimax/packet-classifier.cc Wed Aug 12 09:46:34 2009 -0300
11.3 @@ -38,7 +38,7 @@
11.4 }
11.5
11.6 PacketClassifier::PacketClassifier(void) :
11.7 - m_priority(-1)
11.8 + m_priority(~0)
11.9 {
11.10 }
11.11
12.1 --- a/src/devices/wimax/qos-parameter-set.h Wed Aug 12 08:58:14 2009 -0300
12.2 +++ b/src/devices/wimax/qos-parameter-set.h Wed Aug 12 09:46:34 2009 -0300
12.3 @@ -22,6 +22,7 @@
12.4 #define QOS_PARAMETER_SET_H
12.5
12.6 #include <stdint.h>
12.7 +#include <iostream>
12.8 #include "ns3/buffer.h"
12.9
12.10 namespace ns3
13.1 --- a/src/devices/wimax/simpleOfdmWimaxPhy.cc Wed Aug 12 08:58:14 2009 -0300
13.2 +++ b/src/devices/wimax/simpleOfdmWimaxPhy.cc Wed Aug 12 09:46:34 2009 -0300
13.3 @@ -823,7 +823,7 @@
13.4 uint32_t
13.5 simpleOfdmWimaxPhy::GetFecBlockSize(WimaxPhy::ModulationType modulationType) const
13.6 {
13.7 - uint32_t blockSize;
13.8 + uint32_t blockSize = 0;
13.9 switch (modulationType)
13.10 {
13.11 case MODULATION_TYPE_BPSK_12:
14.1 --- a/src/devices/wimax/wimax-bs-net-device.cc Wed Aug 12 08:58:14 2009 -0300
14.2 +++ b/src/devices/wimax/wimax-bs-net-device.cc Wed Aug 12 09:46:34 2009 -0300
14.3 @@ -433,7 +433,7 @@
14.4 uint16_t protocolNumber)
14.5 {
14.6 Ptr<PacketBurst> burst = Create<PacketBurst> ();
14.7 - ServiceFlow *serviceFlow;
14.8 + ServiceFlow *serviceFlow = 0;
14.9
14.10 //drop packet if no SS registered with BS, the destination SS is not yet registered or if queue is full
14.11
15.1 --- a/src/devices/wimax/wimax-net-device.cc Wed Aug 12 08:58:14 2009 -0300
15.2 +++ b/src/devices/wimax/wimax-net-device.cc Wed Aug 12 09:46:34 2009 -0300
15.3 @@ -46,7 +46,7 @@
15.4 NS_OBJECT_ENSURE_REGISTERED ( WimaxNetDevice);
15.5
15.6 uint32_t WimaxNetDevice::m_nrFrames = 0;
15.7 - uint8_t WimaxNetDevice::m_direction = -1;
15.8 + uint8_t WimaxNetDevice::m_direction = ~0;
15.9 Time WimaxNetDevice::m_frameStartTime = Seconds(0);
15.10
15.11 TypeId
16.1 --- a/src/devices/wimax/wimax-ofdm-phy/packetCreator.cpp Wed Aug 12 08:58:14 2009 -0300
16.2 +++ b/src/devices/wimax/wimax-ofdm-phy/packetCreator.cpp Wed Aug 12 09:46:34 2009 -0300
16.3 @@ -44,7 +44,7 @@
16.4 bool PacketCreator::nextPacket(bvec& output){
16.5 /// method to extract the next packet from the file. Successive calls of this method will result in different packets.
16.6 /// return value will be 0 if there are no more packets in the file.
16.7 -int cicleEnd;
16.8 +int cicleEnd = 0;
16.9 bool isValid;
16.10
16.11 if (bytesLeftToRead >= packetSizeBytes){ // there are more bytes left in the file than the packet size
17.1 --- a/src/devices/wimax/wimax-ss-net-device.cc Wed Aug 12 08:58:14 2009 -0300
17.2 +++ b/src/devices/wimax/wimax-ss-net-device.cc Wed Aug 12 09:46:34 2009 -0300
17.3 @@ -938,7 +938,7 @@
17.4 Ptr<WimaxConnection> connection = NULL;
17.5 Simulator::Schedule(timeToAllocation,
17.6 &WimaxSubscriberStationNetDevice::SendBurst, this,
17.7 - ulMapIe.GetUiuc(), ulMapIe.GetDuration(), connection);
17.8 + ulMapIe.GetUiuc(), ulMapIe.GetDuration(), connection, MacHeaderType::HEADER_TYPE_GENERIC);
17.9 }
17.10 }
17.11 else
17.12 @@ -1061,4 +1061,4 @@
17.13 event = eventId;
17.14 }
17.15
17.16 -}//namespace ns`
17.17 +}//namespace ns3